diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReportItem.java b/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReportItem.java index 3cb79e3..fa64fff 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReportItem.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReportItem.java @@ -41,8 +41,11 @@ public class InspectionReportItem implements Serializable { private float packHeight; private long sampleSize; private long inspectionLevel; - private long minorQualityLevel; - private long majorQualityLevel; + private double minorQualityLevel; + private double majorQualityLevel; + + private int levelMajorDefects; + private int levelMinorDefects; private int aqlSampleSize; @@ -299,19 +302,19 @@ public class InspectionReportItem implements Serializable { this.checkedPiecesSelected = checkedPiecesSelected; } - public long getMajorQualityLevel() { + public double getMajorQualityLevel() { return majorQualityLevel; } - public void setMajorQualityLevel(long majorQualityLevel) { + public void setMajorQualityLevel(double majorQualityLevel) { this.majorQualityLevel = majorQualityLevel; } - public long getMinorQualityLevel() { + public double getMinorQualityLevel() { return minorQualityLevel; } - public void setMinorQualityLevel(long minorQualityLevel) { + public void setMinorQualityLevel(double minorQualityLevel) { this.minorQualityLevel = minorQualityLevel; } @@ -395,6 +398,22 @@ public class InspectionReportItem implements Serializable { this.aqlSampleSize = aqlSampleSize; } +public int getLevelMajorDefects() { + return levelMajorDefects; +} + +public void setLevelMajorDefects(int levelMajorDefects) { + this.levelMajorDefects = levelMajorDefects; +} + +public int getLevelMinorDefects() { + return levelMinorDefects; +} + +public void setLevelMinorDefects(int levelMinorDefects) { + this.levelMinorDefects = levelMinorDefects; +} + @Override public String toString() { return "InspectionReportItem{" + @@ -431,6 +450,8 @@ public class InspectionReportItem implements Serializable { ", inspectionLevel=" + inspectionLevel + ", minorQualityLevel=" + minorQualityLevel + ", majorQualityLevel=" + majorQualityLevel + + ", levelMajorDefects=" + levelMajorDefects + + ", levelMinorDefects=" + levelMinorDefects + ", aqlSampleSize=" + aqlSampleSize + ", checkedCartonsSelected=" + checkedCartonsSelected + ", checkedPacksSelected=" + checkedPacksSelected + diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/CheckPointAdapter.java b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/CheckPointAdapter.java index 5dde62b..24e7230 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/CheckPointAdapter.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/CheckPointAdapter.java @@ -6,6 +6,7 @@ import android.app.Activity; import android.app.AlertDialog; import android.content.Context; import android.content.Intent; +import android.graphics.Color; import android.net.Uri; import android.os.Environment; import android.provider.MediaStore; @@ -100,6 +101,10 @@ public class CheckPointAdapter extends .findFirst().orElse(new InspectionCheckPoint()); holder.populateDefects(cp, defects, checkPoint); checkPoint.setTitle(selectedItem); + + if (view instanceof TextView) { + ((TextView) view).setTextColor(Color.BLACK); + } } } @Override @@ -209,6 +214,8 @@ public class CheckPointAdapter extends super(itemView); remarks = itemView.findViewById(R.id.check_point_remarks); checkpointSpinner = itemView.findViewById(R.id.check_point_spinner); + checkpointSpinner.setClickable(false); + checkpointSpinner.setEnabled(false); okCheckBox = itemView.findViewById(R.id.check_point_ok); noCheckBox = itemView.findViewById(R.id.check_point_no); imagePicker = itemView.findViewById(R.id.image_picker ); diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/FirstStepFragment.java b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/FirstStepFragment.java index 906ad31..8a49336 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/FirstStepFragment.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/FirstStepFragment.java @@ -221,8 +221,10 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener public void onItemSelected(AdapterView parent, View view, int position, long id) { if (parent.getItemAtPosition(position) != null) { qualityLevelMajor = parent.getItemAtPosition(position).toString(); + Log.e("Quality-Major: ",""+qualityLevelMajor); + store.getReport().getItems().get(0).setMajorQualityLevel(Double.parseDouble(qualityLevelMajor)); - store.getReport().getItems().get(0).setMajorQualityLevel((long) Double.parseDouble(qualityLevelMajor)); + Log.e("Quality-Majorr: ",""+store.getReport().getItems().get(0).getMajorQualityLevel()); checkedBoxCartonSelected.setText(""); checkedItemPerBoxSelected.setText(""); @@ -244,8 +246,11 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener public void onItemSelected(AdapterView parent, View view, int position, long id) { if (parent.getItemAtPosition(position) != null) { qualityLevelMinor = parent.getItemAtPosition(position).toString(); + Log.e("Quality-Minor: ",""+qualityLevelMinor); - store.getReport().getItems().get(0).setMinorQualityLevel((long) Double.parseDouble(qualityLevelMinor)); + store.getReport().getItems().get(0).setMinorQualityLevel(Double.parseDouble(qualityLevelMinor)); + + Log.e("Quality-Minorr: ",""+store.getReport().getItems().get(0).getMinorQualityLevel()); checkedBoxCartonSelected.setText(""); checkedItemPerBoxSelected.setText(""); @@ -896,6 +901,10 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener boxCarton.setText(boxCartonText); packagingDetails.setText(packagingDetailsText); + Log.e("Exception-BOX","***"+store.getReport().getItems().get(0).getCartonsSelected()); + Log.e("Exception**ITEM","***"+store.getReport().getItems().get(0).getPacksSelected()); + Log.e("Exception**PIECE","**"+store.getReport().getItems().get(0).getPiecesSelected()); + boxCartonSelected.setText(String.valueOf(store.getReport().getItems().get(0).getCartonsSelected())); itemPerBoxSelected.setText(String.valueOf(store.getReport().getItems().get(0).getPacksSelected())); piecesSelected.setText(String.valueOf(store.getReport().getItems().get(0).getPiecesSelected())); @@ -925,6 +934,7 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener } } catch (Exception e) { + Log.e("Exception************","**********"); itemPerBox.setText("0"); pieces.setText("0"); boxCarton.setText("0"); @@ -1208,8 +1218,9 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener aqlSampleSize.setText(String.valueOf(sampleSizeMajor)); store.getReport().getItems().get(0).setSampleSize(sampleSizeMajor); - store.getReport().getItems().get(0).setMajorQualityLevel((long) levelMajor); - store.getReport().getItems().get(0).setMinorQualityLevel((long) levelMinor); + store.getReport().getItems().get(0).setLevelMajorDefects((int) levelMajor); + store.getReport().getItems().get(0).setLevelMinorDefects((int) levelMinor); + } catch (Exception e) { e.printStackTrace(); diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/ThirdStepFragment.java b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/ThirdStepFragment.java index edaff84..4290b59 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/ThirdStepFragment.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/fragments/ThirdStepFragment.java @@ -26,6 +26,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.navigation.NavController; import androidx.navigation.Navigation; @@ -70,7 +71,7 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener private ApiService apiService; private EditText generalRemarks, etQualityAuditor, etProdRepresentative, etQcRepresentative; - private TextView minorCountTv,majorCountTv,criticalCountTv, resultStatus; + private TextView minorCountTv,majorCountTv,criticalCountTv, resultStatus, txtMajor, txtMinor; @Nullable @Override @@ -416,18 +417,28 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener majorCountTv.setText( String.format("Major : %d", major ) ) ; criticalCountTv.setText( String.format("Critical : %d", crirical ) ); - long minorInspection = store.getReport().getItems().get(0).getMinorQualityLevel(); - long majorInspection = store.getReport().getItems().get(0).getMinorQualityLevel(); - if((long) minor <= minorInspection - && (long) major <= majorInspection - && (long) crirical == 0) { - resultStatus.setText("Passed"); - store.getReport().setReportResult( "Passed" ); + double majorInspection = store.getReport().getItems().get(0).getLevelMajorDefects(); + double minorInspection = store.getReport().getItems().get(0).getLevelMinorDefects(); + + if((double) minor <= minorInspection + && (double) major <= majorInspection + && (double) crirical == 0) { + resultStatus.setText("PASSED"); + store.getReport().setReportResult("PASSED"); + resultStatus.setTextColor(ContextCompat.getColor(requireContext(),R.color.success)); + //resultStatus.setBackgroundResource( R.drawable.passed_bg ); } else{ - resultStatus.setText("Failed"); - store.getReport().setReportResult( "Failed" ); + resultStatus.setText("FAILED"); + resultStatus.setTextColor(ContextCompat.getColor(requireContext(),R.color.red)); + store.getReport().setReportResult("FAILED"); + //resultStatus.setBackgroundResource( R.drawable.failed_bg ); } + + Log.e("majorCount: ",""+majorInspection); + Log.e("minorCount: ",""+minorInspection); + txtMajor.setText(String.format("Major : %s/%d", (int)majorInspection, (int)(majorInspection + 1))); + txtMinor.setText(String.format("Minor : %s/%d", (int)minorInspection, (int)(minorInspection + 1))); } } @@ -501,6 +512,8 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener etQualityAuditor = view.findViewById(R.id.et_quality_auditor); etProdRepresentative = view.findViewById(R.id.et_prod_represent); etQcRepresentative = view.findViewById(R.id.et_qc_represent); + txtMajor = view.findViewById(R.id.txt_major); + txtMinor = view.findViewById(R.id.txt_minor); } private void setOnClickListeners(){ diff --git a/app/src/main/res/layout/fragment_first_step.xml b/app/src/main/res/layout/fragment_first_step.xml index 4daea70..2b5e976 100644 --- a/app/src/main/res/layout/fragment_first_step.xml +++ b/app/src/main/res/layout/fragment_first_step.xml @@ -511,6 +511,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="5dp" + android:visibility="visible" android:layout_margin="5dp"/> - + android:layout_marginHorizontal="11dp" + android:padding="5dp" + android:orientation="horizontal"> + + + + + + + + + + + - + android:layout_marginHorizontal="11dp" + android:padding="5dp" + android:orientation="horizontal"> + + + + + + + + + + +