From 84c7c6ac956834bcb2e6abf3d9d0b1edc6082f84 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 11 Nov 2019 12:19:23 +0100
Subject: [PATCH] Sistemata gestione della commessa quando viene creato un
 collo di reso da cliente.

---
 .idea/runConfigurations/app.xml               |  2 +-
 .../picking_resi/PickingResiActivity.java     | 44 +----------
 .../UltimeConsegneMainListAdapter.java        | 76 ++++++++++---------
 .../viewmodel/VersamentoMerceViewModel.java   |  6 ++
 ...n_ultime_consegne_cliente__list_header.xml | 46 ++++-------
 ...ime_consegne_cliente__list_single_item.xml | 40 +++++-----
 ...ultime_consegne_fornitore__list_header.xml | 49 ++++--------
 ...e_consegne_fornitore__list_single_item.xml | 13 ++--
 8 files changed, 103 insertions(+), 173 deletions(-)

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index 0314a474..b854e408 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
+  <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
     <module name="app" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
index 44b86440..36df77da 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
@@ -282,47 +282,6 @@ public class PickingResiActivity extends BaseActivity implements IOnColloClosedC
                     .setCanPartitaMagBeChanged(false)
                     .setMaxQta(qtaDaEvadere);
 
-//            if(item.getTempPickData() != null) {
-//                PickingObjectDTO.PickData tmpPickData = item.getTempPickData();
-//
-//                if(!UtilityString.isNullOrEmpty(tmpPickData.getBatchLot())) {
-//                    dto.setBatchLot(tmpPickData.getBatchLot());
-//                }
-//
-//                if(tmpPickData.getDataScad() != null){
-//                    dto.setDataScad(tmpPickData.getDataScad());
-//                    dto.setShouldAskDataScad(true);
-//                }
-//
-//                boolean useQtaDaEvadere;
-//
-//                if(tmpPickData.getQtaTot() != null) {
-//                    useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissa();
-//                    if(useQtaDaEvadere){
-//                        dto.setQtaTot(qtaDaEvadere);
-//                        dto.setMaxQta(qtaDaEvadere);
-//                    } else {
-//                        dto.setQtaTot(tmpPickData.getQtaTot());
-//                        dto.setMaxQta(tmpPickData.getQtaTot());
-//                        dto.setQtaCnf(tmpPickData.getQtaTot());
-//                    }
-//
-//
-//                    if (tmpPickData.getQtaCnf() != null && useQtaDaEvadere) {
-//                        dto.setQtaCnf(tmpPickData.getQtaCnf());
-//                    }
-//                }
-//
-//
-//                if(dto.getQtaTot() != null && dto.getQtaTot().floatValue() > 0 && dto.getQtaCnf() != null && dto.getQtaCnf().floatValue() > 0) {
-//                    dto.setNumCnf(dto.getQtaTot().divide(dto.getQtaCnf()).intValue());
-//                }
-//
-//
-//                dto.setCanPartitaMagBeChanged(false);
-//                dto.setCanDataScadBeChanged(false);
-//
-//            }
 
             DialogInputQuantity.makeBase(this, dto, false,  (quantityDTO, closeUL) -> {
                 onOrdineRowDispatched(item, quantityDTO, closeUL);
@@ -351,7 +310,8 @@ public class PickingResiActivity extends BaseActivity implements IOnColloClosedC
                 .setSerDoc(item.getSerDoc())
                 .setNumDoc(item.getNumDoc())
                 .setDataDoc(item.getDataDocS())
-                .setIdRigaDoc(item.getIdRiga());
+                .setIdRigaDoc(item.getIdRiga())
+                .setCodJcom(item.getCodJcom());
 
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java
index a7a04440..b86ef60e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java
@@ -36,9 +36,9 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
 
     private RunnableArgs<DocumentoResoDTO> mOnSelectionChanged;
 
-    private TextDrawable.IShapeBuilder smallIconBuilder;
-    private TextDrawable.IShapeBuilder mediumIconBuilder;
-    private TextDrawable.IShapeBuilder largeIconBuilder;
+//    private TextDrawable.IShapeBuilder smallIconBuilder;
+//    private TextDrawable.IShapeBuilder mediumIconBuilder;
+//    private TextDrawable.IShapeBuilder largeIconBuilder;
 
     @Override
     public String getSectionTitle(int position) {
@@ -95,34 +95,34 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
                     for(int i = 0; i < count; i++) this.mSectionTitleItems.add(String.valueOf(x.charAt(0)));
                 });
 
-        long count = Stream.of(dataset)
-                .filter(x -> UtilityString.isNullOrEmpty(x.getRagSoc()))
-                .count();
+//        long count = Stream.of(dataset)
+//                .filter(x -> UtilityString.isNullOrEmpty(x.getRagSoc()))
+//                .count();
 
 
-        smallIconBuilder = TextDrawable.builder()
-                .beginConfig()
-                .width(40)
-                .height(40)
-                .fontSize(24)
-                .useFont(ResourcesCompat.getFont(mContext, R.font.google_sans_regular))
-                .endConfig();
-
-        mediumIconBuilder = TextDrawable.builder()
-                .beginConfig()
-                .width(40)
-                .height(40)
-                .fontSize(20)
-                .useFont(ResourcesCompat.getFont(mContext, R.font.google_sans_regular))
-                .endConfig();
-
-        largeIconBuilder = TextDrawable.builder()
-                .beginConfig()
-                .width(40)
-                .height(40)
-                .fontSize(16)
-                .useFont(ResourcesCompat.getFont(mContext, R.font.google_sans_regular))
-                .endConfig();
+//        smallIconBuilder = TextDrawable.builder()
+//                .beginConfig()
+//                .width(40)
+//                .height(40)
+//                .fontSize(24)
+//                .useFont(ResourcesCompat.getFont(mContext, R.font.google_sans_regular))
+//                .endConfig();
+//
+//        mediumIconBuilder = TextDrawable.builder()
+//                .beginConfig()
+//                .width(40)
+//                .height(40)
+//                .fontSize(20)
+//                .useFont(ResourcesCompat.getFont(mContext, R.font.google_sans_regular))
+//                .endConfig();
+//
+//        largeIconBuilder = TextDrawable.builder()
+//                .beginConfig()
+//                .width(40)
+//                .height(40)
+//                .fontSize(16)
+//                .useFont(ResourcesCompat.getFont(mContext, R.font.google_sans_regular))
+//                .endConfig();
 
     }
 
