Finish v1.16.33(215)

-> v1.16.33 (215)
Ordinamento ordini uscita
2021-05-07 13:04:50 +02:00 · 2021-05-07 13:04:44 +02:00 · 2021-05-07 13:03:45 +02:00 · 2021-05-04 17:34:36 +02:00 · 2021-05-04 17:34:35 +02:00 · 2021-05-04 17:34:30 +02:00
19 changed files with 302 additions and 83 deletions
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,24 +1,12 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </JetCodeStyleSettings>
    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
      <arrangement>
        <rules>
          <section>
@@ -127,5 +115,8 @@
        </rules>
      </arrangement>
    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
  </code_scheme>
 </component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
  <component name="RunConfigurationProducerService">
    <option name="ignoredProducers">
      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'

 android {

-    def appVersionCode = 209
-    def appVersionName = '1.16.27'
+    def appVersionCode = 215
+    def appVersionName = '1.16.33'

    signingConfigs {
        release {
--- 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
@@ -11,7 +11,6 @@ import org.jetbrains.annotations.NotNull;

 import java.lang.reflect.Type;
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -485,40 +484,31 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
    }

    public static void getByTestataStatic(MtbColt testata, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
-        String ssccString = null;
+        testata.setMtbColr(new ObservableArrayList<>());

-        if (testata.getSerCollo().equalsIgnoreCase(CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE)) {
-            ssccString = "U";

-            SimpleDateFormat sdf = new SimpleDateFormat("yy");
-            ssccString += sdf.format(testata.getDataColloD());
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService.getColloInGiac(onlyResiduo, throwExcIfNull, testata).enqueue(new Callback<ServiceRESTResponse<MtbColt>>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
+                analyzeAnswer(response, "getColloInGiac", mtbColt -> {

-            ssccString += String.format("%07d", testata.getNumCollo());
-        } else {
-            ssccString = "";
+                    if (mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
+                        List<MtbColt> mtbColtList = new ArrayList<>();
+                        mtbColtList.add(mtbColt);
+                        fillMtbAartsOfMtbColtsStatic(mtbColtList, mtbColts -> onComplete.run(mtbColts.get(0)), onFailed);
+                    } else {
+                        onComplete.run(mtbColt);
+                    }

-            switch (testata.getGestioneEnum()) {
-                case ACQUISTO:
-                    ssccString += "1";
-                    break;
-
-                case LAVORAZIONE:
-                    ssccString += "2";
-                    break;
-
-                case VENDITA:
-                    ssccString += "3";
-                    break;
+                }, onFailed);
            }

-            SimpleDateFormat sdf = new SimpleDateFormat("yy");
-            ssccString += sdf.format(testata.getDataColloD());
-
-            ssccString += String.format("%05d", testata.getNumCollo());
-            ssccString += "0";
-        }
-
-        getBySSCCStatic(ssccString, onlyResiduo, throwExcIfNull, onComplete, onFailed);
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<MtbColt>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
    }


--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java
@@ -24,6 +24,9 @@ public interface ColliMagazzinoRESTConsumerService {
    @POST("getColloByBarcode")
    Call<ServiceRESTResponse<MtbColt>> getColloByBarcode(@Query("codBarreCollo") String sscc, @Query("onlyResiduo") boolean onlyResiduo, @Query("throwExcIfNull") boolean throwExcIfNull);

+    @POST("getColloInGiac")
+    Call<ServiceRESTResponse<MtbColt>> getColloInGiac(@Query("onlyResiduo") boolean onlyResiduo, @Query("throwExcIfNull") boolean throwExcIfNull, @Body MtbColt mtbColt);
+
    @GET("getColliInBasket")
    Call<ServiceRESTResponse<List<MtbColt>>> getColliInBasket(@Query("codMdep") String codMdep);

--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -312,6 +312,8 @@ public class SettingsManager {
            return clazz.cast(value.getValue());
        } else if(clazz == Boolean.class) {
            return clazz.cast("S".equalsIgnoreCase(value.getValue()));
+        } else if(clazz == Integer.class && value.getValue() != null) {
+            return clazz.cast(Integer.parseInt(value.getValue()));
        } else return null;

    }
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
@@ -220,6 +220,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF

        ComparatorCompat<OrdiniUscitaElencoDTO> comparator = ComparatorCompat
                .comparing(OrdiniUscitaElencoDTO::getRagSocOrd)
+                .thenComparing(ComparatorCompat.comparing(x -> x.getDestinatario() != null ? x.getDestinatario() : "zzzzzzzzz"))
                .thenComparing(ComparatorCompat.comparing(OrdiniUscitaElencoDTO::getNumOrd));

        List<OrdiniUscitaElencoListModel> notHiddenElements = Stream.of(dataList)
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzato.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzato.java
@@ -50,6 +50,7 @@ public class DialogVenditaFiltroAvanzato {
    private ArrayAdapter<String> arrayAdapterVettore;
    private ArrayAdapter<String> arrayAdapterAgente;
    private ArrayAdapter<String> arrayAdapterAutomezzo;
+    private ArrayAdapter<String> arrayAdapterPaese;

    private Predicate<OrdiniUscitaElencoDTO> currentDepositoPredicate = null;
    private Predicate<OrdiniUscitaElencoDTO> currentIdViaggioPredicate = null;
@@ -60,6 +61,7 @@ public class DialogVenditaFiltroAvanzato {
    private Predicate<OrdiniUscitaElencoDTO> currentVettorePredicate = null;
    private Predicate<OrdiniUscitaElencoDTO> currentAgentePredicate = null;
    private Predicate<OrdiniUscitaElencoDTO> currentAutomezzoPredicate = null;
+    private Predicate<OrdiniUscitaElencoDTO> currentPaesePredicate = null;

    private boolean firstInit = true;

@@ -126,6 +128,7 @@ public class DialogVenditaFiltroAvanzato {
        viewModel.vettore.set(null);
        viewModel.automezzo.set(null);
        viewModel.agente.set(null);
+        viewModel.paese.set(null);
    }

    private void initView(DialogVenditaFiltroAvanzatoBinding bindings, DialogVenditaFiltroAvanzatoViewModel viewModel) {
@@ -193,6 +196,10 @@ public class DialogVenditaFiltroAvanzato {
        arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(false));
        bindings.filledExposedDropdownAutomezzo.setAdapter(arrayAdapterAutomezzo);

+        arrayAdapterPaese = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item);
+        arrayAdapterPaese.addAll(getAvailablePaesi(false));
+        bindings.filledExposedDropdownPaese.setAdapter(arrayAdapterPaese);
+

        viewModel.deposito.refresh();
        viewModel.idViaggio.refresh();
@@ -203,6 +210,7 @@ public class DialogVenditaFiltroAvanzato {
        viewModel.automezzo.refresh();
        viewModel.dataConsegna.refresh();
        viewModel.agente.refresh();
+        viewModel.paese.refresh();


    }
@@ -240,6 +248,8 @@ public class DialogVenditaFiltroAvanzato {
            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
            arrayAdapterAgente.clear();
            arrayAdapterAgente.addAll(getAvailableAgente(true));
+            arrayAdapterPaese.clear();
+            arrayAdapterPaese.addAll(getAvailablePaesi(true));
        });

        BindableString.registerListener(viewModel.deposito, value -> {
@@ -264,6 +274,8 @@ public class DialogVenditaFiltroAvanzato {
            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
            arrayAdapterAgente.clear();
            arrayAdapterAgente.addAll(getAvailableAgente(true));
+            arrayAdapterPaese.clear();
+            arrayAdapterPaese.addAll(getAvailablePaesi(true));
        });

        BindableString.registerListener(viewModel.numOrds, value -> {
@@ -298,6 +310,8 @@ public class DialogVenditaFiltroAvanzato {
            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
            arrayAdapterAgente.clear();
            arrayAdapterAgente.addAll(getAvailableAgente(true));
+            arrayAdapterPaese.clear();
+            arrayAdapterPaese.addAll(getAvailablePaesi(true));
        });

        BindableString.registerListener(viewModel.cliente, value -> {
@@ -322,6 +336,8 @@ public class DialogVenditaFiltroAvanzato {
            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
            arrayAdapterAgente.clear();
            arrayAdapterAgente.addAll(getAvailableAgente(true));
+            arrayAdapterPaese.clear();
+            arrayAdapterPaese.addAll(getAvailablePaesi(true));
        });

        BindableString.registerListener(viewModel.terminiConsegna, value -> {
@@ -346,6 +362,8 @@ public class DialogVenditaFiltroAvanzato {
            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
            arrayAdapterAgente.clear();
            arrayAdapterAgente.addAll(getAvailableAgente(true));
+            arrayAdapterPaese.clear();
+            arrayAdapterPaese.addAll(getAvailablePaesi(true));
        });

        BindableString.registerListener(viewModel.vettore, value -> {
@@ -370,6 +388,8 @@ public class DialogVenditaFiltroAvanzato {
            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
            arrayAdapterAgente.clear();
            arrayAdapterAgente.addAll(getAvailableAgente(true));
+            arrayAdapterPaese.clear();
+            arrayAdapterPaese.addAll(getAvailablePaesi(true));
        });

        BindableString.registerListener(viewModel.automezzo, value -> {
@@ -394,6 +414,8 @@ public class DialogVenditaFiltroAvanzato {
            arrayAdapterVettore.addAll(getAvailableVettori(true));
            arrayAdapterAgente.clear();
            arrayAdapterAgente.addAll(getAvailableAgente(true));
+            arrayAdapterPaese.clear();
+            arrayAdapterPaese.addAll(getAvailablePaesi(true));
        });

        BindableString.resetListeners(viewModel.dataConsegna);
@@ -421,6 +443,8 @@ public class DialogVenditaFiltroAvanzato {
            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
            arrayAdapterAgente.clear();
            arrayAdapterAgente.addAll(getAvailableAgente(true));
+            arrayAdapterPaese.clear();
+            arrayAdapterPaese.addAll(getAvailablePaesi(true));
        });

        BindableString.resetListeners(viewModel.agente);
@@ -446,6 +470,35 @@ public class DialogVenditaFiltroAvanzato {
            arrayAdapterVettore.addAll(getAvailableVettori(true));
            arrayAdapterAutomezzo.clear();
            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
+            arrayAdapterPaese.clear();
+            arrayAdapterPaese.addAll(getAvailablePaesi(true));
+        });
+
+        BindableString.resetListeners(viewModel.paese);
+        BindableString.registerListener(viewModel.paese, value -> {
+            if(UtilityString.isNullOrEmpty(value)) currentPaesePredicate = null;
+            else {
+                currentPaesePredicate = o -> !UtilityString.isNullOrEmpty(o.getCitta()) && (o.getCitta().toLowerCase().contains(value) || o.getCitta().equalsIgnoreCase(value));
+            }
+
+            refreshList();
+
+            arrayAdapterCodMdep.clear();
+            arrayAdapterCodMdep.addAll(getAvailableCodMdeps(true));
+            arrayAdapterIdViaggio.clear();
+            arrayAdapterIdViaggio.addAll(getAvailableIdViaggio(true));
+            arrayAdapterNumOrds.clear();
+            arrayAdapterNumOrds.addAll(getAvailableNumOrds(true));
+            arrayAdapterCliente.clear();
+            arrayAdapterCliente.addAll(getAvailableCliente(true));
+            arrayAdapterTermCons.clear();
+            arrayAdapterTermCons.addAll(getAvailableTermCons(true));
+            arrayAdapterVettore.clear();
+            arrayAdapterVettore.addAll(getAvailableVettori(true));
+            arrayAdapterAutomezzo.clear();
+            arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(true));
+            arrayAdapterAgente.clear();
+            arrayAdapterAgente.addAll(getAvailableAgente(true));
        });

    }
@@ -453,7 +506,16 @@ public class DialogVenditaFiltroAvanzato {


    private List<String> getAvailableIdViaggio(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null && currentDepositoPredicate == null){
+        if(currentAgentePredicate == null &&
+                currentNumOrdsPredicate == null &&
+                currentClientePredicate == null &&
+                currentDataConsPredicate == null &&
+                currentAutomezzoPredicate == null &&
+                currentVettorePredicate == null &&
+                currentTermConsPredicate == null &&
+                currentDepositoPredicate == null &&
+                currentPaesePredicate == null
+        ){
            currentFilteredOrderList = currentOrderList;
        } else if(!skipRecalc){
            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
@@ -465,7 +527,8 @@ public class DialogVenditaFiltroAvanzato {
                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x))) &&
                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
+                            (currentAgentePredicate == null || (currentAgentePredicate.test(x))) &&
+                            (currentPaesePredicate == null || (currentPaesePredicate.test(x)))
                    );

            currentFilteredOrderList = tmpStream.toList();
@@ -481,7 +544,16 @@ public class DialogVenditaFiltroAvanzato {
    }

    private List<String> getAvailableAgente(boolean skipRecalc) {
-        if(currentDepositoPredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null){
+        if(currentDepositoPredicate == null &&
+                currentIdViaggioPredicate == null &&
+                currentNumOrdsPredicate == null &&
+                currentClientePredicate == null &&
+                currentDataConsPredicate == null &&
+                currentAutomezzoPredicate == null &&
+                currentVettorePredicate == null &&
+                currentTermConsPredicate == null &&
+                currentPaesePredicate == null
+        ){
            currentFilteredOrderList = currentOrderList;
        } else if(!skipRecalc){
            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
@@ -494,7 +566,8 @@ public class DialogVenditaFiltroAvanzato {
                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
+                            (currentAgentePredicate == null || (currentAgentePredicate.test(x))) &&
+                            (currentPaesePredicate == null || (currentPaesePredicate.test(x)))
                    );

            currentFilteredOrderList = tmpStream.toList();
@@ -504,7 +577,16 @@ public class DialogVenditaFiltroAvanzato {
    }

    private List<String> getAvailableCodMdeps(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null){
+        if(currentAgentePredicate == null &&
+                currentIdViaggioPredicate == null &&
+                currentNumOrdsPredicate == null &&
+                currentClientePredicate == null &&
+                currentDataConsPredicate == null &&
+                currentAutomezzoPredicate == null &&
+                currentVettorePredicate == null &&
+                currentTermConsPredicate == null &&
+                currentPaesePredicate == null
+        ){
            currentFilteredOrderList = currentOrderList;
        } else if(!skipRecalc){
            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
@@ -516,7 +598,8 @@ public class DialogVenditaFiltroAvanzato {
                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x))) &&
                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
+                            (currentAgentePredicate == null || (currentAgentePredicate.test(x))) &&
+                            (currentPaesePredicate == null || (currentPaesePredicate.test(x)))
                    );

            currentFilteredOrderList = tmpStream.toList();
@@ -526,7 +609,16 @@ public class DialogVenditaFiltroAvanzato {
    }

    private List<String> getAvailableCliente(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentDepositoPredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null){
+        if(currentAgentePredicate == null &&
+                currentIdViaggioPredicate == null &&
+                currentNumOrdsPredicate == null &&
+                currentDepositoPredicate == null &&
+                currentDataConsPredicate == null &&
+                currentAutomezzoPredicate == null &&
+                currentVettorePredicate == null &&
+                currentTermConsPredicate == null &&
+                currentPaesePredicate == null
+        ){
            currentFilteredOrderList = currentOrderList;
        } else if(!skipRecalc){
            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
@@ -538,7 +630,8 @@ public class DialogVenditaFiltroAvanzato {
                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x))) &&
                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
+                            (currentAgentePredicate == null || (currentAgentePredicate.test(x))) &&
+                            (currentPaesePredicate == null || (currentPaesePredicate.test(x)))
                    );

            currentFilteredOrderList = tmpStream.toList();
@@ -548,7 +641,16 @@ public class DialogVenditaFiltroAvanzato {
    }

    private List<String> getAvailableNumOrds(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentDepositoPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentTermConsPredicate == null){
+        if(currentAgentePredicate == null &&
+                currentIdViaggioPredicate == null &&
+                currentDepositoPredicate == null &&
+                currentClientePredicate == null &&
+                currentDataConsPredicate == null &&
+                currentAutomezzoPredicate == null &&
+                currentVettorePredicate == null &&
+                currentTermConsPredicate == null &&
+                currentPaesePredicate == null
+        ){
            currentFilteredOrderList = currentOrderList;
        } else if(!skipRecalc){
            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
@@ -560,7 +662,8 @@ public class DialogVenditaFiltroAvanzato {
                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x))) &&
                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
+                            (currentAgentePredicate == null || (currentAgentePredicate.test(x))) &&
+                            (currentPaesePredicate == null || (currentPaesePredicate.test(x)))
                    );

            currentFilteredOrderList = tmpStream.toList();
@@ -570,7 +673,16 @@ public class DialogVenditaFiltroAvanzato {
    }

    private List<String> getAvailableTermCons(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentAutomezzoPredicate == null && currentVettorePredicate == null && currentDepositoPredicate == null){
+        if(currentAgentePredicate == null &&
+                currentIdViaggioPredicate == null &&
+                currentNumOrdsPredicate == null &&
+                currentClientePredicate == null &&
+                currentDataConsPredicate == null &&
+                currentAutomezzoPredicate == null &&
+                currentVettorePredicate == null &&
+                currentDepositoPredicate == null &&
+                currentPaesePredicate == null
+        ){
            currentFilteredOrderList = currentOrderList;
        } else if(!skipRecalc){
            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
@@ -582,7 +694,8 @@ public class DialogVenditaFiltroAvanzato {
                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x)))  &&
                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
+                            (currentAgentePredicate == null || (currentAgentePredicate.test(x))) &&
+                            (currentPaesePredicate == null || (currentPaesePredicate.test(x)))
                    );

            currentFilteredOrderList = tmpStream.toList();
@@ -592,7 +705,16 @@ public class DialogVenditaFiltroAvanzato {
    }

    private List<String> getAvailableVettori(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentTermConsPredicate == null && currentAutomezzoPredicate == null && currentDepositoPredicate == null){
+        if(currentAgentePredicate == null &&
+                currentIdViaggioPredicate == null &&
+                currentNumOrdsPredicate == null &&
+                currentClientePredicate == null &&
+                currentDataConsPredicate == null &&
+                currentTermConsPredicate == null &&
+                currentAutomezzoPredicate == null &&
+                currentDepositoPredicate == null &&
+                currentPaesePredicate == null
+        ){
            currentFilteredOrderList = currentOrderList;
        } else if(!skipRecalc){
            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
@@ -604,7 +726,8 @@ public class DialogVenditaFiltroAvanzato {
                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate .test(x)))  &&
                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
+                            (currentAgentePredicate == null || (currentAgentePredicate.test(x))) &&
+                            (currentPaesePredicate == null || (currentPaesePredicate.test(x)))
                    );

            currentFilteredOrderList = tmpStream.toList();
@@ -614,7 +737,16 @@ public class DialogVenditaFiltroAvanzato {
    }

    private List<String> getAvailableAutomezzi(boolean skipRecalc) {
-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentTermConsPredicate == null && currentVettorePredicate == null && currentDepositoPredicate == null){
+        if(currentAgentePredicate == null &&
+                currentIdViaggioPredicate == null &&
+                currentNumOrdsPredicate == null &&
+                currentClientePredicate == null &&
+                currentDataConsPredicate == null &&
+                currentTermConsPredicate == null &&
+                currentVettorePredicate == null &&
+                currentDepositoPredicate == null &&
+                currentPaesePredicate == null
+        ){
            currentFilteredOrderList = currentOrderList;
        } else if(!skipRecalc){
            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
@@ -626,7 +758,8 @@ public class DialogVenditaFiltroAvanzato {
                            (currentVettorePredicate == null || (currentVettorePredicate.test(x)))  &&
                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
+                            (currentAgentePredicate == null || (currentAgentePredicate.test(x))) &&
+                            (currentPaesePredicate == null || (currentPaesePredicate.test(x)))
                    );

            currentFilteredOrderList = tmpStream.toList();
@@ -635,9 +768,51 @@ public class DialogVenditaFiltroAvanzato {
        return Stream.of(currentFilteredOrderList).map(OrdiniUscitaElencoDTO::getDescrizioneAuto).distinct().withoutNulls().sorted().toList();
    }

+    private List<String> getAvailablePaesi(boolean skipRecalc) {
+        if(currentAgentePredicate == null &&
+                currentIdViaggioPredicate == null &&
+                currentNumOrdsPredicate == null &&
+                currentClientePredicate == null &&
+                currentDataConsPredicate == null &&
+                currentTermConsPredicate == null &&
+                currentVettorePredicate == null &&
+                currentDepositoPredicate == null &&
+                currentAutomezzoPredicate == null
+        ){
+            currentFilteredOrderList = currentOrderList;
+        } else if(!skipRecalc){
+            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
+                    .filter(x ->
+                            (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) &&
+                            (currentClientePredicate == null || (currentClientePredicate.test(x))) &&
+                            (currentDataConsPredicate == null || (currentDataConsPredicate.test(x))) &&
+                            (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) &&
+                            (currentVettorePredicate == null || (currentVettorePredicate.test(x)))  &&
+                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
+                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
+                            (currentAgentePredicate == null || (currentAgentePredicate.test(x))) &&
+                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x)))
+                    );
+
+            currentFilteredOrderList = tmpStream.toList();
+        }
+
+        return Stream.of(currentFilteredOrderList).map(OrdiniUscitaElencoDTO::getCitta).withoutNulls().distinct().sorted().toList();
+    }
+
    private void refreshList() {

-        if(currentAgentePredicate == null && currentIdViaggioPredicate == null && currentNumOrdsPredicate == null && currentClientePredicate == null && currentDataConsPredicate == null && currentTermConsPredicate == null && currentVettorePredicate == null && currentAutomezzoPredicate == null && currentDepositoPredicate == null){
+        if(currentAgentePredicate == null &&
+                currentIdViaggioPredicate == null &&
+                currentNumOrdsPredicate == null &&
+                currentClientePredicate == null &&
+                currentDataConsPredicate == null &&
+                currentTermConsPredicate == null &&
+                currentVettorePredicate == null &&
+                currentAutomezzoPredicate == null &&
+                currentDepositoPredicate == null &&
+                currentPaesePredicate == null
+        ){
            currentFilteredOrderList = currentOrderList;
        } else {
            Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(currentOrderList)
@@ -650,7 +825,8 @@ public class DialogVenditaFiltroAvanzato {
                            (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x)))  &&
                            (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) &&
                            (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) &&
-                            (currentAgentePredicate == null || (currentAgentePredicate.test(x)))
+                            (currentAgentePredicate == null || (currentAgentePredicate.test(x))) &&
+                            (currentPaesePredicate == null || (currentPaesePredicate.test(x)))
                );

            currentFilteredOrderList = tmpStream.toList();
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoViewModel.java
@@ -15,6 +15,7 @@ public class DialogVenditaFiltroAvanzatoViewModel {
    public BindableString agente = new BindableString();
    public BindableString vettore = new BindableString();
    public BindableString automezzo = new BindableString();
+    public BindableString paese = new BindableString();

    public Date dataConsegnaDate;

--- 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
@@ -128,7 +128,7 @@ public class ProdVersamentoMaterialViewModel {
                            DialogSimpleMessageView
                                    .makeWarningDialog(new SpannableString(Html.fromHtml("Il collo selezionato non presenta articoli versabili sulla linea.")),
                                            null, this::openLU)
-                                    .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag");
+                                    .show(mContext.getSupportFragmentManager(), "tag");
                            return;
                        } else if (mtbColt.get().getMtbColr().size() > 1) {

@@ -137,10 +137,11 @@ public class ProdVersamentoMaterialViewModel {
                                            null, () -> {
                                                cyclicGetOrdiniLavByCollo(mtbColt.get().getMtbColr().iterator(), mtbDepoPosizione);
                                            })
-                                    .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag");
+                                    .show(mContext.getSupportFragmentManager(), "tag");
                            return;

                        }
+
                        MesRESTConsumer.getOrdiniLavorazioneMateriale(
                                mtbDepoPosizione.getPosizione(),
                                getIdMaterialeFromCollo(mtbColt.get()),
@@ -148,7 +149,7 @@ public class ProdVersamentoMaterialViewModel {
                                e -> DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(e.getMessage())),
                                null,
                                        this::openLU)
-                                    .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"));
+                                    .show(mContext.getSupportFragmentManager(), "tag"));
                    }
                } else {
                    DialogSimpleMessageView
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
@@ -805,7 +805,7 @@ public class SpedizioneViewModel {

        MtbColr refMtbColr = null;

-        if (scannedMtbColr != null && refMtbColt != null && refMtbColt.getMtbColr().size() > 0) {
+        if (refMtbColt != null && refMtbColt.getMtbColr().size() > 0) {
            Optional<MtbColr> optionalMtbColr = Stream.of(refMtbColt.getMtbColr())
                    .filter(y -> UtilityString.equalsIgnoreCase(y.getCodMart(), scannedMtbColr.getCodMart()) &&
                            UtilityString.equalsIgnoreCase(y.getCodTagl(), scannedMtbColr.getCodTagl()) &&
@@ -816,7 +816,7 @@ public class SpedizioneViewModel {
            if (optionalMtbColr.isPresent()) refMtbColr = optionalMtbColr.get();
        }

-        MtbColr mtbColrToUse = refMtbColr != null ? refMtbColr : scannedMtbColr;
+        MtbColr mtbColrToUse = scannedMtbColr != null ? scannedMtbColr : refMtbColr;

        if (mtbColrToUse != null) {
            if (pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) {
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
@@ -185,6 +185,8 @@ public class DialogInputQuantityV2ViewModel {
                this.mListener.onError(ex);
                onComplete.run();
            });
+        } else {
+            onComplete.run();
        }
    }

--- a/app/src/main/res/layout/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml
@@ -223,8 +223,20 @@
                            android:textStyle="bold" />


+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:orientation="horizontal">
+
+
+
                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/AppTheme.NewMaterial.Text.Small"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentEnd="true"
@@ -234,7 +246,7 @@
                            android:textStyle="bold" />

                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/AppTheme.NewMaterial.Text.Small"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_marginStart="0dp"
@@ -243,7 +255,7 @@
                            android:textStyle="bold" />

                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/AppTheme.NewMaterial.Text.Small"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentEnd="true"
@@ -253,7 +265,7 @@
                            android:textStyle="bold" />

                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/AppTheme.NewMaterial.Text.Small"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentEnd="true"
@@ -262,7 +274,6 @@
                            android:textColor="@android:color/white"
                            android:textStyle="bold" />

-
                    </androidx.appcompat.widget.LinearLayoutCompat>


@@ -312,9 +323,21 @@
                            android:textColor="@android:color/white"
                            android:textStyle="bold" />

+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:orientation="horizontal">
+
+
+

                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/AppTheme.NewMaterial.Text.Small"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentEnd="true"
@@ -324,7 +347,7 @@
                            android:textStyle="bold" />

                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/AppTheme.NewMaterial.Text.Small"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_marginStart="0dp"
@@ -333,7 +356,7 @@
                            android:textStyle="bold" />

                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/AppTheme.NewMaterial.Text.Small"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentEnd="true"
@@ -343,7 +366,7 @@
                            android:textStyle="bold" />

                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/AppTheme.NewMaterial.Text.Small"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentEnd="true"
@@ -355,7 +378,6 @@

                    </androidx.appcompat.widget.LinearLayoutCompat>

-
                </androidx.appcompat.widget.LinearLayoutCompat>


--- a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
+++ b/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
@@ -163,12 +163,34 @@
                        android:singleLine="true"
                        android:ellipsize="end"
                        android:imeOptions="actionNext"
-                        android:nextFocusForward="@id/filled_exposed_dropdown_agente"
+                        android:nextFocusForward="@id/filled_exposed_dropdown_paese"
                        app:binding="@{viewmodel.automezzo}"/>

                </com.google.android.material.textfield.TextInputLayout>


+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/input_paese"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/city"
+                    android:visibility="gone">
+
+                    <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                        android:id="@+id/filled_exposed_dropdown_paese"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textNoSuggestions"
+                        android:singleLine="true"
+                        android:ellipsize="end"
+                        android:imeOptions="actionNext"
+                        android:nextFocusForward="@id/filled_exposed_dropdown_agente"
+                        app:binding="@{viewmodel.paese}"/>
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+
                <com.google.android.material.textfield.TextInputLayout
                    android:id="@+id/input_agente"
                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -210,6 +210,7 @@
    <string name="document_date">Data documento</string>
    <string name="terms_of_delivery">Termini di consegna</string>
    <string name="vehicle">Automezzo</string>
+    <string name="city">Paese</string>
    <string name="deposit">Deposito</string>
    <string name="rag_soc">Ragione sociale</string>
    <string name="travel_id">ID Viaggio</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -213,6 +213,7 @@
    <string name="document_date">Document date</string>
    <string name="terms_of_delivery">Terms of delivery</string>
    <string name="vehicle">Vehicle</string>
+    <string name="city">City</string>
    <string name="deposit">Deposit</string>
    <string name="rag_soc">Company name</string>
    <string name="travel_id">Travel ID</string>
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath 'com.google.gms:google-services:4.3.5'
        classpath 'com.google.firebase:perf-plugin:1.3.5'
--- 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-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
Author	SHA1	Message	Date
GiuseppeS	e0c07ea06e	Finish v1.16.33(215)	2021-05-07 13:04:50 +02:00
GiuseppeS	3e79b52e23	-> v1.16.33 (215)	2021-05-07 13:04:44 +02:00
GiuseppeS	7d7712e57a	Ordinamento ordini uscita	2021-05-07 13:03:45 +02:00
GiuseppeS	6d7a047e8e	Finish v1.16.32(214)	2021-05-04 17:34:36 +02:00
GiuseppeS	72e4f2a0b9	Finish v1.16.32(214)	2021-05-04 17:34:35 +02:00
GiuseppeS	ef6cdc6a86	-> v1.16.32 (214)	2021-05-04 17:34:30 +02:00
GiuseppeS	23b86e68cc	Fix su scansione barcode ean13 in dialog input quantity	2021-05-04 17:34:00 +02:00
GiuseppeS	2e46f9f665	Finish v1.16.31(213)	2021-04-26 12:01:38 +02:00
GiuseppeS	88b1c56360	Finish v1.16.31(213)	2021-04-26 12:01:37 +02:00
GiuseppeS	1d71ac10bd	-> v1.16.31 (213)	2021-04-26 12:01:29 +02:00
GiuseppeS	8eb677ecdf	Sostituito getBySSCC con get generica dei colli.	2021-04-26 12:01:00 +02:00
GiuseppeS	74efbac452	Finish v1.16.30(212)	2021-04-23 15:25:16 +02:00
GiuseppeS	9c6375083f	Finish v1.16.30(212)	2021-04-23 15:25:16 +02:00
GiuseppeS	b24d5271a4	-> v1.16.30 (212)	2021-04-23 15:23:54 +02:00
GiuseppeS	b5626e5b08	Fix su refMtbColr in Spedizione	2021-04-23 15:23:28 +02:00
GiuseppeS	fd2e1fa4f4	Finish v1.16.29(211)	2021-04-23 12:59:11 +02:00
GiuseppeS	a3f5072646	Finish v1.16.29(211)	2021-04-23 12:59:10 +02:00
GiuseppeS	1258e8c3e6	-> v1.16.29 (211)	2021-04-23 12:58:58 +02:00
GiuseppeS	ccef0fe528	Fix su qtaDaPrelevare in spedizione	2021-04-23 12:58:03 +02:00
GiuseppeS	9bb5d1adce	Finish v1.16.28(210)	2021-04-16 18:33:55 +02:00
GiuseppeS	ac446d953c	Finish v1.16.28(210)	2021-04-16 18:33:53 +02:00
GiuseppeS	407ff0b264	-> v1.16.28 (210)	2021-04-16 18:33:49 +02:00
GiuseppeS	10e748b9d4	Fix su getValue nel caso di integer in gest setup	2021-04-16 18:33:16 +02:00
GiuseppeS	e30273fe42	Finish v1.16.27(209)	2021-04-15 12:10:26 +02:00