From 71f6dc83fb7d40ff3933e27557f07cd4878d562d Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 29 Jun 2022 18:54:11 +0200
Subject: [PATCH] Vario

---
 .../integrywmsnative/core/rest/CommonRESTException.java      | 2 --
 .../ProdRecuperoMaterialeViewModel.java                      | 5 ++++-
 .../gest/spedizione/SpedizioneViewModel.java                 | 1 +
 app/src/main/res/layout/layout_filter_agente.xml             | 4 ++--
 build.gradle                                                 | 2 +-
 gradle/wrapper/gradle-wrapper.properties                     | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java
index bffd491f..65806503 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java
@@ -26,8 +26,6 @@ public class CommonRESTException {
             put(MESSAGE_KEY, "Barcode non letto correttamente");
             put(EXCEPTION_KEY, NoResultFromBarcodeException.class);
         }});
-
-
     }};
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
index ba014ab2..8921513d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
@@ -115,7 +115,10 @@ public class ProdRecuperoMaterialeViewModel {
         qtaDaEvadere = qtaDaEvadere.add(item.getQtaCol());
 
         if (!UtilityBigDecimal.equalsTo(qtaDaEvadere, BigDecimal.ZERO)) {
-            numCnfDaEvadere = UtilityBigDecimal.divide(qtaDaEvadere, item.getQtaCnf());
+
+            if(item.getMtbAart().isFlagQtaCnfFissaBoolean())
+                numCnfDaEvadere = UtilityBigDecimal.divide(qtaDaEvadere, item.getQtaCnf());
+            else numCnfDaEvadere = item.getNumCnf();
         }
 
         this.sendOnItemDispatched(item,
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
index fa09f2a6..506c6a36 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
@@ -1882,6 +1882,7 @@ public class SpedizioneViewModel {
                     .setCodAnag(ord.getCodAnagOrd());
             return ordV;
         }).toList();
+
         dto.setPrintList(closedOrders);
         printClosedOrders(dto, this::sendOnOrderClosed, ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded));
     }
diff --git a/app/src/main/res/layout/layout_filter_agente.xml b/app/src/main/res/layout/layout_filter_agente.xml
index e0d28e0f..ef214486 100644
--- a/app/src/main/res/layout/layout_filter_agente.xml
+++ b/app/src/main/res/layout/layout_filter_agente.xml
@@ -79,8 +79,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title_layout">
+            app:layout_constraintStart_toStartOf="parent">
 
 
             <androidx.recyclerview.widget.RecyclerView
@@ -89,6 +88,7 @@
                 android:layout_height="0dp"
                 android:focusableInTouchMode="true"
                 android:orientation="vertical"
+                tools:listitem="@layout/layout_filter_agente__list_item"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHeight_max="270dp"
diff --git a/build.gradle b/build.gradle
index c6257b55..79f859b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.10'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 78eb53b7..48be369b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip