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

feedback implemented

master
saad.siddiq 2024-12-10 18:02:02 +05:00
parent 6e8b32edaa
commit c19c13a247
7 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@ -48,6 +48,7 @@
</activity>
<activity
android:name=".activities.HomeActivity"
android:windowSoftInputMode="adjustPan"
android:exported="true" />
<provider

11
app/src/main/java/com/utopiaindustries/qualitycontrol/adapters/ItemStepsAdapter.java
View File

@ -48,6 +48,7 @@ public class ItemStepsAdapter extends RecyclerView.Adapter<ItemStepsAdapter.Item
private final List<String> dropdownOptions = new ArrayList<>();
double percentage = 0.0, selectedValue = 0.0;
private final ImageSelectionListener imageSelectionListener;
private boolean isBinding = false;
public ItemStepsAdapter(Context context, List<ItemModel> items, ImageSelectionListener listener) {
this.context = context;
@ -71,11 +72,14 @@ public class ItemStepsAdapter extends RecyclerView.Adapter<ItemStepsAdapter.Item
@Override
public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) {
isBinding = true;
ItemModel currentItem = items.get(position);
// Set data
holder.et_remarks.setText(currentItem.getRemarks());
holder.tvPercentage.setText(currentItem.getPercentage());
holder.et_remarks.setText(currentItem.getRemarks());
isBinding = false;
holder.scoreTextview.setText(String.valueOf(dropdownOptions.get(currentItem.getSelectedOption())));
@ -119,7 +123,6 @@ public class ItemStepsAdapter extends RecyclerView.Adapter<ItemStepsAdapter.Item
break;
}
holder.et_remarks.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@ -128,12 +131,16 @@ public class ItemStepsAdapter extends RecyclerView.Adapter<ItemStepsAdapter.Item
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
currentItem.setRemarks(s.toString());
//Log.e("onTextChange: ","*****");
}
@Override
public void afterTextChanged(Editable s) {
if (!isBinding) {
// Do nothing
Log.e("afterTextChanged: ", "*****");
currentItem.setRemarks(s.toString());
}
}
});

8
app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/CheckingFragment.java
View File

@ -206,15 +206,15 @@ public class CheckingFragment extends Fragment implements EasyPermissions.Permis
List<ItemModel> updatedItemList = itemModelList; // Or adapter.getItemList()
/*for (ItemModel item : updatedItemList) {
Log.e("AdapterData", "ProcessId: " + item.getProcessId() +
for (ItemModel item : updatedItemList) {
Log.e("Checking", "ProcessId: " + item.getProcessId() +
", StepId: " + item.getStepId() +
", SpinnerSelection: " + item.getSelectedOption() +
", Rating: " + item.getRating() +
", Percentage: " + item.getPercentage() +
", Remarks: " + item.getRemarks() +
", ImageList: " + item.getImageArrayList());
}*/
}
Helper.saveArrayList(itemModelList, Helper.listChecking,getActivity());
@ -477,7 +477,7 @@ public class CheckingFragment extends Fragment implements EasyPermissions.Permis
perms = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
}
EasyPermissions.requestPermissions(this, getString(R.string.rationale_camera), GALLERY_REQUEST, perms);
EasyPermissions.requestPermissions(this, getString(R.string.rationale_gallery), GALLERY_REQUEST, perms);
}
}

8
app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/CuttingFragment.java
View File

@ -212,15 +212,15 @@ public class CuttingFragment extends Fragment implements EasyPermissions.Permiss
List<ItemModel> updatedItemList = itemModelList; // Or adapter.getItemList()
/*for (ItemModel item : updatedItemList) {
Log.e("AdapterData", "ProcessId: " + item.getProcessId() +
for (ItemModel item : updatedItemList) {
Log.e("Cutting", "ProcessId: " + item.getProcessId() +
", StepId: " + item.getStepId() +
", SpinnerSelection: " + item.getSelectedOption() +
", Rating: " + item.getRating() +
", Percentage: " + item.getPercentage() +
", Remarks: " + item.getRemarks() +
", ImageList: " + item.getImageArrayList());
}*/
}
Helper.saveArrayList(itemModelList, Helper.listCutting, getActivity());
@ -427,7 +427,7 @@ public class CuttingFragment extends Fragment implements EasyPermissions.Permiss
perms = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
}
EasyPermissions.requestPermissions(this, getString(R.string.rationale_camera), GALLERY_REQUEST, perms);
EasyPermissions.requestPermissions(this, getString(R.string.rationale_gallery), GALLERY_REQUEST, perms);
}
}

8
app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/PackingFragment.java
View File

@ -220,15 +220,15 @@ public class PackingFragment extends Fragment implements EasyPermissions.Permiss
List<ItemModel> updatedItemList = itemModelList; // Or adapter.getItemList()
/*for (ItemModel item : updatedItemList) {
Log.e("AdapterData", "ProcessId: " + item.getProcessId() +
for (ItemModel item : updatedItemList) {
Log.e("Packing", "ProcessId: " + item.getProcessId() +
", StepId: " + item.getStepId() +
", SpinnerSelection: " + item.getSelectedOption() +
", Rating: " + item.getRating() +
", Percentage: " + item.getPercentage() +
", Remarks: " + item.getRemarks() +
", ImageList: " + item.getImageArrayList());
}*/
}
Helper.saveArrayList(itemModelList, Helper.listPacking,getActivity());
@ -478,7 +478,7 @@ public class PackingFragment extends Fragment implements EasyPermissions.Permiss
perms = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
}
EasyPermissions.requestPermissions(this, getString(R.string.rationale_camera), GALLERY_REQUEST, perms);
EasyPermissions.requestPermissions(this, getString(R.string.rationale_gallery), GALLERY_REQUEST, perms);
}
}

