Finish v1.24.8(276)

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 274
-    def appVersionName = '1.24.6'
+    def appVersionCode = 276
+    def appVersionName = '1.24.8'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.core.model;
 
+import android.text.TextUtils;
+
 import androidx.databinding.ObservableArrayList;
 
 import com.annimon.stream.Optional;
@@ -8,6 +10,7 @@ import com.annimon.stream.Stream;
 import org.jetbrains.annotations.Nullable;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -574,9 +577,41 @@ public class MtbColt extends EntityBase {
         String xmlPrefix = "{\"whereCond\": \"";
         String xmlSuffix = "\"}";
 
-        StringBuilder whereCond = new StringBuilder();
+//        StringBuilder whereCond = new StringBuilder();
+        String whereCond;
+        List<String> conditions = new ArrayList<>();
+        String existingFilter;
+        if (this.filtroOrdini != null) {
+            existingFilter = this.filtroOrdini;
+            existingFilter = existingFilter.replace(xmlPrefix, "").replace(xmlSuffix, "");
+            conditions.add(existingFilter);
+        } else {
+            existingFilter = "";
+        }
 
-        if (filtroOrdineDtos != null && filtroOrdineDtos.size() > 0) {
+
+        for (FiltroOrdineDTO filtroOrdineDTO : filtroOrdineDtos) {
+            try {
+                String condition = (String.format("(d.g = %s AND d.d = %s and d.n = %s",
+                        UtilityDB.valueToString(filtroOrdineDTO.getGestioneOrd()),
+                        UtilityDB.valueToString(UtilityDate.formatDate(filtroOrdineDTO.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)),
+                        UtilityDB.valueToString(filtroOrdineDTO.getNumOrd())));
+
+                if (!UtilityString.isNullOrEmpty(filtroOrdineDTO.getDataConsS())) {
+                    condition += (String.format(" AND dr.dc = %s",
+                            UtilityDB.valueToString(UtilityDate.formatDate(filtroOrdineDTO.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH))));
+                }
+
+                condition += ")";
+                if (!existingFilter.contains(condition)) {
+                    conditions.add(condition);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        /*if (filtroOrdineDtos != null && filtroOrdineDtos.size() > 0) {
 
             for (int i = 0; i < filtroOrdineDtos.size(); i++) {
                 FiltroOrdineDTO x = filtroOrdineDtos.get(i);
@@ -602,7 +637,8 @@ public class MtbColt extends EntityBase {
                 }
             }
 
-        }
+        }*/
+        whereCond = TextUtils.join(" OR ", conditions);
 
         this.filtroOrdini = xmlPrefix + whereCond + xmlSuffix;
     }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java

@@ -166,6 +166,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
             });
         }
         this.onLoadingEnded();
+        mBindings.inputNumCnfText.requestFocus();
         return mBindings.getRoot();
     }
 

app/src/main/res/layout/dialog_input_quantity_v2.xml

@@ -27,11 +27,15 @@
             type="it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-        android:background="@android:color/white">
-
+            android:background="@color/full_white"
+            android:orientation="vertical">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
@@ -39,9 +43,6 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/colorPrimary"
                 android:minHeight="?attr/actionBarSize"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
                 app:titleTextColor="@android:color/white">
 
 
@@ -50,10 +51,7 @@
 
             <ScrollView
                 android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/toolbar">
+                android:layout_height="wrap_content">
 
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
@@ -774,8 +772,6 @@
                             android:layout_weight="0.4"
                             android:onClick="@{() -> view.saveAndCloseLU()}"
                             android:text="@string/action_close_ul"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
                             app:strokeColor="@color/colorPrimary"
                             app:visibility="@{view.enabledLUCloseButton}" />
 
@@ -791,8 +787,7 @@
                             android:onClick="@{() -> view.dismiss()}"
                             android:paddingEnd="3dp"
                             app:icon="@drawable/ic_close_24dp"
-                        app:iconGravity="textStart"
-                        app:layout_constraintTop_toTopOf="parent" />
+                            app:iconGravity="textStart" />
 
 
                         <com.google.android.material.button.MaterialButton
@@ -806,13 +801,13 @@
                             android:onClick="@{() -> view.save()}"
                             android:paddingEnd="3dp"
                             app:icon="@drawable/ic_save_24"
-                        app:iconGravity="textStart"
-                        app:layout_constraintTop_toTopOf="parent" />
+                            app:iconGravity="textStart" />
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
             </ScrollView>
+        </LinearLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>