From 5e3f7fe251fb23b6e359b24315b136be2c04c287 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 19 Sep 2019 15:47:38 +0200
Subject: [PATCH] =?UTF-8?q?[BUG]=20Risolto=20problema=20legato=20al=20cont?=
 =?UTF-8?q?rollo=20dei=20colli=20gi=C3=A0=20scaricati=20in=20versamento=20?=
 =?UTF-8?q?a=20produzione?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/runConfigurations/app.xml                             | 2 +-
 .../viewmodel/ProdVersamentoMaterialViewModel.java          | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index bf2ef1a7..fc9d4646 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -6,7 +6,7 @@
     <option name="DEPLOY_AS_INSTANT" value="false" />
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic_frudis,dynamic_ime,dynamic_vgalimenti" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_ime,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java
index e17a7bcd..c93d41a6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java
@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.gest.prod_versamento_materiale.viewmodel;
 
 import android.app.Activity;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.text.Html;
 import android.text.SpannableString;
@@ -15,6 +16,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.databinding.FragmentProdVersamentoMaterialeBinding;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.core.ProdVersamentoMaterialHelper;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
@@ -94,12 +96,14 @@ public class ProdVersamentoMaterialViewModel {
 
     private void createColloScarico(MtbDepoPosizione mtbDepoPosizione) {
 
+        ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
+
         MtbColt cloneUL = ((MtbColt) mtbColt.get().clone());
         cloneUL.setCodJfas(mtbDepoPosizione.getPosizione());
-        cloneUL.setSerCollo(null);
 
         ColliMagazzinoRESTConsumer.createColloScaricoDaCarico(cloneUL, mtbDepoPosizione, generatedMtbColt -> {
             showDataSavedDialog(() -> {
+                progressDialog.dismiss();
                 mOnVersamentoCompleted.run();
             });
         }, ex -> {