From f8df1ffa96e1fed77082995a179b66d89af393ab Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 19 Dec 2023 16:04:05 +0100
Subject: [PATCH 01/12] Fix assegnazione lotto in export documenti interni

---
 .idea/runConfigurations/app.xml                                | 3 ++-
 .../edit_form/DocInterniEditFormViewModel.java                 | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index 1cd5eae7..72c17371 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="WMS.app.main" />
+    <module name="WMS_Native.app.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
@@ -9,6 +9,7 @@
     <option name="ALL_USERS" value="false" />
     <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
     <option name="CLEAR_APP_STORAGE" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="false" />
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
index a98464d2..b4c2e7f5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
@@ -243,6 +243,7 @@ public class DocInterniEditFormViewModel {
             artDto.setUntMis(row.getUntMis());
             artDto.setCodMart(row.getCodMart());
             artDto.setSystemNote(row.getNote());
+            artDto.setPartitaMag(row.getPartitaMag());
             if (row.getDataScad() != null) {
                 artDto.setDataScad(row.getDataScad());
             }
@@ -351,6 +352,7 @@ public class DocInterniEditFormViewModel {
         row.setQtaCol(resultDTO.getQtaTot().floatValue());
         row.setNote(resultDTO.getNote());
         row.setDataScad(resultDTO.getDataScad());
+        row.setPartitaMag(resultDTO.getPartitaMag());
         if (row.getId() > 0) {
             this.mtbColrRepository.update(row, id -> {
                 this.fetchDocumentRows();

From 50e58446b478c59adf06fe348c35d95c60464c19 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 19 Dec 2023 16:08:57 +0100
Subject: [PATCH 02/12] -> v1.36.11 (404)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7df9bc17..6ff6f68e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 403
-    def appVersionName = '1.36.10'
+    def appVersionCode = 404
+    def appVersionName = '1.36.11'
 
     signingConfigs {
         release {

From 1c9f4de437fdc7a0d8a024da217149283793eb74 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 2 Jan 2024 16:26:02 +0100
Subject: [PATCH 03/12] Fix null point in approvvigionamento linee

---
 .../exception/NoOrdersScheduledException.java   | 11 +++++++++++
 .../ProdFabbisognoLineeProdViewModel.java       | 17 +++++++++++------
 app/src/main/res/values-it/strings.xml          |  1 +
 app/src/main/res/values/strings.xml             |  1 +
 4 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/exception/NoOrdersScheduledException.java

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/exception/NoOrdersScheduledException.java b/app/src/main/java/it/integry/integrywmsnative/core/exception/NoOrdersScheduledException.java
new file mode 100644
index 00000000..8bbfabbb
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/NoOrdersScheduledException.java
@@ -0,0 +1,11 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class NoOrdersScheduledException extends Exception {
+
+    public NoOrdersScheduledException() {
+        super(UtilityResources.getString(R.string.no_orders_scheduled));
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java
index 7bcfd3ec..19d76b92 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdViewModel.java
@@ -5,6 +5,7 @@ import com.annimon.stream.Stream;
 import java.util.Date;
 import java.util.List;
 
+import it.integry.integrywmsnative.core.exception.NoOrdersScheduledException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
@@ -29,13 +30,17 @@ public class ProdFabbisognoLineeProdViewModel {
         this.sendOnLoadingStarted();
 
         this.mProdFabbisognoLineeProdRESTConsumer.loadFabbisogno(startDate, endDate, codMdep, jtbFasi -> {
-            if (jtbFasi != null) Stream.of(jtbFasi)
-                    .forEach(x -> x
-                            .setDataInizio(startDate)
-                            .setDataFine(endDate));
+            if (jtbFasi != null){
+                Stream.of(jtbFasi)
+                        .forEach(x -> x
+                                .setDataInizio(startDate)
+                                .setDataFine(endDate));
 
-            this.sendOnLoadingEnded();
-            onComplete.run(jtbFasi);
+                this.sendOnLoadingEnded();
+                onComplete.run(jtbFasi);
+            }else{
+                this.mListener.onError(new NoOrdersScheduledException());
+            }
         }, this::sendError);
     }
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 78b4ac21..1dc4d0ef 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -215,6 +215,7 @@
     <string name="no_item_to_pick_text">Nessun articolo da prelevare</string>
     <string name="no_docs_to_show_text">Nessun documento da mostrare</string>
     <string name="no_orders_to_pick_text">Nessun ordine da evadere</string>
+    <string name="no_orders_scheduled">Nessun ordine programmato sulla linea per il periodo selezionato</string>
     <string name="no_available_order_on_line">Nessun ordine compatibile</string>
     <string name="no_item_text">Nessun articolo</string>
     <string name="no_item_in_recupera_materiale">Nessuna UL versata in produzione</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5454bb93..cb147c39 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -219,6 +219,7 @@
     <string name="no_item_to_pick_text">No items to pick</string>
     <string name="no_docs_to_show_text">No documents to show</string>
     <string name="no_orders_to_pick_text">No orders to dispatch</string>
+    <string name="no_orders_scheduled">No orders scheduled on the line for the selected period: </string>
     <string name="no_inventory_available_text">No inventory available</string>
 
     <string name="no_available_order_on_line">no compatible orders found</string>

From 9dabbee1c75cd2e6549f8f4fa66f1f00e21cc6d4 Mon Sep 17 00:00:00 2001
From: ValerioC <v.castellana@integry.it>
Date: Fri, 5 Jan 2024 18:25:52 +0100
Subject: [PATCH 04/12] -> v1.36.12 (405)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6ff6f68e..d0e22bad 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 404
-    def appVersionName = '1.36.11'
+    def appVersionCode = 405
+    def appVersionName = '1.36.12'
 
     signingConfigs {
         release {

From 550cf3506ef8508d359b976fbb4f0db5099a4460 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 8 Jan 2024 10:20:18 +0100
Subject: [PATCH 05/12] AGP Update

---
 .../edit_form/DocInterniEditFormViewModel.java | 18 +++++++++++-------
 barcode_base_android_library/build.gradle      |  5 ++---
 build.gradle                                   |  2 +-
 honeywellscannerlibrary/build.gradle           |  4 ++--
 keyobardemulatorscannerlibrary/build.gradle    |  4 ++--
 pointmobilescannerlibrary/build.gradle         |  4 ++--
 zebrascannerlibrary/build.gradle               |  4 ++--
 7 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
index b4c2e7f5..6d74a8ca 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form;
 
 import androidx.lifecycle.MutableLiveData;
 
-import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 
 import org.json.JSONException;
@@ -278,27 +277,32 @@ public class DocInterniEditFormViewModel {
         if (doc == null || fornitori == null || tipoDocDTO == null)
             return;
 
-        List<FornitoreDTO> filterFornitori = Stream.of(fornitori).filter(x->x.getCodAnag().equals(doc.getCodAnag())).toList();
+        List<FornitoreDTO> filterFornitori = Stream.of(fornitori)
+                .filter(x -> x.getCodAnag().equals(doc.getCodAnag()))
+                .toList();
         List<CheckFornitoreDTO> checkFornitoreDTO;
 
-        TipoDocDTO tipoDoc = Stream.of(tipoDocDTO).filter(x -> x.getCodDtip().equals(doc.getCodDtipProvv())).findFirst().get();
+        TipoDocDTO tipoDoc = Stream.of(tipoDocDTO)
+                .filter(x -> x.getCodDtip().equals(doc.getCodDtipProvv()))
+                .findFirst()
+                .get();
 
-        if (tipoDoc.isFlagChkTracciabilita()){
+        if (tipoDoc.isFlagChkTracciabilita()) {
             this.isCheckPartitaMag = tipoDoc.isFlagChkTracciabilita();
-        }else{
+        } else {
             if (filterFornitori.isEmpty())
                 return;
 
             if (doc.getCodVdes() == null) {
                 checkFornitoreDTO = Stream.of(filterFornitori)
                         .filter(x -> x.getCodVdes() == null).findFirst().get().getCheckFornitoreDTO();
-            } else{
+            } else {
                 checkFornitoreDTO = Stream.of(filterFornitori)
                         .filterNot(x -> x.getCodVdes() == null)
                         .filter(x -> x.getCodVdes().equals(doc.getCodVdes())).findFirst().get().getCheckFornitoreDTO();
             }
 
-            if (checkFornitoreDTO != null){
+            if (checkFornitoreDTO != null) {
                 CheckFornitoreDTO flagCheck = Stream.of(checkFornitoreDTO)
                         .filter(x -> x.getCodDtip().equals(doc.getCodDtipProvv())).findFirstOrElse(null);
 
diff --git a/barcode_base_android_library/build.gradle b/barcode_base_android_library/build.gradle
index 2aef0b1c..71604865 100644
--- a/barcode_base_android_library/build.gradle
+++ b/barcode_base_android_library/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
-
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
diff --git a/build.gradle b/build.gradle
index d900b182..b59726d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.0'
-        agp_version = '8.2.0'
+        agp_version = '8.2.1'
     }
 
     repositories {
diff --git a/honeywellscannerlibrary/build.gradle b/honeywellscannerlibrary/build.gradle
index 3f1e9897..56891476 100644
--- a/honeywellscannerlibrary/build.gradle
+++ b/honeywellscannerlibrary/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/keyobardemulatorscannerlibrary/build.gradle b/keyobardemulatorscannerlibrary/build.gradle
index d3630ab3..6b05d719 100644
--- a/keyobardemulatorscannerlibrary/build.gradle
+++ b/keyobardemulatorscannerlibrary/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
diff --git a/pointmobilescannerlibrary/build.gradle b/pointmobilescannerlibrary/build.gradle
index 5d56e622..b084ab91 100644
--- a/pointmobilescannerlibrary/build.gradle
+++ b/pointmobilescannerlibrary/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/zebrascannerlibrary/build.gradle b/zebrascannerlibrary/build.gradle
index 759e7248..7d952295 100644
--- a/zebrascannerlibrary/build.gradle
+++ b/zebrascannerlibrary/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

From 17e3b8856c29d471bbc6245f22ab3e8adccfa00f Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Mon, 8 Jan 2024 12:05:12 +0100
Subject: [PATCH 06/12] =?UTF-8?q?Inserendo=20il=20PLU=20in=20fase=20di=20i?=
 =?UTF-8?q?nventario=20entra=20in=20modifica=20quantit=C3=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gest/inventario/picking/PickingInventarioViewModel.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
index fb01f61a..4cc4d50c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
@@ -276,7 +276,7 @@ public class PickingInventarioViewModel extends ViewModel {
             initialQtaTot = UtilityBigDecimal.multiply(initialNumCnf, initialQtaCnf);
         }
 
-        if (inventarioArtDTO.isPlu()) {
+        if (pickingObjectDTO.getTempPickData() != null && inventarioArtDTO.isPlu()) {
             this.saveNewRow(pickingObjectDTO, initialNumCnf, initialQtaCnf, initialQtaTot, null, barcode);
         } else {
 

From 2e360e81047055eb534474c349f02d2668ba9a1a Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Tue, 9 Jan 2024 15:51:15 +0100
Subject: [PATCH 07/12] Aggiunta la cancellazione delle udc create

---
 .../consumers/ColliMagazzinoRESTConsumer.java |   6 +
 .../ContenutoBancaleActivity.java             |  81 ++++++++-
 .../lista_bancali/ListaBancaliActivity.java   |  23 ++-
 .../main/res/drawable/ic_delete_material3.xml |  10 ++
 .../main/res/drawable/ic_print_material3.xml  |  10 ++
 .../res/drawable/ic_recover_material3.xml     |  10 ++
 .../res/layout/activity_contenuto_bancale.xml | 165 +++++++++++-------
 .../res/menu/contenuto_bancale_fab_menu.xml   |  16 ++
 app/src/main/res/values-it/strings.xml        |   2 +
 app/src/main/res/values/strings.xml           |   4 +-
 10 files changed, 250 insertions(+), 77 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_delete_material3.xml
 create mode 100644 app/src/main/res/drawable/ic_print_material3.xml
 create mode 100644 app/src/main/res/drawable/ic_recover_material3.xml
 create mode 100644 app/src/main/res/menu/contenuto_bancale_fab_menu.xml

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
index 9b71214c..4249e1fc 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
@@ -18,6 +18,7 @@ import java.util.List;
 import javax.inject.Singleton;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.CommonModelConsts;
@@ -696,6 +697,11 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     }
 
     public void printUL(PrintULRequestDTO printULRequestDTO, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        if (BuildConfig.DEBUG) {
+            onComplete.run();
+            return;
+        }
+
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
 
         colliMagazzinoRESTConsumerService.printUL(printULRequestDTO)
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java
index 20086b1d..7af712ed 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java
@@ -4,8 +4,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.SpannableString;
+import android.view.Gravity;
 
+import androidx.appcompat.widget.PopupMenu;
 import androidx.core.content.ContextCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableField;
@@ -18,8 +21,10 @@ import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.data_cache.DataCache;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO;
 import it.integry.integrywmsnative.databinding.ActivityContenutoBancaleBinding;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ui.ContenutoBancaleListAdapter;
 import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
@@ -38,11 +43,14 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
     @Inject
     PrinterRESTConsumer mPrinterRESTConsumer;
 
+    @Inject
+    ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
+
     public final ObservableField<MtbColt> mtbColt = new ObservableField<>();
     public final ObservableField<String> descrizioneDepo = new ObservableField<>();
-
     public ObservableField<Boolean> fabVisible = new ObservableField<>(true);
     public ObservableField<Boolean> recoverFabMenuVisible = new ObservableField<>(false);
+    private PopupMenu fabPopupMenu;
 
     private String mReportName;
 
@@ -95,11 +103,11 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
 
         recoverFabMenuVisible.set(canRecoverUL);
 
-        initRecyclerView();
-        initColloInfo();
+        this.initRecyclerView();
+        this.initColloInfo();
+        this.initFab();
     }
 
-
     private void initRecyclerView() {
         this.bindings.contenutoBancaleMainList.setNestedScrollingEnabled(false);
 
@@ -115,13 +123,39 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
         this.bindings.contenutoBancaleMainList.setAdapter(adapter);
     }
 
-
     private void initColloInfo() {
         mDepositoRESTConsumer.getDepoByCodMdep(mtbColt.get().getCodMdep(), depo -> {
             descrizioneDepo.set("(" + depo.getDescrizione() + ")");
         }, this::onError);
     }
 
+    private void initFab() {
+        fabPopupMenu = new PopupMenu(this, this.bindings.accettazioneOrdineInevasoFab,
+                (Gravity.END | Gravity.BOTTOM),
+                androidx.appcompat.R.attr.popupMenuStyle,
+                com.google.android.material.R.style.Widget_Material3_PopupMenu_ContextMenu);
+
+        fabPopupMenu.setForceShowIcon(true);
+        fabPopupMenu.getMenuInflater().inflate(R.menu.contenuto_bancale_fab_menu, fabPopupMenu.getMenu());
+
+        if(mtbColt.get().isDocumentPresent()){
+            fabPopupMenu.getMenu().removeItem(R.id.delete_ul);
+        }
+
+        fabPopupMenu.setOnMenuItemClickListener(item -> {
+            int itemId = item.getItemId();
+
+            if (itemId == R.id.recover_ul) {
+                this.recoverUL();
+            } else if (itemId == R.id.print_ul) {
+                this.printUL();
+            } else if (itemId == R.id.delete_ul) {
+                this.deleteUL();
+            }
+
+            return false;
+        });
+    }
 
     public void recoverUL() {
         Intent data = new Intent();
@@ -132,9 +166,7 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
         this.finish();
     }
 
-
     public void printUL() {
-        this.bindings.contenutoBancaleFab.close(true);
         this.onLoadingStarted();
         try {
             this.mPrinterRESTConsumer.printCollo(mtbColt.get(),
@@ -153,11 +185,42 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
         }
     }
 
+    public void deleteUL() {
+        String text = getResources().getString(R.string.alert_delete_UL);
+
+        DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(text)), null, () -> this.runOnUiThread(() -> {
+            this.onLoadingStarted();
+
+            try {
+                DeleteULRequestDTO deleteULRequestDTO = new DeleteULRequestDTO()
+                        .setMtbColt(this.mtbColt.get());
+
+                mColliMagazzinoRESTConsumer.deleteUL(deleteULRequestDTO, () -> {
+                    Intent data = new Intent();
+                    String key = DataCache.addItem(this.mtbColt.get());
+                    String keyDeleteUL = DataCache.addItem(true);
+                    data.putExtra("key", key)
+                            .putExtra("keyDeleteUL", keyDeleteUL);
+
+                    this.onLoadingEnded();
+                    this.setResult(RESULT_OK, data);
+                    this.finish();
+                }, this::onError);
+            } catch (Exception ex) {
+                this.onError(ex);
+            }
+        }), () -> {
+        }).show(this.getSupportFragmentManager(), "tag");
+    }
+
+    public void showFabMenu() {
+        fabPopupMenu.show();
+    }
+
     @Override
     public boolean onSupportNavigateUp() {
-        onBackPressed();
+        getOnBackPressedDispatcher().onBackPressed();
         return true;
     }
 
-
 }
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 17c27e32..0b3909e3 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
@@ -24,7 +24,7 @@ import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivi
 import it.integry.integrywmsnative.gest.lista_bancali.ui.ListaColliMainListAdapter;
 import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
 
-public class ListaBancaliActivity extends BaseActivity implements ListaBancaliViewModel.Listener{
+public class ListaBancaliActivity extends BaseActivity implements ListaBancaliViewModel.Listener {
 
     private static class Key {
         private static final String MtbColtsKey = "mtbColtsKey";
@@ -47,7 +47,6 @@ public class ListaBancaliActivity extends BaseActivity implements ListaBancaliVi
     private static final int PICK_UL_REQUEST = 1;  // The request code
 
 
-
     public static Intent createIntent(Context context, List<MtbColt> items, RunnableArgsWithReturn<MtbColt, Boolean> canRecoverUlAction, String reportName) {
         return createIntent(context, items, canRecoverUlAction, true, reportName);
     }
@@ -126,17 +125,16 @@ public class ListaBancaliActivity extends BaseActivity implements ListaBancaliVi
 
     @Override
     public boolean onSupportNavigateUp() {
-        onBackPressed();
+        getOnBackPressedDispatcher().onBackPressed();
         return true;
     }
 
-    public void startContenutoBancaleActivity(MtbColt item){
+    public void startContenutoBancaleActivity(MtbColt item) {
         Intent myIntent = ContenutoBancaleActivity.createIntent(this, item, mCanRecoverUl.run(item), mReportName);
         startActivityForResult(myIntent, PICK_UL_REQUEST);
     }
 
 
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -144,9 +142,20 @@ public class ListaBancaliActivity extends BaseActivity implements ListaBancaliVi
         if (requestCode == PICK_UL_REQUEST) {
             // Make sure the request was successful
             if (resultCode == RESULT_OK) {
+                Object keyDeleteUL = DataCache.retrieveItem(data.getStringExtra("keyDeleteUL"));
+                boolean deleteUL = keyDeleteUL != null && (boolean) keyDeleteUL;
+
+                if (deleteUL) {
+                    this.onLoadingStarted();
+                    MtbColt item = DataCache.retrieveItem(data.getStringExtra("key"));
+                    mtbColts.remove(item);
+                    this.initRecyclerView();
+                    this.onLoadingEnded();
+                } else {
+                    this.setResult(RESULT_OK, data);
+                    this.finish();
+                }
 
-                this.setResult(RESULT_OK, data);
-                this.finish();
             }
         }
     }
diff --git a/app/src/main/res/drawable/ic_delete_material3.xml b/app/src/main/res/drawable/ic_delete_material3.xml
new file mode 100644
index 00000000..d724c2e0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete_material3.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM360,680L440,680L440,320L360,320L360,680ZM520,680L600,680L600,320L520,320L520,680ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_print_material3.xml b/app/src/main/res/drawable/ic_print_material3.xml
new file mode 100644
index 00000000..f144dac0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_print_material3.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M640,320L640,200L320,200L320,320L240,320L240,120L720,120L720,320L640,320ZM160,400L160,400Q160,400 171.5,400Q183,400 200,400L760,400Q777,400 788.5,400Q800,400 800,400L800,400L720,400L720,400L240,400L240,400L160,400ZM720,500Q737,500 748.5,488.5Q760,477 760,460Q760,443 748.5,431.5Q737,420 720,420Q703,420 691.5,431.5Q680,443 680,460Q680,477 691.5,488.5Q703,500 720,500ZM640,760L640,600L320,600L320,760L640,760ZM720,840L240,840L240,680L80,680L80,440Q80,389 115,354.5Q150,320 200,320L760,320Q811,320 845.5,354.5Q880,389 880,440L880,680L720,680L720,840ZM800,600L800,440Q800,423 788.5,411.5Q777,400 760,400L200,400Q183,400 171.5,411.5Q160,423 160,440L160,600L240,600L240,520L720,520L720,600L800,600Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_recover_material3.xml b/app/src/main/res/drawable/ic_recover_material3.xml
new file mode 100644
index 00000000..3a1a828d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_recover_material3.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,838Q319,823 239.5,732.5Q160,642 160,520Q160,454 186,393.5Q212,333 260,288L317,345Q279,379 259.5,424Q240,469 240,520Q240,608 296,675.5Q352,743 440,758L440,838ZM520,838L520,758Q607,742 663.5,675Q720,608 720,520Q720,420 650,350Q580,280 480,280L477,280L521,324L465,380L325,240L465,100L521,156L477,200L480,200Q614,200 707,293Q800,386 800,520Q800,641 720.5,731.5Q641,822 520,838Z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_contenuto_bancale.xml b/app/src/main/res/layout/activity_contenuto_bancale.xml
index 6034aba9..44829935 100644
--- a/app/src/main/res/layout/activity_contenuto_bancale.xml
+++ b/app/src/main/res/layout/activity_contenuto_bancale.xml
@@ -2,12 +2,15 @@
 
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:fab="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
         <import type="android.view.View" />
+        <import type="it.integry.integrywmsnative.R" />
+        <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
+        <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+        <import type="android.text.Html" />
 
         <variable
             name="viewModel"
@@ -170,6 +173,29 @@
                                 tools:text="(Bari)" />
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="12dp"
+                            android:orientation="horizontal"
+                            android:visibility="@{view.mtbColt.getNumDoc() != null ? View.VISIBLE : View.GONE}">
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@android:color/black"
+                                android:text="Documento:" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="4dp"
+                                android:textColor="@android:color/black"
+                                android:text="@{Html.fromHtml(context.getString(R.string.doc_testata, view.mtbColt.getNumDoc(), view.mtbColt.getDataDoc()))}"
+                                tools:text="n. 123 del 29/03/2023" />
+                        </androidx.appcompat.widget.LinearLayoutCompat>
 
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -192,67 +218,88 @@
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
+<!--        <com.github.clans.fab.FloatingActionMenu-->
+<!--            android:id="@+id/contenuto_bancale_fab"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="match_parent"-->
+<!--            app:layout_constraintBottom_toBottomOf="parent"-->
+<!--            app:layout_constraintEnd_toEndOf="parent"-->
+<!--            app:visibility="@{view.fabVisible}"-->
+<!--            fab:menu_animationDelayPerItem="50"-->
+<!--            fab:menu_backgroundColor="@color/white_bg_alpha"-->
+<!--            fab:menu_buttonSpacing="0dp"-->
+<!--            fab:menu_colorNormal="@color/colorSecondary"-->
+<!--            fab:menu_colorPressed="@color/colorSecondaryDark"-->
+<!--            fab:menu_fab_size="normal"-->
+<!--            fab:menu_labels_colorNormal="@color/white"-->
+<!--            fab:menu_labels_colorPressed="@color/white_pressed"-->
+<!--            fab:menu_labels_colorRipple="#66FFFFFF"-->
+<!--            fab:menu_labels_cornerRadius="3dp"-->
+<!--            fab:menu_labels_hideAnimation="@anim/fab_slide_out_to_right"-->
+<!--            fab:menu_labels_margin="0dp"-->
+<!--            fab:menu_labels_padding="8dp"-->
+<!--            fab:menu_labels_paddingBottom="4dp"-->
+<!--            fab:menu_labels_paddingLeft="8dp"-->
+<!--            fab:menu_labels_paddingRight="8dp"-->
+<!--            fab:menu_labels_paddingTop="4dp"-->
+<!--            fab:menu_labels_position="left"-->
+<!--            fab:menu_labels_showAnimation="@anim/fab_slide_in_from_right"-->
+<!--            fab:menu_labels_showShadow="true"-->
+<!--            fab:menu_labels_textColor="@color/black_semi_transparent"-->
+<!--            fab:menu_labels_textSize="18sp"-->
+<!--            fab:menu_openDirection="up"-->
+<!--            fab:menu_shadowColor="#66000000"-->
+<!--            fab:menu_shadowRadius="4dp"-->
+<!--            fab:menu_shadowXOffset="1dp"-->
+<!--            fab:menu_shadowYOffset="3dp"-->
+<!--            fab:menu_showShadow="true">-->
 
-        <com.github.clans.fab.FloatingActionMenu
-            android:id="@+id/contenuto_bancale_fab"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:visibility="@{view.fabVisible}"
-            fab:menu_animationDelayPerItem="50"
-            fab:menu_backgroundColor="@color/white_bg_alpha"
-            fab:menu_buttonSpacing="0dp"
-            fab:menu_colorNormal="@color/colorSecondary"
-            fab:menu_colorPressed="@color/colorSecondaryDark"
-            fab:menu_fab_size="normal"
-            fab:menu_labels_colorNormal="@color/white"
-            fab:menu_labels_colorPressed="@color/white_pressed"
-            fab:menu_labels_colorRipple="#66FFFFFF"
-            fab:menu_labels_cornerRadius="3dp"
-            fab:menu_labels_hideAnimation="@anim/fab_slide_out_to_right"
-            fab:menu_labels_margin="0dp"
-            fab:menu_labels_padding="8dp"
-            fab:menu_labels_paddingBottom="4dp"
-            fab:menu_labels_paddingLeft="8dp"
-            fab:menu_labels_paddingRight="8dp"
-            fab:menu_labels_paddingTop="4dp"
-            fab:menu_labels_position="left"
-            fab:menu_labels_showAnimation="@anim/fab_slide_in_from_right"
-            fab:menu_labels_showShadow="true"
-            fab:menu_labels_textColor="@color/black_semi_transparent"
-            fab:menu_labels_textSize="18sp"
-            fab:menu_openDirection="up"
-            fab:menu_shadowColor="#66000000"
-            fab:menu_shadowRadius="4dp"
-            fab:menu_shadowXOffset="1dp"
-            fab:menu_shadowYOffset="3dp"
-            fab:menu_showShadow="true">
+<!--            <com.github.clans.fab.FloatingActionButton-->
+<!--                android:id="@+id/accettazione_ordine_inevaso_fab_item1"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:scaleX="-1"-->
+<!--                android:src="@drawable/ic_recover_ul_24dp"-->
+<!--                app:fab_colorNormal="@color/white"-->
+<!--                app:fab_colorPressed="@color/white_pressed"-->
+<!--                app:fab_colorRipple="#66FFFFFF"-->
+<!--                app:onClick="@{() -> view.recoverUL()}"-->
+<!--                app:visibility="@{view.recoverFabMenuVisible}"-->
+<!--                fab:fab_label="@string/action_recover_ul" />-->
 
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/accettazione_ordine_inevaso_fab_item1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:scaleX="-1"
-                android:src="@drawable/ic_recover_ul_24dp"
-                app:fab_colorNormal="@color/white"
-                app:fab_colorPressed="@color/white_pressed"
-                app:fab_colorRipple="#66FFFFFF"
-                app:onClick="@{() -> view.recoverUL()}"
-                app:visibility="@{view.recoverFabMenuVisible}"
-                fab:fab_label="@string/action_recover_ul" />
+<!--            <com.github.clans.fab.FloatingActionButton-->
+<!--                android:id="@+id/accettazione_ordine_inevaso_fab_item2"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:src="@drawable/ic_print_24dp"-->
+<!--                app:fab_colorNormal="@color/white"-->
+<!--                app:fab_colorPressed="@color/white_pressed"-->
+<!--                app:fab_colorRipple="#66FFFFFF"-->
+<!--                app:onClick="@{() -> view.printUL()}"-->
+<!--                fab:fab_label="@string/action_print_ul" />-->
 
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/accettazione_ordine_inevaso_fab_item2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_print_24dp"
-                app:fab_colorNormal="@color/white"
-                app:fab_colorPressed="@color/white_pressed"
-                app:fab_colorRipple="#66FFFFFF"
-                app:onClick="@{() -> view.printUL()}"
-                fab:fab_label="@string/action_print_ul" />
+<!--            <com.github.clans.fab.FloatingActionButton-->
+<!--                android:id="@+id/accettazione_ordine_inevaso_fab_item3"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:src="@drawable/ic_delete_24dp"-->
+<!--                app:fab_colorNormal="@color/white"-->
+<!--                app:fab_colorPressed="@color/white_pressed"-->
+<!--                app:fab_colorRipple="#66FFFFFF"-->
+<!--                app:visibility="@{!view.mtbColt.documentPresent}"-->
+<!--                app:onClick="@{() -> view.deleteUL()}"-->
+<!--                fab:fab_label="@string/action_delete_ul" />-->
 
-        </com.github.clans.fab.FloatingActionMenu>
+<!--        </com.github.clans.fab.FloatingActionMenu>-->
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/accettazione_ordine_inevaso_fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="16dp"
+            android:onClick="@{() -> view.showFabMenu()}"
+            app:srcCompat="@drawable/ic_menu_24dp"
+            style="?attr/floatingActionButtonPrimaryStyle" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/contenuto_bancale_fab_menu.xml b/app/src/main/res/menu/contenuto_bancale_fab_menu.xml
new file mode 100644
index 00000000..50023a2e
--- /dev/null
+++ b/app/src/main/res/menu/contenuto_bancale_fab_menu.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/recover_ul"
+        android:icon="@drawable/ic_recover_material3"
+        android:title="@string/action_recover_ul" />
+    <item
+        android:id="@+id/print_ul"
+        android:icon="@drawable/ic_print_material3"
+        android:title="@string/action_print_ul" />
+    <item
+        android:id="@+id/delete_ul"
+        android:icon="@drawable/ic_delete_material3"
+        android:title="@string/action_delete_ul" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1dc4d0ef..a0e808e2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -64,6 +64,7 @@
     <string name="action_show_created_ul">Mostra UL già create</string>
     <string name="action_recover_ul">Recupera UL</string>
     <string name="action_print_ul">Stampa UL</string>
+    <string name="action_delete_ul">Cancella UL</string>
     <string name="action_print">Stampa</string>
     <string name="confirm">Conferma</string>
     <string name="action_save">Salva</string>
@@ -199,6 +200,7 @@
     <string name="check_box_preference_title">Check box</string>
     <string name="check_box_preference_summary">This is a regular preference</string>
 
+    <string name="alert_delete_UL">Stai per eliminare una UL. Confermi?</string>
     <string name="alert_delete_mtb_colr">Stai per eliminare una riga. Confermi?</string>
 
     <string name="activity_lista_bancali_title">Lista UL</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cb147c39..ac6c27ee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -108,8 +108,7 @@
 
     <!-- SETTINGS -->
     <string name="action_recover_ul">Recover LU</string>
-
-
+    <string name="action_delete_ul">Delete LU</string>
     <string name="action_print_ul">Print LU</string>
     <string name="action_print">Print</string>
     <string name="confirm">Confirm</string>
@@ -201,6 +200,7 @@
     <string name="check_box_preference_title">Check box</string>
     <string name="check_box_preference_summary">This is a regular preference</string>
 
+    <string name="alert_delete_UL">Are you sure you want to delete this UL? Please confirm</string>
     <string name="alert_delete_mtb_colr">Are you sure to delete? Please confirm</string>
 
     <string name="warehouse">Warehouse</string>

From b95863d66d64c7855d3da3b49a232484db8f8a35 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 9 Jan 2024 18:01:29 +0100
Subject: [PATCH 08/12] Sostituito fab in doc interni edit form con Material3

---
 .idea/runConfigurations/app.xml               |  2 +-
 .../core/settings/DBSettingsModel.java        | 10 ---
 .../core/settings/SettingsManager.java        |  5 --
 .../edit_form/DocInterniEditFormActivity.java | 69 +++++++++++++--
 .../DocInterniEditFormViewModel.java          | 11 ---
 .../activity_contab_doc_interni_edit.xml      | 84 ++-----------------
 .../res/menu/doc_interni_edit_fab_menu.xml    | 17 ++++
 7 files changed, 88 insertions(+), 110 deletions(-)
 create mode 100644 app/src/main/res/menu/doc_interni_edit_fab_menu.xml

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index 72c17371..e0479975 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="WMS_Native.app.main" />
+    <module name="WMS.app.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
index c071ed44..6d68a2ed 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java
@@ -40,7 +40,6 @@ public class DBSettingsModel {
     private boolean flagOrdinaArticoliOnScan;
     private boolean flagConsentiFuoriPianoLogistico;
     private boolean flagConsentiOrdineSenzaGriglia;
-    private String docInterniCheckFornitore;
     private String produzioneDefaultCodAnag;
     private boolean flagPrintPackingListOnOrderClose;
     private boolean flagPrintEtichetteOnOrderClose;
@@ -333,15 +332,6 @@ public class DBSettingsModel {
         return this;
     }
 
-    public String getDocInterniCheckFornitore() {
-        return docInterniCheckFornitore;
-    }
-
-    public DBSettingsModel setDocInterniCheckFornitore(String docInterniCheckFornitore) {
-        this.docInterniCheckFornitore = docInterniCheckFornitore;
-        return this;
-    }
-
     public boolean isFlagAccettazioneUseQtaOrd() {
         return flagAccettazioneUseQtaOrd;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index 0974ebb6..af634578 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -340,11 +340,6 @@ public class SettingsManager {
                 .setSection("ORDINI_A")
                 .setKeySection("FLAG_CONSENTI_ORDINE_SENZA_GRIGLIA")
                 .setSetter(dbSettingsModelIstance::setFlagConsentiOrdineSenzaGriglia));
-        stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
-                .setGestName("PVM")
-                .setSection("DOC_INTERNI")
-                .setKeySection("CHECK_FORNITORE")
-                .setSetter(dbSettingsModelIstance::setDocInterniCheckFornitore));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
                 .setGestName("PICKING")
                 .setSection("ACCETTAZIONE")
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
index 28c3ab7f..2667cf38 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java
@@ -3,9 +3,11 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -26,7 +28,6 @@ import it.integry.integrywmsnative.core.data_cache.DataCache;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 import it.integry.integrywmsnative.core.data_store.db.repository.MtbColrDataSource;
-import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.di.BindableInteger;
 import it.integry.integrywmsnative.core.di.BindableString;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
@@ -42,7 +43,6 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipoDocDTO;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsItemListModel;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsView;
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.ui.DocumentRowsListAdapter;
-import it.integry.integrywmsnative.ui.FabMenuCustomAnimations;
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalView;
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
 import it.integry.integrywmsnative.view.dialogs.available_items.DialogAvailableItemListModel;
@@ -77,9 +77,11 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
     public BindableString codMgrp = new BindableString();
     public BindableString codAnag = new BindableString();
     public BindableInteger prodsCount = new BindableInteger(0);
-    public BindableBoolean isDocumentExportable = new BindableBoolean(false);
     private final ObservableArrayList<SqlMtbColr> documentRowsObservableList = new ObservableArrayList<>();
 
+
+    private PopupMenu fabPopupMenu;
+
     public static Intent newInstance(Context context, SqlMtbColt document, List<DocumentoArtDTO> arts, TipoDocDTO tipoDoc, DocInterniSetupDTO mDocInterniSetupDTO) {
         Intent myIntent = new Intent(context, DocInterniEditFormActivity.class);
 
@@ -119,6 +121,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         this.initView();
         this.initBindables();
         this.initRecyclerView();
+        this.initFab();
     }
 
     private void initBindables() {
@@ -151,7 +154,8 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         setSupportActionBar(binding.toolbar);
         binding.toolbar.setTitle(R.string.edit_doc);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        FabMenuCustomAnimations.changeIconOnFocus(binding.closeActivityFab, R.drawable.ic_menu_24dp, R.drawable.ic_close_24dp);
+
+//        FabMenuCustomAnimations.changeIconOnFocus(binding.closeActivityFab, R.drawable.ic_menu_24dp, R.drawable.ic_close_24dp);
 
     }
 
@@ -162,6 +166,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
 
     private void initRecyclerView() {
         this.viewModel.docRows.observe(this, this::refreshList);
+
         DocumentRowsListAdapter listAdapter = new DocumentRowsListAdapter(this, documentRowsObservableList);
         listAdapter.setEmptyView(binding.scanArtSpinner);
         binding.documentRowsList.setAdapter(listAdapter);
@@ -173,11 +178,58 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
         });
     }
 
+    private void initFab() {
+        fabPopupMenu = new PopupMenu(this, this.binding.mainFab,
+                (Gravity.END | Gravity.BOTTOM),
+                androidx.appcompat.R.attr.popupMenuStyle,
+                com.google.android.material.R.style.Widget_Material3_PopupMenu_ContextMenu);
+
+        fabPopupMenu.setForceShowIcon(true);
+        fabPopupMenu.getMenuInflater().inflate(R.menu.doc_interni_edit_fab_menu, fabPopupMenu.getMenu());
+
+
+        fabPopupMenu.setOnMenuItemClickListener(item -> {
+            int itemId = item.getItemId();
+
+            if (itemId == R.id.export_document) {
+                viewModel.exportDocument();
+            } else if (itemId == R.id.delete_document) {
+                viewModel.deleteDocument();
+            } else if (itemId == R.id.hold_document) {
+                viewModel.holdDocument();
+            }
+
+            return false;
+        });
+
+        refreshFabMenu();
+    }
+
+    private void refreshFabMenu() {
+        fabPopupMenu.getMenu()
+                .findItem(R.id.export_document)
+                .setVisible(isDocumentExportable());
+    }
+
+    public void showFabMenu() {
+        fabPopupMenu.show();
+    }
+
+    public void closeFabMenu() {
+        fabPopupMenu.dismiss();
+    }
+
     private void refreshList(List<SqlMtbColr> sqlMtbColrs) {
         this.documentRowsObservableList.clear();
         this.documentRowsObservableList.addAll(this.viewModel.docRows.getValue());
+
+        this.prodsCount.set(this.viewModel.docRows.getValue().size());
+        this.refreshFabMenu();
     }
 
+    private boolean isDocumentExportable() {
+        return prodsCount.get() > 0;
+    }
 
     public void closeEdit() {
         this.onBackPressed();
@@ -230,7 +282,6 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
     @Override
     public void onRowsChanged(List<SqlMtbColr> rows) {
         this.prodsCount.set(rows.size());
-        this.isDocumentExportable.set(rows.size() > 0);
     }
 
     @Override
@@ -283,7 +334,8 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
                         this.onLoadingStarted();
                         this.viewModel.saveRow(row, resultDTO);
                     })
-                    .setOnAbort(() -> {})
+                    .setOnAbort(() -> {
+                    })
                     .show(getSupportFragmentManager(), "tag");
     }
 
@@ -294,7 +346,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
 
     @Override
     public void onDocDeleted() {
-        this.binding.closeActivityFab.close(true);
+        this.closeFabMenu();
         this.closeEdit();
     }
 
@@ -338,7 +390,8 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
 
         DialogSelectDocRowsView.newInstance(dataset, data -> {
                     this.viewModel.dispatchRowEdit((SqlMtbColr) data.getOriginalModel(), articolo.isFlagTracciabilita(), articolo.isUntMisDigitale());
-                }, () -> {})
+                }, () -> {
+                })
                 .show(this.getSupportFragmentManager(), "dialogSelectDocRowsNew");
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
index 6d74a8ca..6ad8b914 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
@@ -4,9 +4,6 @@ import androidx.lifecycle.MutableLiveData;
 
 import com.annimon.stream.Stream;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,7 +22,6 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
 import it.integry.integrywmsnative.core.rest.model.Ean128Model;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 import it.integry.integrywmsnative.core.rest.model.documento.DocumentoArtDTO;
-import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ArtDTO;
@@ -48,7 +44,6 @@ public class DocInterniEditFormViewModel {
     private TipoDocDTO tipoDoc;
 
     private boolean isCheckPartitaMag = false;
-    private JSONObject checkFornitoreRules = null;
 
 
     public MutableLiveData<SqlMtbColt> document = new MutableLiveData<>();
@@ -64,12 +59,6 @@ public class DocInterniEditFormViewModel {
     }
 
     public void init() {
-        try {
-            var docInterniCheckFornitore = SettingsManager.iDB().getDocInterniCheckFornitore();
-            this.checkFornitoreRules = docInterniCheckFornitore != null ? new JSONObject(docInterniCheckFornitore) : null;
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
     }
 
 
diff --git a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
index eba83439..079e221e 100644
--- a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
+++ b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
@@ -267,81 +267,15 @@
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="?attr/floatingActionButtonPrimaryStyle"
+            android:id="@+id/main_fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="16dp"
+            app:singleClick="@{() -> view.showFabMenu()}"
+            app:srcCompat="@drawable/ic_menu_24dp" />
 
-        <com.github.clans.fab.FloatingActionMenu
-            android:id="@+id/close_activity_fab"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_anchor="@+id/linearLayout2"
-            app:layout_anchorGravity="center"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:menu_icon="@drawable/ic_menu_24dp"
-            fab:menu_animationDelayPerItem="50"
-            fab:menu_backgroundColor="@color/white_bg_alpha"
-            fab:menu_buttonSpacing="0dp"
-            fab:menu_colorNormal="@color/success_color"
-            fab:menu_colorPressed="@color/green_400"
-            fab:menu_labels_colorNormal="@color/white"
-            fab:menu_labels_colorPressed="@color/white_pressed"
-            fab:menu_labels_colorRipple="#66FFFFFF"
-            fab:menu_labels_cornerRadius="3dp"
-            fab:menu_labels_hideAnimation="@anim/fab_slide_out_to_right"
-            fab:menu_labels_margin="0dp"
-            fab:menu_labels_padding="8dp"
-            fab:menu_labels_paddingBottom="4dp"
-            fab:menu_labels_paddingLeft="8dp"
-            fab:menu_labels_paddingRight="8dp"
-            fab:menu_labels_paddingTop="4dp"
-            fab:menu_labels_position="left"
-            fab:menu_labels_showAnimation="@anim/fab_slide_in_from_right"
-            fab:menu_labels_showShadow="true"
-            fab:menu_labels_textColor="@color/black_semi_transparent"
-            fab:menu_labels_textSize="18sp"
-            fab:menu_openDirection="up"
-            fab:menu_shadowColor="#66000000"
-            fab:menu_shadowRadius="4dp"
-            fab:menu_shadowXOffset="1dp"
-            fab:menu_shadowYOffset="3dp"
-            fab:menu_showShadow="true">
-
-
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/export_document"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_upload"
-                android:visibility="@{view.isDocumentExportable.get() ? View.VISIBLE : View.GONE}"
-                app:fab_colorNormal="@color/white"
-                app:fab_colorPressed="@color/white_pressed"
-                app:fab_colorRipple="#66FFFFFF"
-                app:onClick="@{() -> viewModel.exportDocument()}"
-                fab:fab_label="@string/export_document" />
-
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/delete_document"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_delete_24dp"
-                app:fab_colorNormal="@color/white"
-                app:fab_colorPressed="@color/white_pressed"
-                app:fab_colorRipple="#66FFFFFF"
-                app:onClick="@{() -> viewModel.deleteDocument()}"
-                fab:fab_label="@string/delete_document" />
-
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/save_document"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_check_black_24dp"
-                android:visibility="visible"
-                app:fab_colorNormal="@color/white"
-                app:fab_colorPressed="@color/white_pressed"
-                app:fab_colorRipple="#66FFFFFF"
-                app:onClick="@{() -> viewModel.holdDocument()}"
-                fab:fab_label="@string/save_document" />
-
-
-        </com.github.clans.fab.FloatingActionMenu>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/doc_interni_edit_fab_menu.xml b/app/src/main/res/menu/doc_interni_edit_fab_menu.xml
new file mode 100644
index 00000000..fb880ccf
--- /dev/null
+++ b/app/src/main/res/menu/doc_interni_edit_fab_menu.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/export_document"
+        android:icon="@drawable/ic_upload"
+        android:title="@string/export_document"
+        android:visible="false"/>
+    <item
+        android:id="@+id/delete_document"
+        android:icon="@drawable/ic_delete_material3"
+        android:title="@string/delete_document" />
+    <item
+        android:id="@+id/hold_document"
+        android:icon="@drawable/ic_check_black_24dp"
+        android:title="@string/save_document" />
+
+</menu>
\ No newline at end of file

From 4b1632c265b3f68ae46979e3c99d0ab45ac46daf Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 9 Jan 2024 18:06:06 +0100
Subject: [PATCH 09/12] Probabile fix per popup caricamento in
 PVOrdineAcquistoEditActivity

---
 .../PVOrdineAcquistoEditActivity.java                 |  3 +--
 .../PVOrdineAcquistoEditViewModel.java                | 11 ++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java
index 2385784c..191e8132 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java
@@ -255,8 +255,7 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi
         DialogSimpleMessageView.makeInfoDialog(getText(R.string.warning).toString(),
                 Html.fromHtml(getResources().getString(R.string.confirm_export_invalid_product)),
                 null,
-                onConfirm
-                ,
+                onConfirm,
                 this::onLoadingEnded).show(getSupportFragmentManager(), "confirmExportInvalidProducts");
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
index 5a0d48ed..79ef7990 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
@@ -157,9 +157,10 @@ public class PVOrdineAcquistoEditViewModel {
     }
 
     public void processBarcode(String barcode) {
-        try {
-            this.sendOnLoadingStarted();
+        Runnable onComplete = BarcodeManager::enable;
+        BarcodeManager.disable();
 
+        try {
             List<ArticoloOrdinabileDTO> listArticoli = matchArticoliForBarcode(barcode);
             if (listArticoli == null || listArticoli.isEmpty()) {
                 if (SettingsManager.iDB().isFlagConsentiFuoriPianoLogistico() && UtilityString.isNullOrEmpty(mCurrentOrdine.getCodAlis())) {
@@ -172,20 +173,20 @@ public class PVOrdineAcquistoEditViewModel {
             if (listArticoli.size() == 1) {
                 this.addArticoloToOrdine(
                         listArticoli.get(0),
-                        this::sendOnLoadingEnded,
+                        onComplete,
                         this::sendError
                 );
             } else {
                 this.mListener.chooseArtFromList(listArticoli, (art) -> {
                     this.addArticoloToOrdine(
                             art,
-                            this::sendOnLoadingEnded,
+                            onComplete,
                             this::sendError);
                 });
             }
         } catch (Exception e) {
             this.sendError(e);
-            BarcodeManager.enable();
+            onComplete.run();
         }
     }
 

From 5728481a949ab5b45af9ab5727149c9895953589 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 9 Jan 2024 18:23:13 +0100
Subject: [PATCH 10/12] Migliorie processBarcode in
 PVOrdineAcquistoEditActivity

---
 .../PVOrdineAcquistoEditActivity.java         |  4 +-
 .../PVOrdineAcquistoEditViewModel.java        | 74 +++++++++++--------
 2 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java
index 191e8132..f01b9cef 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java
@@ -207,12 +207,12 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi
     }
 
     @Override
-    public void confirmCheckForUnlistedProduct(String barcode) {
+    public void confirmCheckForUnlistedProduct(String barcode, Runnable onComplete) {
         DialogSimpleMessageView.makeInfoDialog(getText(R.string.info).toString(),
                 Html.fromHtml(getResources().getString(R.string.confirm_order_unlisted_item)),
                 null,
                 () -> {
-                    this.mViewModel.loadArticolo(barcode);
+                    this.mViewModel.loadArticolo(barcode, onComplete);
                 }, this::onLoadingEnded).show(getSupportFragmentManager(), "confirmExceedingQtyOrder");
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
index 79ef7990..7a651949 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
@@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -25,7 +26,6 @@ import it.integry.integrywmsnative.core.data_store.db.view_model.ArticoloOrdinab
 import it.integry.integrywmsnative.core.exception.ArtNotFoundInGridException;
 import it.integry.integrywmsnative.core.exception.EmptyOrderException;
 import it.integry.integrywmsnative.core.exception.ExpiredProductListException;
-import it.integry.integrywmsnative.core.exception.MultipleResultFromBarcodeException;
 import it.integry.integrywmsnative.core.exception.NoArtsInGridException;
 import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -161,35 +161,45 @@ public class PVOrdineAcquistoEditViewModel {
         BarcodeManager.disable();
 
         try {
-            List<ArticoloOrdinabileDTO> listArticoli = matchArticoliForBarcode(barcode);
-            if (listArticoli == null || listArticoli.isEmpty()) {
-                if (SettingsManager.iDB().isFlagConsentiFuoriPianoLogistico() && UtilityString.isNullOrEmpty(mCurrentOrdine.getCodAlis())) {
-                    this.mListener.confirmCheckForUnlistedProduct(barcode);
-                    return;
-                } else {
-                    throw new NoResultFromBarcodeException(barcode);
-                }
-            }
-            if (listArticoli.size() == 1) {
-                this.addArticoloToOrdine(
-                        listArticoli.get(0),
-                        onComplete,
-                        this::sendError
-                );
-            } else {
-                this.mListener.chooseArtFromList(listArticoli, (art) -> {
-                    this.addArticoloToOrdine(
-                            art,
-                            onComplete,
-                            this::sendError);
-                });
-            }
+            List<ArticoloOrdinabileDTO> listArticoli = findArticoliByBarcode(barcode);
+
+            if (listArticoli == null || listArticoli.isEmpty())
+                onNoArtsFoundByBarcode(barcode, onComplete);
+            else
+                addArtFromGriglia(listArticoli, onComplete);
+
         } catch (Exception e) {
             this.sendError(e);
             onComplete.run();
         }
     }
 
+    private void onNoArtsFoundByBarcode(String barcode, Runnable onComplete) throws NoResultFromBarcodeException {
+        if (SettingsManager.iDB().isFlagConsentiFuoriPianoLogistico() && UtilityString.isNullOrEmpty(mCurrentOrdine.getCodAlis())) {
+            this.mListener.confirmCheckForUnlistedProduct(barcode, onComplete);
+        } else {
+            throw new NoResultFromBarcodeException(barcode);
+        }
+    }
+
+    private void addArtFromGriglia(List<ArticoloOrdinabileDTO> listArticoli, Runnable onComplete) {
+        if (listArticoli.size() == 1) {
+            this.addArticoloToOrdine(
+                    listArticoli.get(0),
+                    onComplete,
+                    this::sendError
+            );
+        } else {
+            this.mListener.chooseArtFromList(listArticoli, (art) -> {
+                this.addArticoloToOrdine(
+                        art,
+                        onComplete,
+                        this::sendError);
+            });
+        }
+    }
+
+
     private void loadArticoli(Ordine ordine, RunnableArgs<List<ArticoloOrdine>> onLoad) {
         try {
             mArticoliOrdineRepository.findArticoliByOrdine(ordine, onLoad, this::sendError);
@@ -257,10 +267,11 @@ public class PVOrdineAcquistoEditViewModel {
         return articolo;
     }
 
-    public List<ArticoloOrdinabileDTO> matchArticoliForBarcode(String barcode) throws NoArtsInGridException, MultipleResultFromBarcodeException, NoResultFromBarcodeException {
+    public List<ArticoloOrdinabileDTO> findArticoliByBarcode(String barcode) throws NoArtsInGridException {
         if (mArticoliGriglia == null || mArticoliGriglia.isEmpty()) {
             throw new NoArtsInGridException();
         }
+
         List<ArticoloOrdinabileDTO> articoli = Stream.of(mArticoliGriglia).filter(articolo ->
                         articolo.getCodMart().equalsIgnoreCase(barcode) ||
                                 articolo.getBarcode().contains(barcode) ||
@@ -367,13 +378,17 @@ public class PVOrdineAcquistoEditViewModel {
         if (this.mListener != null) mListener.onError(ex);
     }
 
-    public void loadArticolo(String barcode) {
+    public void loadArticolo(String barcode, Runnable onComplete) {
         this.sendOnLoadingStarted();
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
         pvOrdiniAcquistoRESTConsumer.retrieveArticolo(null, codMdep, barcode, (grigliaDTO) -> {
 
             RunnableArgs<ArticoloOrdinabileDTO> addArtToOrder = (articolo) -> {
-                ArticoloOrdinabileDTO existingArt = Stream.of(mArticoliGriglia).filter(x -> x.getCodMart().equalsIgnoreCase(articolo.getCodMart())).findFirstOrElse(null);
+
+                ArticoloOrdinabileDTO existingArt = Stream.of(mArticoliGriglia)
+                        .filter(x -> x.getCodMart().equalsIgnoreCase(articolo.getCodMart()))
+                        .findFirstOrElse(null);
+
                 if (existingArt != null) {
                     List<String> barcodes = existingArt.getBarcode();
                     barcodes.addAll(articolo.getBarcode());
@@ -382,7 +397,8 @@ public class PVOrdineAcquistoEditViewModel {
                 } else {
                     mArticoliGriglia.add(articolo);
                 }
-                this.processBarcode(barcode);
+
+                this.addArtFromGriglia(Collections.singletonList(existingArt), onComplete);
             };
 
             if (grigliaDTO == null || grigliaDTO.getArticoli().isEmpty()) {
@@ -421,7 +437,7 @@ public class PVOrdineAcquistoEditViewModel {
 
         void onError(Exception ex);
 
-        void confirmCheckForUnlistedProduct(String barcode);
+        void confirmCheckForUnlistedProduct(String barcode, Runnable onComplete);
 
         void confirmExportInvalidProducts(Runnable onConfirm);
 

From d839d94d343fb22b6a8c7c759bd7a1a1312de4c4 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 9 Jan 2024 18:42:42 +0100
Subject: [PATCH 11/12] Aggiunto parametro ID in fase di SaveTerminalino in
 Documenti Interni

---
 .../gest/contab_doc_interni/dto/SaveDTO.java          | 11 +++++++++++
 .../edit_form/DocInterniEditFormViewModel.java        |  1 +
 .../PVOrdineAcquistoEditViewModel.java                |  1 -
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/SaveDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/SaveDTO.java
index 48c1127c..d75399bc 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/SaveDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dto/SaveDTO.java
@@ -17,6 +17,8 @@ public class SaveDTO {
     private ColloDTO colloDTO;
     private InventarioDTO inventarioDTO;
 
+    private String UUID;
+
     public String getGestione() {
         return gestione;
     }
@@ -112,4 +114,13 @@ public class SaveDTO {
     public void setInventarioDTO(InventarioDTO inventarioDTO) {
         this.inventarioDTO = inventarioDTO;
     }
+
+    public String getUUID() {
+        return UUID;
+    }
+
+    public SaveDTO setUUID(String UUID) {
+        this.UUID = UUID;
+        return this;
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
index 6ad8b914..b96a38e6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
@@ -202,6 +202,7 @@ public class DocInterniEditFormViewModel {
     private SaveDTO getSaveDto() {
         SqlMtbColt document = this.getDocument();
         SaveDTO saveDTO = new SaveDTO();
+        saveDTO.setUUID(String.valueOf(document.getId()));
         saveDTO.setIdDisp("1");
         saveDTO.setGestione(document.getGestione());
         saveDTO.setCodMdep(document.getCodMdep());
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
index 7a651949..351ac62c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java
@@ -417,7 +417,6 @@ public class PVOrdineAcquistoEditViewModel {
 
             addArtToOrder.run(newArt);
 
-
         }, this::sendError);
     }
 

From 8045d8b4e97793e56fd14aa9710d307f9506972a Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 9 Jan 2024 18:43:29 +0100
Subject: [PATCH 12/12] -> v1.36.13 (406)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d0e22bad..9137ce1a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 405
-    def appVersionName = '1.36.12'
+    def appVersionCode = 406
+    def appVersionName = '1.36.13'
 
     signingConfigs {
         release {