Merge branch 'develop' into feature/Refactoring_Spedizione

app/build.gradle

@@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 132
+    def appVersionCode = 133
-    def appVersionName = '1.12.3'
+    def appVersionName = '1.12.4'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java

@@ -657,10 +657,10 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked<MtbColr> {
             final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext);
 
             if(thereIsAnyRowInUL.get()) {
-                updateDataFine(progress, () -> {
+                ColliMagazzinoRESTConsumer.updateDataFine(mContext, progress, this.mtbColt.get(), () -> {
                     progress.dismiss();
                     setULToCurrentContext(null);
-                }); //() -> distribuisciCollo(progress, () -> printCollo(progress)));
+                }, null);
             } else {
                 deleteCollo(progress);
             }
@@ -668,27 +668,6 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked<MtbColr> {
         }
     }
 
-    private void updateDataFine(Dialog progress, Runnable onComplete) {
-
-        MtbColt cloneMtbColt = (MtbColt) this.mtbColt.get().clone();
-        cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE);
-        cloneMtbColt.setOraFinePrep(UtilityDate.getDateInstance());
-
-
-        ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, new ISimpleOperationCallback<MtbColt>() {
-            @Override
-            public void onSuccess(MtbColt value) {
-                if(onComplete != null) onComplete.run();
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-                UtilityExceptions.defaultException(mContext, ex, progress);
-            }
-        });
-
-    }
-
     private void deleteCollo(Dialog progress) {
 
         //La delete è stata commentata poichè visto che nel WMS vengono sempre presi i RESIDUI,

app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java

@@ -14,6 +14,7 @@ import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.utility.UtilityDialog;
 import it.integry.integrywmsnative.databinding.DialogBasketLuBinding;
 import it.integry.integrywmsnative.databinding.DialogBasketLuPage1Binding;
 import it.integry.integrywmsnative.view.dialogs.basket_lu.interfaces.DialogBasketLU_BaseViewModel;
@@ -44,6 +45,10 @@ public class DialogBasketLU_Page1_ViewModel extends DialogBasketLU_BaseViewModel
 
     @Override
     public void onShow() {
+
+
+        mBinding.constraintLayout.setMaxHeight((int) (mContext.getResources().getDisplayMetrics().heightPixels * 0.75));
+
         ColliMagazzinoRESTConsumer.retrieveBasketColli(mtbColts -> {
             availableMtbColts = mtbColts;
             if(mtbColts != null && mtbColts.size() > 0) initRecyclerView(availableMtbColts);

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

@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/constraint_layout"
         android:orientation="vertical" android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
 
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/dialog_basket_lu__main_list"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
 
 
@@ -68,5 +73,5 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>