UIND
/
HSE-Observation-Android-App
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feedbacks implemented 

New Release v-1.1
master
saad.siddiq 2025-07-22 15:34:06 +05:00
parent 602a07d651
commit 87b67c3fe1
10 changed files with 56 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ android {
applicationId "com.utopiaindustries.hseobservationsapp"
minSdk 24
targetSdk 34
versionCode 1
versionName "1.0"
versionCode 2
versionName "1.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

2
app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/HSETrainingForms/HseTwoActivity.java
View File

@ -227,7 +227,6 @@ public class HseTwoActivity extends AppCompatActivity implements EasyPermissions
startActivity(intent);
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);*/
if (isValidate()){
StorageManager.getInstance().getHseTrainingModel().get(0).setPictures(imageList);
alertReportSubmit(HseTwoActivity.this);
}
@ -316,6 +315,7 @@ public class HseTwoActivity extends AppCompatActivity implements EasyPermissions
public void onClick(View view) {
alertDialog.dismiss();
StorageManager.getInstance().getHseTrainingModel().get(0).setPictures(imageList);
List<HseTrainingModel> reportList = StorageManager.getInstance().getHseTrainingModel();
HseReportRequest<HseTrainingModel> hseTrainingRequest = new HseReportRequest<>();

1
app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/InjuryRecordForms/InjuryFormThree.java
View File

@ -300,6 +300,7 @@ public class InjuryFormThree extends AppCompatActivity implements EasyPermission
public void onClick(View view) {
alertDialog.dismiss();
StorageManager.getInstance().getInjuryRecordModel().get(0).setPictures(PaperImageList);
List<InjuryRecordModel> reportList = StorageManager.getInstance().getInjuryRecordModel();
HseReportRequest<InjuryRecordModel> hseTrainingRequest = new HseReportRequest<>();

12
app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/InjuryRecordForms/InjuryFormTwo.java
View File

@ -45,7 +45,6 @@ public class InjuryFormTwo extends AppCompatActivity {
EditText etLocationSite, etCnic, etContractorName, etDivision, etName;
TextView txtEmployeeHeading;
String workerType = "";
boolean isFromPersist = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -108,10 +107,6 @@ public class InjuryFormTwo extends AppCompatActivity {
layoutDailyWageInfo.setVisibility(View.GONE);
txtEmployeeHeading.setText("Employee ID Number *");
if (!isFromPersist) {
etEmpId.setText("");
}
workerType = "Employee";
StorageManager.getInstance().getInjuryRecordModel().get(0).setWorkerType("Employee/Contractor-Worker");
} else if (checkedId == R.id.rb_dailyWage) {
@ -119,10 +114,6 @@ public class InjuryFormTwo extends AppCompatActivity {
layoutDailyWageInfo.setVisibility(View.VISIBLE);
txtEmployeeHeading.setText("Visitor ID *");
if (!isFromPersist) {
etEmpId.setText("");
}
StorageManager.getInstance().getInjuryRecordModel().get(0).setWorkerType("DailyWageWorker");
workerType = "Visitor";
}
@ -343,7 +334,6 @@ public class InjuryFormTwo extends AppCompatActivity {
if (StorageManager.getInstance().getInjuryRecordModel().get(0).getWorkerType() != null
&& StorageManager.getInstance().getInjuryRecordModel().get(0).getWorkerType().equalsIgnoreCase("Employee/Contractor-Worker")) {
isFromPersist = true;
rbEmployee.setChecked(true);
layoutEmployeeInfo.setVisibility(View.VISIBLE);
layoutDailyWageInfo.setVisibility(View.GONE);
@ -355,7 +345,7 @@ public class InjuryFormTwo extends AppCompatActivity {
}
else if (StorageManager.getInstance().getInjuryRecordModel().get(0).getWorkerType() != null
&& StorageManager.getInstance().getInjuryRecordModel().get(0).getWorkerType().equalsIgnoreCase("DailyWageWorker")){
isFromPersist = true;
rbDailyWage.setChecked(true);
layoutEmployeeInfo.setVisibility(View.GONE);
layoutDailyWageInfo.setVisibility(View.VISIBLE);

27
app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/PermitToWorkForms/PermitOneActivity.java
View File

@ -8,7 +8,6 @@ import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -33,19 +32,9 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.textfield.TextInputLayout;
import com.utopiaindustries.hseobservationsapp.R;
import com.utopiaindustries.hseobservationsapp.activities.ObservationForms.ObservationOneActivity;
import com.utopiaindustries.hseobservationsapp.activities.ObservationForms.ObservationThreeActivity;
import com.utopiaindustries.hseobservationsapp.activities.ObservationForms.ObservationTwoActivity;
import com.utopiaindustries.hseobservationsapp.adapters.BuildingsAdapter;
import com.utopiaindustries.hseobservationsapp.adapters.DepartmentAdapter;
import com.utopiaindustries.hseobservationsapp.adapters.FloorsAdapter;
import com.utopiaindustries.hseobservationsapp.adapters.HsePtwTypeAdapter;
import com.utopiaindustries.hseobservationsapp.adapters.WorkingTeamAdapter;
import com.utopiaindustries.hseobservationsapp.helper.Helper;
import com.utopiaindustries.hseobservationsapp.models.HseData.HseActivity;
import com.utopiaindustries.hseobservationsapp.models.HseData.HseBuilding;
import com.utopiaindustries.hseobservationsapp.models.HseData.HseDepartment;
import com.utopiaindustries.hseobservationsapp.models.HseData.HseFloor;
import com.utopiaindustries.hseobservationsapp.models.HseData.HsePtwType;
import com.utopiaindustries.hseobservationsapp.models.HseData.HseWorkingTeam;
import com.utopiaindustries.hseobservationsapp.utils.StorageManager.StorageManager;
@ -55,8 +44,6 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.stream.Collectors;
//Department dropdown working
public class PermitOneActivity extends AppCompatActivity {
@ -403,16 +390,18 @@ public class PermitOneActivity extends AppCompatActivity {
}
private void updateDateTimeDisplay(String selectedType) {
SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy hh:mm a", Locale.getDefault());
String formatted = sdf.format(selectedDateTime.getTime());
SimpleDateFormat sdfView = new SimpleDateFormat("dd-MM-yyyy hh:mm a", Locale.getDefault());
SimpleDateFormat sdfAPI = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.getDefault());
String formattedView = sdfView.format(selectedDateTime.getTime());
String formattedAPI = sdfAPI.format(selectedDateTime.getTime());
//tvSelectedDateTime.setText("Selected Date & Time: " + formatted);
if (selectedType.equalsIgnoreCase("StartTime")) {
StorageManager.getInstance().getPermitToWorkModel().get(0).setStartTime(formatted);
etStartTime.setText(formatted);
StorageManager.getInstance().getPermitToWorkModel().get(0).setPtwStartTime(formattedAPI);
etStartTime.setText(formattedView);
}
else {
StorageManager.getInstance().getPermitToWorkModel().get(0).setEndTime(formatted);
etEndTime.setText(formatted);
StorageManager.getInstance().getPermitToWorkModel().get(0).setPtwEndTime(formattedAPI);
etEndTime.setText(formattedView);
}
//Log.e("Selected Date & Time: ", selectedType + " - " + formatted);
}

16
app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/PermitToWorkForms/PermitTwoActivity.java
View File

@ -106,13 +106,6 @@ public class PermitTwoActivity extends AppCompatActivity implements EasyPermissi
compressedImage -> {
// Handle the compressed image here, e.g., display it
runOnUiThread(() -> {
/*DocumentTypeImageModel documentImage = new DocumentTypeImageModel(
docTypeId,
docTypeTitle,
compressedImage
);*/
//Log.e("doc-image: ",""+ documentImage);
int position = imageList.size();
imageList.add(compressedImage);
@ -154,14 +147,6 @@ public class PermitTwoActivity extends AppCompatActivity implements EasyPermissi
imageBytes -> {
this.runOnUiThread(() -> {
/*DocumentTypeImageModel documentImage = new DocumentTypeImageModel(
docTypeId,
docTypeTitle,
imageBytes
);*/
//Log.e("doc-image: ",""+ documentImage);
int position = imageList.size();
imageList.add(imageBytes);
imagePaperAdapter.notifyItemInserted(position);
@ -292,6 +277,7 @@ public class PermitTwoActivity extends AppCompatActivity implements EasyPermissi
public void onClick(View view) {
alertDialog.dismiss();
StorageManager.getInstance().getPermitToWorkModel().get(0).setPictures(imageList);
List<PermitToWorkModel> reportList = StorageManager.getInstance().getPermitToWorkModel();
HseReportRequest<PermitToWorkModel> hseTrainingRequest = new HseReportRequest<>();

40
app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ProgressiveActivityForms/ProgressiveTwoActivity.java
View File

@ -71,7 +71,7 @@ import pub.devrel.easypermissions.AppSettingsDialog;
import pub.devrel.easypermissions.EasyPermissions;
public class ProgressiveTwoActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks,
EasyPermissions.RationaleCallbacks{
EasyPermissions.RationaleCallbacks {
RecyclerView picturesRecyclerView;
PTWImageAdapter imagePaperAdapter;
@ -119,11 +119,9 @@ public class ProgressiveTwoActivity extends AppCompatActivity implements EasyPer
});
}
);
}
else if (result.getResultCode() == RESULT_CANCELED) {
} else if (result.getResultCode() == RESULT_CANCELED) {
Toast.makeText(this, "Gallery Selection Cancelled!", Toast.LENGTH_SHORT).show();
}
else {
} else {
Toast.makeText(this, "Gallery Selection Cancelled!", Toast.LENGTH_SHORT).show();
}
});
@ -169,11 +167,9 @@ public class ProgressiveTwoActivity extends AppCompatActivity implements EasyPer
} else {
Toast.makeText(this, "Image file not found!", Toast.LENGTH_SHORT).show();
}
}
else if (result.getResultCode() == RESULT_CANCELED) {
} else if (result.getResultCode() == RESULT_CANCELED) {
Toast.makeText(this, "Camera capture failed!", Toast.LENGTH_SHORT).show();
}
else {
} else {
Toast.makeText(this, "Camera capture failed!", Toast.LENGTH_SHORT).show();
}
});
@ -220,15 +216,16 @@ public class ProgressiveTwoActivity extends AppCompatActivity implements EasyPer
@Override
public void onClick(View v) {
// Toast.makeText(PermitTwoActivity.this,"Reported Submitted",Toast.LENGTH_SHORT).show();
alertReportSubmit(ProgressiveTwoActivity.this);
if (isValidate()) {
// Toast.makeText(PermitTwoActivity.this,"Reported Submitted",Toast.LENGTH_SHORT).show();
alertReportSubmit(ProgressiveTwoActivity.this);
/*Toast.makeText(ProgressiveActivity.this,"Reported Submitted",Toast.LENGTH_SHORT).show();
Intent intent = new Intent(ProgressiveActivity.this, DashboardActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);*/
}
}
@ -292,7 +289,7 @@ public class ProgressiveTwoActivity extends AppCompatActivity implements EasyPer
});
loginViewModel.getUserSaveLiveData().observe(this, hseSaveResponse -> {
Log.e("Response: ",""+hseSaveResponse.toString());
Log.e("Response: ", "" + hseSaveResponse.toString());
if (hseSaveResponse != null && hseSaveResponse.getResult().equalsIgnoreCase("success")) {
StorageManager.getInstance().clearProgressiveActivityModule();
Toast.makeText(this, "Report Submitted Successfully", Toast.LENGTH_SHORT).show();
@ -307,6 +304,22 @@ public class ProgressiveTwoActivity extends AppCompatActivity implements EasyPer
});
}
public boolean isValidate() {
boolean returnValue = true;
String message = "";
if (etDescription.getText().toString().isEmpty()) {
message = "Please enter description.";
returnValue = false;
}
if (!returnValue) {
Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
}
return returnValue;
}
@SuppressLint("MissingInflatedId")
public void alertForPictures(Context con) {
ViewGroup viewGroup = findViewById(android.R.id.content);
@ -426,6 +439,7 @@ public class ProgressiveTwoActivity extends AppCompatActivity implements EasyPer
public void onClick(View view) {
alertDialog.dismiss();
StorageManager.getInstance().getProgressiveActivityModel().get(0).setPictures(PaperImageList);
List<ReportActivityModel> reportList = StorageManager.getInstance().getProgressiveActivityModel();
HseReportRequest<ReportActivityModel> reportRequest = new HseReportRequest<>();

8
app/src/main/java/com/utopiaindustries/hseobservationsapp/fragments/HomeFragment.java
View File

@ -278,13 +278,13 @@ public class HomeFragment extends Fragment {
case 4:
startActivity(new Intent(getActivity(), InjuryFormOne.class));
break;
case 5:
/*case 5:
startActivity(new Intent(getActivity(), WeeklyFormOne.class));
break;
case 6:
break;*/
case 5:
startActivity(new Intent(getActivity(), ProgressiveActivity.class));
break;
case 7:
case 6:
startActivity(new Intent(getActivity(), OtherHseActivity.class));
break;
default:

20
app/src/main/java/com/utopiaindustries/hseobservationsapp/utils/StorageManager/PermitToWorkModel.java
View File

@ -9,8 +9,8 @@ public class PermitToWorkModel {
private int workingTeamId;
private String workingTeamName;
private String workingPartyType;
private String startTime;
private String endTime;
private String ptwStartTime;
private String ptwEndTime;
private String description;
@ -72,19 +72,19 @@ public class PermitToWorkModel {
this.workingTeamName = workingTeamName;
}
public String getStartTime() {
return startTime;
public String getPtwStartTime() {
return ptwStartTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
public void setPtwStartTime(String ptwStartTime) {
this.ptwStartTime = ptwStartTime;
}
public String getEndTime() {
return endTime;
public String getPtwEndTime() {
return ptwEndTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
public void setPtwEndTime(String ptwEndTime) {
this.ptwEndTime = ptwEndTime;
}
}

2
app/src/main/res/layout/activity_progressive_two.xml
View File

@ -63,7 +63,7 @@
android:layout_marginTop="5dp"
android:gravity="left"
android:padding="5dp"
android:text="Description"
android:text="Description *"
android:textColor="@color/black"
android:textSize="@dimen/_13sdp"
android:textStyle="bold"