diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/apiservice/RetrofitClient.java b/app/src/main/java/com/utopiaindustries/qualitychecker/apiservice/RetrofitClient.java index 70a96f8..28e238d 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/apiservice/RetrofitClient.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/apiservice/RetrofitClient.java @@ -19,8 +19,8 @@ import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; public class RetrofitClient { - private final static String BASE_URL = "https://portal.utopiaindustries.pk/uind/"; - //private final static String BASE_URL = "http://192.168.91.44:8081/uind/";//"http://192.168.91.44:8081/uind/";//"http://192.168.90.27:8080/uind/";//"http://192.168.91.16:8080/uind/"; + //private final static String BASE_URL = "https://portal.utopiaindustries.pk/uind/"; + private final static String BASE_URL = "http://192.168.91.44:8081/uind/";//"http://192.168.91.44:8081/uind/";//"http://192.168.90.27:8080/uind/";//"http://192.168.91.16:8080/uind/"; private static Retrofit retrofit; diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReport.java b/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReport.java index b887c37..73a4dea 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReport.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/models/InspectionReport.java @@ -26,6 +26,7 @@ public class InspectionReport implements Serializable { private String floor; private String auditDate; private String appVersion; + private String sku; // wrapper @@ -198,6 +199,14 @@ public class InspectionReport implements Serializable { this.appVersion = appVersion; } + public String getSku() { + return sku; + } + + public void setSku(String sku) { + this.sku = sku; + } + @Override public String toString() { return "InspectionReport{" + diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/store/Store.java b/app/src/main/java/com/utopiaindustries/qualitychecker/store/Store.java index 9432cee..c578bb5 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/store/Store.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/store/Store.java @@ -39,6 +39,7 @@ public class Store { private List checkpointSkus; private boolean isNewReportPresented; private boolean isNewReportSelected; + private boolean isNewAQL; private Store(){ } @@ -252,6 +253,14 @@ public class Store { isNewReportSelected = newReportSelected; } + public boolean isNewAQL() { + return isNewAQL; + } + + public void setNewAQL(boolean newAQL) { + isNewAQL = newAQL; + } + @Override public String toString() { return "Store{" + diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/ItemHistoryAdapter.java b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/ItemHistoryAdapter.java index 8ac5e4f..fe593ea 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/ItemHistoryAdapter.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/ItemHistoryAdapter.java @@ -76,9 +76,16 @@ public class ItemHistoryAdapter extends } else { itemDate.setText(""); } - itemCartons.setText( String.format("Cartons : %f", item.getCartonsSelected() ) ); - itemPacks.setText( String.format("Packs : %f", item.getPacksSelected() ) ); - itemPieces.setText( String.format("Pieces : %f", item.getPiecesSelected() ) ); + + try { + itemCartons.setText( String.format("Cartons : %f", item.getCartonsSelected() ) ); + itemPacks.setText( String.format("Packs : %f", item.getPacksSelected() ) ); + itemPieces.setText( String.format("Pieces : %f", item.getPiecesSelected() ) ); + } + catch (Exception e) { + e.printStackTrace(); + } + } } } diff --git a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/ReportAdapter.java b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/ReportAdapter.java index 9f1cd20..15e664e 100644 --- a/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/ReportAdapter.java +++ b/app/src/main/java/com/utopiaindustries/qualitychecker/ui/adapter/ReportAdapter.java @@ -63,7 +63,7 @@ public class ReportAdapter extends public void bindDate( InspectionReport report ) throws ParseException { codeTv.setText( report.getCode() ); createdByTv.setText( report.getGeneratedBy() ); - remarksTv.setText( report.getGeneralRemarks() ); + remarksTv.setText( report.getSku() ); Date date = jsonDateFormat.parse( report.getGeneratedAt() ); // Format the date in 12-hour format 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 8eea952..4ad7d56 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 @@ -124,6 +124,9 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener qualityLevelMajor = String.valueOf(store.getReport().getItems().get(0).getMajorQualityLevel()); qualityLevelMinor = String.valueOf(store.getReport().getItems().get(0).getMinorQualityLevel()); + String selectedString = store.getReport().getItems().get(0).getMarketplace(); + Log.e("marketPlace-draft: ",""+selectedString); + } initializeViews(view); @@ -143,9 +146,6 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener // sku.setText(store.getReport().getItems().get(0).getFnsku()); if (draftReportId > 0) { - String selectedString = store.getReport().getItems().get(0).getMarketplace(); - int index = marketplaces.indexOf(selectedString); - markerplace.setSelection(index); if (sku.getText() != null) { populateProductDataOnSelection(sku.getText().toString(), "", true); @@ -434,6 +434,8 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener } catch (Exception e) { store.getReport().getItems().get(0).setCheckedCartonsSelected(0); store.setNewReportPresented(true); + store.setNewReportSelected(true); + store.setNewAQL(true); } } @@ -785,6 +787,7 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener store.setNewReportPresented(false); store.setNewReportSelected(false); + store.setNewAQL(false); //--Draft Incomplete Report //Log.e("sku: ",""+sku.getText().toString()); //Log.e("Market-place: ",""+store.getReport().getItems().get(0).getMarketplace()); @@ -841,6 +844,7 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener navController.navigate(R.id.action_firstStepFragment_to_secondStepFragment); store.setNewReportPresented(false); store.setNewReportSelected(false); + store.setNewAQL(false); } else { Toast.makeText(getContext(), "Please enter or scan sku details", Toast.LENGTH_SHORT).show(); } @@ -936,6 +940,13 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener String defaultLevelMinorSelection = String.valueOf(store.getReport().getItems().get(0).getMinorQualityLevel()); int defaultLevelMinorSelectionIndex = java.util.Arrays.asList(inspectionLevelQuality).indexOf(defaultLevelMinorSelection); sp_qLevelMinor.setSelection(defaultLevelMinorSelectionIndex); + + String selectedString = store.getReport().getItems().get(0).getMarketplace(); + //Log.e("marketPlace-draft-selected: ",""+selectedString); + int index = marketplaces.indexOf(selectedString); + //Log.e("marketPlace-draft-index: ",""+index); + markerplace.setSelection(index); + } private void populateItem(List products, boolean populateMarketplace) { @@ -1071,7 +1082,7 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener markerplace.setAdapter(adapter); // String marketplaceOption = (String) markerplace.getSelectedItem(); - store.getReport().getItems().get(0).setMarketplace(marketplaceOption); + //.getReport().getItems().get(0).setMarketplace(marketplaceOption); } //if (store.getReport().getItems().get(0).getInspectionLevel() == 0) { @@ -1267,7 +1278,7 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener } } - String testDetails = "Item Presented Pieces: " + itemPresentedPieces + /*String testDetails = "Item Presented Pieces: " + itemPresentedPieces + "\nInspection Level: " + inspectionLevel + "\nSelected Level Major: " + selectedLevelMajor + "\nSelected Level Minor: " + selectedLevelMinor @@ -1275,16 +1286,27 @@ public class FirstStepFragment extends Fragment implements View.OnClickListener + "\nLevel Major Defects: " + levelMajor + "\nLevel Minor Defects: " + levelMinor + "\nSampleSizeMajor: " + sampleSizeMajor - + "\nSampleSizeMinor: " + sampleSizeMinor; + + "\nSampleSizeMinor: " + sampleSizeMinor;*/ - txtTesting.setText(testDetails); + //txtTesting.setText(testDetails); //Log.e("SampleSizeMajor: ",""+sampleSizeMajor); - aqlSampleSize.setText(String.valueOf(sampleSizeMajor)); - store.getReport().getItems().get(0).setSampleSize(sampleSizeMajor); - store.getReport().getItems().get(0).setLevelMajorDefects((int) levelMajor); - store.getReport().getItems().get(0).setLevelMinorDefects((int) levelMinor); + Log.e("New-selected",""+store.isNewReportSelected()); + Log.e("New-AQL",""+store.isNewAQL()); + if (store.isNewAQL()) { + aqlSampleSize.setText(String.valueOf(sampleSizeMajor)); + + store.getReport().getItems().get(0).setSampleSize(sampleSizeMajor); + store.getReport().getItems().get(0).setLevelMajorDefects((int) levelMajor); + store.getReport().getItems().get(0).setLevelMinorDefects((int) levelMinor); + + Log.e("New-Level-Major: ",""+levelMajor); + Log.e("New-Level-Minor: ",""+levelMinor); + } + else { + aqlSampleSize.setText(String.valueOf(store.getReport().getItems().get(0).getSampleSize())); + } } 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 032c4ec..6cf027f 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 @@ -75,6 +75,7 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; +import java.util.Date; import java.util.List; import java.util.Locale; import java.util.Map; @@ -153,6 +154,7 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener } ); + Log.e("Dimensions: ",""+store.getReport().getItems().get(0).getDimensions()); ItemDimensionAdapter adapter = new ItemDimensionAdapter(store.getReport().getItems().get(0).getDimensions()); itemDimensionsRecyclerView.setAdapter(adapter); @@ -489,6 +491,7 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener Handler handler = new Handler(Looper.getMainLooper()); handler.post(() -> { + calculateDimensions(); Log.e("Report-ToString: ", "" + store.getReport().toString()); SharedPreferences sharedPreferences = getContext().getSharedPreferences("login_prefs", Context.MODE_PRIVATE); long draftReportId = Long.parseLong(sharedPreferences.getString("draftReportId", null)); @@ -657,7 +660,9 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener criticalCountTv.setText(String.format("Critical : %d", crirical)); double majorInspection = store.getReport().getItems().get(0).getLevelMajorDefects(); + Log.e("majorInspection: ",""+majorInspection); double minorInspection = store.getReport().getItems().get(0).getLevelMinorDefects(); + Log.e("minorInspection: ",""+minorInspection); if ((double) minor <= minorInspection && (double) major <= majorInspection @@ -703,6 +708,11 @@ public class ThirdStepFragment extends Fragment implements View.OnClickListener etHandFeelNotOk.setText(String.valueOf(store.getReport().getItems().get(0).getHandFeelNotOkay())); txtDate.setText(store.getReport().getAuditDate()); } + else { + String currentDate = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date()); + txtDate.setText(currentDate); + store.getReport().setAuditDate(currentDate); + } } private void setCurrentVersion() {