From d9844315a30e6fca5eec4732ede96c95ddd5092a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 28 Dec 2020 12:17:43 +0100 Subject: [PATCH 1/2] Sistemato salvataggio causale in Rettifica Giacenze nel caso in cui si preme il tasto Back nella videata del collo --- .../RettificaGiacenzeViewModel.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index 3b0ddef0..9d67afd5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -61,6 +61,8 @@ public class RettificaGiacenzeViewModel { private String mCurrentCodMdep; private boolean mIsCreatedLU; + private boolean mAnyEditDone = false; + @Inject public RettificaGiacenzeViewModel(ArticoloRESTConsumer articoloRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, @@ -350,6 +352,8 @@ public class RettificaGiacenzeViewModel { mCurrentMtbColt.getMtbColr().add(mtbColr); + this.mAnyEditDone = true; + this.sendOnRowSaved(); this.sendOnLoadingEnded(); @@ -380,6 +384,8 @@ public class RettificaGiacenzeViewModel { mCurrentMtbColt.getMtbColr().add(mtbColr); + this.mAnyEditDone = true; + this.sendOnRowSaved(); this.sendOnLoadingEnded(); @@ -417,9 +423,11 @@ public class RettificaGiacenzeViewModel { if(shouldChangePosition) { this.savePosizione(mtbDepoPosizione, () -> { + this.mAnyEditDone = false; postSaveBehaviour(onComplete); }); } else { + this.mAnyEditDone = false; postSaveBehaviour(onComplete); } @@ -427,7 +435,7 @@ public class RettificaGiacenzeViewModel { }, this::sendError); }; - if (!UtilityString.isNullOrEmpty(mDefaultCausale)) { + if (!UtilityString.isNullOrEmpty(mDefaultCausale) && (saveCausale || mAnyEditDone)) { this.saveCausaleRettificaGiacenze(saveAction); } else { saveAction.run(); @@ -564,6 +572,8 @@ public class RettificaGiacenzeViewModel { this.mCurrentMtbColt.getMtbColr().remove(mtbColrToUpdate); this.mCurrentMtbColt.getMtbColr().add(mtbColrToUpdate); + this.mAnyEditDone = true; + this.sendOnRowSaved(); }, this::sendError @@ -602,6 +612,8 @@ public class RettificaGiacenzeViewModel { this.mCurrentMtbColt.getMtbColr().remove(mtbColrToUpdate); this.mCurrentMtbColt.getMtbColr().add(mtbColr); + this.mAnyEditDone = true; + this.sendOnRowSaved(); this.sendOnLoadingEnded(); From 13cc9f605359c83ffd4213d95863718b38dbc3bd Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 28 Dec 2020 12:18:20 +0100 Subject: [PATCH 2/2] -> v1.13.30 (176) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 607632dd..46375c5c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 175 - def appVersionName = '1.13.29' + def appVersionCode = 176 + def appVersionName = '1.13.30' signingConfigs { release {