@@ -151,15 +151,17 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
             holder.mBinding.subDescriptionMain.setText(String.format(mContext.getText(R.string.shipped_on).toString(), UtilityDate.formatDate(consegna.getDataInizTraspD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)));
         }
 
-        String numDoc = "" + consegna.getNumDoc();
+        holder.mBinding.badge1.setText(String.valueOf(consegna.getNumDoc()));
 
-        if(numDoc.length() <= 2) {
-            holder.mBinding.startIcon.setImageDrawable(smallIconBuilder.buildRound(numDoc, ContextCompat.getColor(mContext, R.color.colorPrimary)));
-        } else if(numDoc.length() == 3) {
-            holder.mBinding.startIcon.setImageDrawable(mediumIconBuilder.buildRound(numDoc, ContextCompat.getColor(mContext, R.color.colorPrimary)));
-        } else if(numDoc.length() == 4) {
-            holder.mBinding.startIcon.setImageDrawable(largeIconBuilder.buildRound(numDoc, ContextCompat.getColor(mContext, R.color.colorPrimary)));
-        }
+//        String numDoc = "" + consegna.getNumDoc();
+
+//        if(numDoc.length() <= 2) {
+//            holder.mBinding.startIcon.setImageDrawable(smallIconBuilder.buildRound(numDoc, ContextCompat.getColor(mContext, R.color.colorPrimary)));
+//        } else if(numDoc.length() == 3) {
+//            holder.mBinding.startIcon.setImageDrawable(mediumIconBuilder.buildRound(numDoc, ContextCompat.getColor(mContext, R.color.colorPrimary)));
+//        } else if(numDoc.length() == 4) {
+//            holder.mBinding.startIcon.setImageDrawable(largeIconBuilder.buildRound(numDoc, ContextCompat.getColor(mContext, R.color.colorPrimary)));
+//        }
 
         try {
             Calendar calendarNow = UtilityDate.getCalendarInstance();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java
index 42743606..8e5ced20 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java
@@ -72,6 +72,8 @@ public class VersamentoMerceViewModel {
                 ((IPoppableActivity)mContext).pop();
             } else if((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(+1)){
                 setMtbColt(mtbColt);
+            } else if(mtbColt.getGestioneEnum() == GestioneEnum.VENDITA && mtbColt.getSegno().equals(+1)){
+                setMtbColt(mtbColt);
             } else {
                 DialogSimpleMessageHelper.makeWarningDialog(mContext,
                         new SpannableString(Html.fromHtml("Sono accettate solamente UL di <b>Acquisto</b> o <b>Lavorazione</b> di <b>CARICO</b>")),
@@ -305,6 +307,10 @@ public class VersamentoMerceViewModel {
                                     .setDataColloRif(cloneMtbColr.getDataColloS());
                         }
 
+                        if(sourceMtbColt.getGestioneEnum() == GestioneEnum.VENDITA && sourceMtbColt.getSegno() == +1){
+                            cloneMtbColr.setCodJcom(null);
+                        }
+
                         cloneMtbColr
                                 .setGestione((String) null)
                                 .setSerCollo(null)
diff --git a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_header.xml b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_header.xml
index ec125d50..6cc42a8f 100644
--- a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_header.xml
+++ b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_header.xml
@@ -9,42 +9,22 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:layout_marginEnd="6dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="8dp"
-        app:cardElevation="2dp"
-        app:cardCornerRadius="4dp">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:background="@color/colorAccent">
+            style="@style/AppTheme.NewMaterial.Text.ListDivider"
+            android:layout_marginStart="14dp"
+            android:layout_marginEnd="14dp"
+            android:layout_marginTop="14dp"
+            android:textAllCaps="true"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textStyle="bold"
+            android:textColor="@color/colorAccent"
+            tools:text="Title here"/>
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/AppTheme.NewMaterial.Text.ListDivider"
-                android:textAllCaps="true"
-                android:layout_centerVertical="true"
-                android:layout_alignParentStart="true"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textStyle="bold"
-                android:textColor="@android:color/white"
-                tools:text="Title here"/>
-
-
-        </RelativeLayout>
-    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml
index fdce7099..c6968e21 100644
--- a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml
+++ b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml
@@ -8,31 +8,36 @@
             type="it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO" />
     </data>
 
-    <LinearLayout
+    <RelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
-        android:layout_marginStart="4dp"
+        android:layout_marginStart="12dp"
         android:layout_marginBottom="4dp"
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:orientation="horizontal"
         android:background="@drawable/bg_checked_layout"
         app:backgroundTintResID="@{consegna.selected.get() ? R.color.bg_checked_layout : android.R.color.transparent}" >
 
-        <ImageView
-            android:id="@+id/start_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp">
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/badge1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="BADGE 1"
+                android:background="@drawable/badge1_round_corner"
+                android:textColor="@android:color/white"
+                android:paddingTop="2dp"
+                android:paddingBottom="2dp"
+                android:paddingLeft="6dp"
+                android:paddingRight="6dp"
+                android:textStyle="bold"/>
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/description_main"
@@ -42,6 +47,8 @@
                 style="@android:style/TextAppearance.Small"
                 android:layout_marginEnd="4dp"
                 android:layout_toStartOf="@id/date"
+                android:layout_toEndOf="@id/badge1"
+                android:layout_marginStart="4dp"
                 android:ellipsize="end"
                 android:singleLine="true"
                 tools:text="TITLE"/>
@@ -58,16 +65,16 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/sub_description_main"
+                style="@android:style/TextAppearance.Small"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@android:style/TextAppearance.Small"
+                android:layout_below="@id/description_main"
                 android:layout_marginTop="4dp"
                 android:layout_marginEnd="4dp"
                 android:layout_toStartOf="@id/compilato_da"
-                android:layout_below="@id/description_main"
-                android:singleLine="true"
                 android:ellipsize="end"
-                tools:text="SUB TITLE"/>
+                android:singleLine="true"
+                tools:text="SUB TITLE" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/compilato_da"
@@ -80,7 +87,6 @@
                 android:textSize="12sp"
                 tools:text="Nome Cognome"/>
 
-        </RelativeLayout>
-    </LinearLayout>
+    </RelativeLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_header.xml b/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_header.xml
index 1ee93afe..52551ab1 100644
--- a/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_header.xml
+++ b/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_header.xml
@@ -9,42 +9,21 @@
         android:orientation="vertical" android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.cardview.widget.CardView
-            android:layout_width="match_parent"
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="8dp"
-            app:cardElevation="2dp"
-            app:cardCornerRadius="4dp">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:background="@color/colorAccent">
-
-                <TextView
-                    android:id="@+id/title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AppTheme.NewMaterial.Text.ListDivider"
-                    android:textAllCaps="true"
-                    android:layout_centerVertical="true"
-                    android:layout_alignParentStart="true"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:textStyle="bold"
-                    android:textColor="@android:color/white"
-                    tools:text="Title here"/>
-
-
-            </RelativeLayout>
-        </androidx.cardview.widget.CardView>
+            style="@style/AppTheme.NewMaterial.Text.ListDivider"
+            android:layout_marginStart="14dp"
+            android:layout_marginEnd="14dp"
+            android:layout_marginTop="14dp"
+            android:textAllCaps="true"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textStyle="bold"
+            android:textColor="@color/colorAccent"
+            tools:text="Title here"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_single_item.xml b/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_single_item.xml
index 40531216..462bbc24 100644
--- a/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_single_item.xml
+++ b/app/src/main/res/layout/fragment_ultime_consegne_fornitore__list_single_item.xml
@@ -8,7 +8,7 @@
             type="it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO" />
     </data>
 
-    <LinearLayout
+    <RelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
@@ -20,20 +20,16 @@
         android:paddingEnd="8dp"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:orientation="horizontal"
         android:background="@drawable/bg_checked_layout"
         app:backgroundTintResID="@{consegna.selected.get() ? R.color.bg_checked_layout : android.R.color.transparent}" >
 
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
 
             <TextView
                 android:id="@+id/badge1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="BADGE 1"
+                tools:text="BADGE 1"
                 android:background="@drawable/badge1_round_corner"
                 android:textColor="@android:color/white"
                 android:paddingTop="2dp"
@@ -61,6 +57,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/AppTheme.NewMaterial.Text"
+                android:layout_toEndOf="@id/badge1"
+                android:textAlignment="textEnd"
                 android:textColor="@color/colorPrimaryGray"
                 android:layout_alignParentEnd="true"
                 android:textSize="14sp"
@@ -77,7 +75,6 @@
                 android:textSize="12sp"
                 tools:text="Nome Cognome"/>
 
-        </RelativeLayout>
-    </LinearLayout>
+    </RelativeLayout>
 
 </layout>
\ No newline at end of file