From f0f03b4de1aae9913c679fe8ec5108d19ebb8b1f Mon Sep 17 00:00:00 2001 From: Gius95 Date: Fri, 28 Dec 2018 18:41:21 +0100 Subject: [PATCH 1/5] Sistemata untMis in RecuperaUL. Sistemato diacod in Rettifica Giacenze. Rimosso testo "Evasi" nelle liste di arts. --- .idea/caches/build_file_checksums.ser | Bin 728 -> 728 bytes .../integrywmsnative/core/di/Converters.java | 2 +- .../integrywmsnative/core/model/MtbColr.java | 2 +- .../integrywmsnative/core/model/MtbColt.java | 4 +- .../lista_bancali/ListaBancaliActivity.java | 2 +- .../viewmodel/RettificaGiacenzeViewModel.java | 1 + .../input_quantity/DialogInputQuantity.java | 10 ++--- ...so_main_list___cod_art_for_group_model.xml | 14 +++--- ..._choose_art_from_lista_art__item_model.xml | 42 +++++++++++++----- ...hoose_arts_from_lista_arts__item_model.xml | 2 +- .../layout/dialog_input_quantity_articolo.xml | 31 +++++++++---- ...li_in_collo_bottom_sheet__mtbcolr_item.xml | 2 +- .../lista_contenuto_bancale_list_model.xml | 2 +- ...ne_inevaso_main_list_child_group_model.xml | 14 +++--- waterfall_toolbar/build.gradle | 2 +- 15 files changed, 82 insertions(+), 48 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index af6a9970ae05b89391c13ac6fc07d39be3094924..028e332f32dcd4ee02d538b352eddc4996b79215 100644 GIT binary patch delta 36 ucmV+<0NelA1=t0Um;~@9152@-x&aWA7rQ!c5?cN2)Vrp2{M?6=W&(05LJ>Ov delta 36 ucmV+<0NelA1=t0Um;~?T#0{~Wx&aWId5{As%+$OQ${@V1N!ezTW&(0Vco8Z9 diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java index 9d10a038..c272b95c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java @@ -103,7 +103,7 @@ public class Converters { final DecimalFormat decimalFormat = new DecimalFormat(); - decimalFormat.setMaximumFractionDigits(2); + decimalFormat.setMaximumFractionDigits(3); decimalFormat.setDecimalFormatSymbols(otherSymbols); Pair pair = (Pair) view.getTag(R.id.bound_observable); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java index 238a8c25..2fc55863 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java @@ -123,7 +123,7 @@ public class MtbColr extends EntityBase implements Parcelable { numCnf = new BigDecimal(in.readFloat()); } - in.readParcelable(MtbAart.class.getClassLoader()); + mtbAart = in.readParcelable(MtbAart.class.getClassLoader()); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java index 429a7e88..d6277819 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java @@ -139,7 +139,7 @@ public class MtbColt extends EntityBase implements Parcelable { - in.readTypedList(mtbColr, MtbColr.CREATOR); + in.readList(mtbColr, MtbColr.class.getClassLoader()); } @@ -228,7 +228,7 @@ public class MtbColt extends EntityBase implements Parcelable { dest.writeFloat(altezzaCm.floatValue()); } - dest.writeTypedList(mtbColr); + dest.writeList(mtbColr); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java index 0d42f5e1..dce2379e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java @@ -70,7 +70,7 @@ public class ListaBancaliActivity extends AppCompatActivity { // Make sure the request was successful if (resultCode == RESULT_OK) { -// MtbColt recoveredMtbColt = data.getParcelableExtra("key"); + MtbColt recoveredMtbColt = data.getParcelableExtra("key"); this.setResult(RESULT_OK, data); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index dc357629..3fb0ff5c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -290,6 +290,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked qtaDto.setQtaTot(mtbAart.getQtaCnf()); qtaDto.setQtaDaEvadere(new BigDecimal(-1)); + qtaDto.setQtaDisponibile(new BigDecimal(-1)); qtaDto.setCanPartitaMagBeChanged(true); qtaDto.setCanDataScadBeChanged(true); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java index 83bdde45..06d1b561 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java @@ -459,7 +459,7 @@ public class DialogInputQuantity { if (!quantityDTO.blockedQtaTot.get()) { quantityDTO.qtaTotNotificationEnabled = false; - quantityDTO.qtaTot.set((float) Math.round(quantityDTO.qtaCnf.get(true) * quantityDTO.numCnf.get(true) * 100) / 100); + quantityDTO.qtaTot.set((float) Math.round(quantityDTO.qtaCnf.get(true) * quantityDTO.numCnf.get(true) * 1000) / 1000); quantityDTO.qtaTotNotificationEnabled = true; @@ -467,9 +467,9 @@ public class DialogInputQuantity { quantityDTO.qtaCnfNotificationEnabled = false; if(quantityDTO.numCnf.get(true) != 0) { - quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / quantityDTO.numCnf.get(true) * 100) / 100); + quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / quantityDTO.numCnf.get(true) * 1000) / 1000); } else { - quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / 1 * 100) / 100); + quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / 1 * 1000) / 1000); } quantityDTO.qtaCnfNotificationEnabled = true; @@ -494,7 +494,7 @@ public class DialogInputQuantity { if (!quantityDTO.blockedQtaTot.get()) { quantityDTO.qtaTotNotificationEnabled = false; - quantityDTO.qtaTot.set((float) Math.round(quantityDTO.qtaCnf.get(true) * quantityDTO.numCnf.get(true) * 100) / 100); + quantityDTO.qtaTot.set((float) Math.round(quantityDTO.qtaCnf.get(true) * quantityDTO.numCnf.get(true) * 1000) / 1000); quantityDTO.qtaTotNotificationEnabled = true; } else if (!quantityDTO.blockedNumDiCnf.get()) { @@ -529,7 +529,7 @@ public class DialogInputQuantity { if(!quantityDTO.blockedQtaPerCnf.get()){ quantityDTO.qtaCnfNotificationEnabled = false; - quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / quantityDTO.numCnf.get(true) *100)/100); + quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / quantityDTO.numCnf.get(true) *1000)/1000); quantityDTO.qtaCnfNotificationEnabled = true; } else if(!quantityDTO.blockedNumDiCnf.get()) { diff --git a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list___cod_art_for_group_model.xml b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list___cod_art_for_group_model.xml index ad907c78..f3137fd7 100644 --- a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list___cod_art_for_group_model.xml +++ b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list___cod_art_for_group_model.xml @@ -49,13 +49,13 @@ android:orientation="horizontal" android:gravity="right"> - + + + + + + + - - + + + + + + + + --> - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml index 85b0ccb2..edb03fa9 100644 --- a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml +++ b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml @@ -96,7 +96,7 @@ android:paddingTop="2dp" android:paddingRight="6dp" android:paddingBottom="2dp" - android:text="@{UtilityNumber.decimalToString(checkableMtbColr.mtbColr.getQtaCol()) + `\n` + checkableMtbColr.mtbColr.getUntMis()}" + android:text="@{UtilityNumber.decimalToString(checkableMtbColr.mtbColr.getQtaCol()) + (checkableMtbColr.mtbColr.mtbAart != null && !UtilityString.isNullOrEmpty(checkableMtbColr.mtbColr.mtbAart.untMis) ? `\n` + checkableMtbColr.mtbColr.mtbAart.untMis : ``)}" android:textSize="16sp" android:textColor="@android:color/white" android:textStyle="bold" diff --git a/app/src/main/res/layout/dialog_input_quantity_articolo.xml b/app/src/main/res/layout/dialog_input_quantity_articolo.xml index 278f9fe3..158cdae9 100644 --- a/app/src/main/res/layout/dialog_input_quantity_articolo.xml +++ b/app/src/main/res/layout/dialog_input_quantity_articolo.xml @@ -22,6 +22,8 @@ + + + + - + + + + + + - + + + + + + + Date: Sat, 29 Dec 2018 16:46:09 +0100 Subject: [PATCH 2/5] Sistemato background liste con lettura facilitata --- .idea/caches/build_file_checksums.ser | Bin 728 -> 728 bytes .../core/AccettazioneOrdineInevasoHelper.java | 4 +++- .../core/MainListOrdineAccettazioneAdapter.java | 4 ++-- ...oneOnOrdineAccettazioneInevasoViewModel.java | 10 ++++++++++ .../lista_bancali/ListaBancaliActivity.java | 2 +- .../MainListOrdineVenditaInevasoAdapter.java | 4 ++-- .../activity_accettazione_ordine_inevaso.xml | 1 + app/src/main/res/values/strings.xml | 1 + 8 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 028e332f32dcd4ee02d538b352eddc4996b79215..53c9eba843f526a1f6fe15320d2534860e7407ad 100644 GIT binary patch delta 15 Xcmcb?dV_Vs43=N5x9T^}v0(xLJdp=V delta 15 Xcmcb?dV_Vs43-aS%-$R4*f0SAGnxg~ diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java index 0c54fe57..fb5a1193 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java @@ -298,7 +298,9 @@ public class AccettazioneOrdineInevasoHelper { if(mtbColrs != null) { SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); - List filteredMtbColrs = Stream.of(mtbColrs).filter( + List filteredMtbColrs = Stream.of(mtbColrs) + .filter(x -> x.getNumOrd() != null) + .filter( x -> x.getCodMart().equalsIgnoreCase(item.mtbAart.getCodMart()) && (x.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(item.codJcom)) && x.getRigaOrd() == item.rigaOrd && diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/MainListOrdineAccettazioneAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/MainListOrdineAccettazioneAdapter.java index 15738f79..84969e68 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/MainListOrdineAccettazioneAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/MainListOrdineAccettazioneAdapter.java @@ -165,9 +165,9 @@ public class MainListOrdineAccettazioneAdapter extends RecyclerView.Adapter
0) { groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha)); } else if (visibleElementsCounter % 2 == 1) { - groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG)); - } else { groupModelView.setBackgroundColor(Color.WHITE); + } else { + groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG)); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java index e37c9478..0cefdb07 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java @@ -13,6 +13,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; import it.integry.integrywmsnative.BR; import it.integry.integrywmsnative.R; @@ -170,11 +171,20 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl MtbColr currentMtbColr = recoveredMtbColt.getMtbColr().get(i); + /* List foundRows = Stream.of(groupedOrdini) .filter(x -> x.getNumOrd() == currentMtbColr.getNumOrd() && x.getRigaOrd() == currentMtbColr.getRigaOrd()&& x.getDataOrd().equals(currentMtbColr.getDataOrdD())) .toList(); + */ + + List foundRows = Stream.of(groupedOrdini) + .filter(x -> Objects.equals(x.mtbAart.getCodMart(), currentMtbColr.getCodMart()) && + Objects.equals(x.getPartitaMag(), currentMtbColr.getPartitaMag()) && + Objects.equals(x.getCodJcom(), currentMtbColr.getCodJcom())) + .toList(); + if(foundRows != null && foundRows.size() > 0){ OrdineAccettazioneDTO.Riga currentRow = foundRows.get(0); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java index dce2379e..b652a836 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java @@ -70,7 +70,7 @@ public class ListaBancaliActivity extends AppCompatActivity { // Make sure the request was successful if (resultCode == RESULT_OK) { - MtbColt recoveredMtbColt = data.getParcelableExtra("key"); + // MtbColt recoveredMtbColt = data.getParcelableExtra("key"); this.setResult(RESULT_OK, data); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java index 9ce8c64e..f28d2dc8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java @@ -157,9 +157,9 @@ public class MainListOrdineVenditaInevasoAdapter extends RecyclerView.Adapter 0) { groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha)); } else if (visibleElementsCounter % 2 == 1) { - groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG)); - } else { groupModelView.setBackgroundColor(Color.WHITE); + } else { + groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG)); } final TextView badge1 = groupModelView.findViewById(R.id.vendita_ordine_inevaso_main_list_group_item_badge1); diff --git a/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml b/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml index d61929db..666f22e6 100644 --- a/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml +++ b/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml @@ -14,6 +14,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="false" + android:background="@color/full_white" xmlns:fab="http://schemas.android.com/apk/res-auto" android:layout_gravity="top"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1bd0df03..6a5cb52e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -171,5 +171,6 @@ Multiple LU found Do you want print the label? Please scan a Position barcode + SplashActivity From 3b88a8ca5698428d7cc6b460438805151a03590f Mon Sep 17 00:00:00 2001 From: Gius95 Date: Thu, 3 Jan 2019 10:33:14 +0100 Subject: [PATCH 3/5] Implementato splashscreen. Implementato blocco quando si usano etichette anonime che non sono dell'anno corrente. --- .idea/assetWizardSettings.xml | 5 ++ app/src/main/AndroidManifest.xml | 24 +++-- .../integrywmsnative/MainActivity.java | 32 +++---- .../integrywmsnative/SplashActivity.java | 90 +++++++++++++++++++ .../consumers/ColliMagazzinoRESTConsumer.java | 13 +++ .../core/utility/PermissionsHelper.java | 12 ++- .../core/utility/UtilityBarcode.java | 9 ++ .../main/res/drawable/splash_background.xml | 7 ++ app/src/main/res/layout/activity_splash.xml | 73 +++++++++++++++ app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/styles.xml | 4 + 12 files changed, 240 insertions(+), 32 deletions(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/SplashActivity.java create mode 100644 app/src/main/res/drawable/splash_background.xml create mode 100644 app/src/main/res/layout/activity_splash.xml diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index a06c805b..f48666fb 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -3,6 +3,11 @@