8
app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/StitchingFragment.java
View File

@ -219,15 +219,15 @@ public class StitchingFragment extends Fragment implements EasyPermissions.Permi
List<ItemModel> updatedItemList = itemModelList; // Or adapter.getItemList()
/*for (ItemModel item : updatedItemList) {
Log.e("AdapterData", "ProcessId: " + item.getProcessId() +
for (ItemModel item : updatedItemList) {
Log.e("Stitching", "ProcessId: " + item.getProcessId() +
", StepId: " + item.getStepId() +
", SpinnerSelection: " + item.getSelectedOption() +
", Rating: " + item.getRating() +
", Percentage: " + item.getPercentage() +
", Remarks: " + item.getRemarks() +
", ImageList: " + item.getImageArrayList());
}*/
}
Helper.saveArrayList(itemModelList, Helper.listStitching,getActivity());
@ -480,7 +480,7 @@ public class StitchingFragment extends Fragment implements EasyPermissions.Permi
perms = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
}
EasyPermissions.requestPermissions(this, getString(R.string.rationale_camera), GALLERY_REQUEST, perms);
EasyPermissions.requestPermissions(this, getString(R.string.rationale_gallery), GALLERY_REQUEST, perms);
}
}

34
app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/SubStoreFragment.java
View File

@ -303,8 +303,7 @@ public class SubStoreFragment extends Fragment implements EasyPermissions.Permis
Helper.RemoveArrayList(Helper.listChecking, requireActivity());
Helper.RemoveArrayList(Helper.listPacking, requireActivity());
Helper.RemoveArrayList(Helper.listSubStore, requireActivity());
}
catch (Exception ex) {
} catch (Exception ex) {
Log.e("Exception: ", "" + ex.getMessage());
}
@ -537,7 +536,7 @@ public class SubStoreFragment extends Fragment implements EasyPermissions.Permis
perms = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
}
EasyPermissions.requestPermissions(this, getString(R.string.rationale_camera), GALLERY_REQUEST, perms);
EasyPermissions.requestPermissions(this, getString(R.string.rationale_gallery), GALLERY_REQUEST, perms);
}
}
@ -578,8 +577,7 @@ public class SubStoreFragment extends Fragment implements EasyPermissions.Permis
ProgressDialogFragment progressDialog = new ProgressDialogFragment();
progressDialog.setCancelable(false);
progressDialog.show(getActivity().getSupportFragmentManager(), "progressDialog");
}
else {
} else {
Log.e("Dialog-Activity", ": null");
}
@ -591,8 +589,7 @@ public class SubStoreFragment extends Fragment implements EasyPermissions.Permis
if (progressDialog != null) {
progressDialog.dismiss();
}
}
else {
} else {
Log.e("Dialog-Activity", ": null");
}
}
@ -644,15 +641,15 @@ public class SubStoreFragment extends Fragment implements EasyPermissions.Permis
List<ItemModel> updatedItemList = itemModelList; // Or adapter.getItemList()
/*for (ItemModel item : updatedItemList) {
Log.e("AdapterData", "ProcessId: " + item.getProcessId() +
for (ItemModel item : updatedItemList) {
Log.e("Substore: ", "ProcessId: " + item.getProcessId() +
", StepId: " + item.getStepId() +
", SpinnerSelection: " + item.getSelectedOption() +
", Rating: " + item.getRating() +
", Percentage: " + item.getPercentage() +
", Remarks: " + item.getRemarks() +
", ImageList: " + item.getImageArrayList());
}*/
}
Helper.saveArrayList(itemModelList, Helper.listSubStore, getActivity());
//viewModel.appendToQualityControlItemList(itemModelList);
@ -677,13 +674,18 @@ public class SubStoreFragment extends Fragment implements EasyPermissions.Permis
QualityControl qualityControl = new QualityControl(generatedBy, siteID, unitId, departId, floorId, tempList);
/*Log.e("---------------","-----------------");
Log.e("---final Item: ------", "-----------------");
for (ItemModel item : tempList) {
Log.e("Final-Items: ", "ProcessId: " + item.getProcessId() +
", StepId: " + item.getStepId() +
", SpinnerSelection: " + item.getSelectedOption() +
", Rating: " + item.getRating() +
", Percentage: " + item.getPercentage() +
", Remarks: " + item.getRemarks() +
", ImageList: " + item.getImageArrayList());
}
Log.e("AdapterData-2", "Generated-By: " + qualityControl.getGeneratedBy() +
", siteID: " + qualityControl.getSiteId() +
", unitId: " + qualityControl.getUnitId() +
", departId: " + qualityControl.getDepartmentId() +
", floorId: " + qualityControl.getFloorId());*/
homeViewModel.saveQualityControlData(qualityControl);