From 9322bcea4dc58d165152806ef4670c8d4468480f Mon Sep 17 00:00:00 2001 From: "saad.siddiq" Date: Thu, 26 Dec 2024 13:22:54 +0500 Subject: [PATCH] feedback implemented regarding rating --- .../activities/SummaryActivity.java | 2 +- .../adapters/ItemStepsAdapter.java | 19 ++++++++++++------- .../fragments/SubStoreFragment.java | 2 +- .../models/QualitySaveResponse.java | 2 +- .../qualitycontrol/viewmodels/ItemModel.java | 8 ++++---- .../main/res/layout/item_recycler_view.xml | 4 ++++ 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/activities/SummaryActivity.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/activities/SummaryActivity.java index a42d83a..5decd08 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/activities/SummaryActivity.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/activities/SummaryActivity.java @@ -44,7 +44,7 @@ public class SummaryActivity extends AppCompatActivity { txtChecking.setText(String.format("%s %%", qualitySaveResponse.getChecking())); txtPacking.setText(String.format("%s %%", qualitySaveResponse.getPacking())); txtSubStore.setText(String.format("%s %%", qualitySaveResponse.getSub_Store())); - txtReportId.setText(String.format("Report ID: %s", qualitySaveResponse.getReportId())); + txtReportId.setText(String.format("Code: %s", qualitySaveResponse.getReportId())); img_back.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/adapters/ItemStepsAdapter.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/adapters/ItemStepsAdapter.java index e720066..9d5e232 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/adapters/ItemStepsAdapter.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/adapters/ItemStepsAdapter.java @@ -55,12 +55,17 @@ public class ItemStepsAdapter extends RecyclerView.Adapter parent, View view, int sub_position, long id) { currentItem.setSelectedOption(sub_position); - currentItem.setRating(Integer.parseInt(parent.getItemAtPosition(sub_position).toString())); + currentItem.setRating(Double.parseDouble(parent.getItemAtPosition(sub_position).toString())); selectedValue = Double.parseDouble(parent.getItemAtPosition(sub_position).toString()); percentage = (selectedValue / 5) * 100; diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/SubStoreFragment.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/SubStoreFragment.java index 75dcee6..edd251f 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/SubStoreFragment.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/fragments/SubStoreFragment.java @@ -674,7 +674,7 @@ public class SubStoreFragment extends Fragment implements EasyPermissions.Permis QualityControl qualityControl = new QualityControl(generatedBy, siteID, unitId, departId, floorId, tempList); - Log.e("---final Item: ------", "-----------------"); + //Log.e("---final Item: ------", "-----------------"); for (ItemModel item : tempList) { Log.e("Final-Items: ", "ProcessId: " + item.getProcessId() + diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/models/QualitySaveResponse.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/models/QualitySaveResponse.java index 01175f5..393322b 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/models/QualitySaveResponse.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/models/QualitySaveResponse.java @@ -40,7 +40,7 @@ public class QualitySaveResponse implements Serializable { @Expose private String Sub_Store; - @SerializedName("reportId") + @SerializedName("code") @Expose private String ReportId; diff --git a/app/src/main/java/com/utopiaindustries/qualitycontrol/viewmodels/ItemModel.java b/app/src/main/java/com/utopiaindustries/qualitycontrol/viewmodels/ItemModel.java index fb1952f..ea350cb 100644 --- a/app/src/main/java/com/utopiaindustries/qualitycontrol/viewmodels/ItemModel.java +++ b/app/src/main/java/com/utopiaindustries/qualitycontrol/viewmodels/ItemModel.java @@ -9,7 +9,7 @@ public class ItemModel { private int processId; private int stepId; - private int rating; + private double rating; private String percentage; private String remarks; private int selectedOption; @@ -19,7 +19,7 @@ public class ItemModel { public ItemModel() { } - public ItemModel(int processId, int stepId, int rating, String percentage, String remarks, int selectedOption, byte[] imageByteArray, List imageArrayList) { + public ItemModel(int processId, int stepId, double rating, String percentage, String remarks, int selectedOption, byte[] imageByteArray, List imageArrayList) { this.processId = processId; this.stepId = stepId; this.rating = rating; @@ -70,11 +70,11 @@ public class ItemModel { this.selectedOption = selectedOption; } - public int getRating() { + public double getRating() { return rating; } - public void setRating(int rating) { + public void setRating(double rating) { this.rating = rating; } diff --git a/app/src/main/res/layout/item_recycler_view.xml b/app/src/main/res/layout/item_recycler_view.xml index 37ee555..ac336e1 100644 --- a/app/src/main/res/layout/item_recycler_view.xml +++ b/app/src/main/res/layout/item_recycler_view.xml @@ -52,6 +52,10 @@ android:id="@+id/score_textview" android:layout_width="match_parent" android:layout_height="match_parent" + android:dropDownHeight="300dp" + android:scrollbars="vertical" + android:scrollbarFadeDuration="0" + android:fadeScrollbars="false" android:layout_gravity="start|left" android:gravity="center" android:inputType="none"