Finish v1_7_1(78)

.idea/codeStyles/Project.xml

@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/runConfigurations/app.xml

@@ -6,7 +6,7 @@
     <option name="DEPLOY_AS_INSTANT" value="false" />
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic_ime,dynamic_vgalimenti" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />

app/build.gradle

@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 77
+    def appVersionCode = 78
-    def appVersionName = '1.7.0'
+    def appVersionName = '1.7.1'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/MainActivity.java

@@ -335,7 +335,7 @@ public class MainActivity extends AppCompatActivity
 
                     }, ex -> {
                         //mNoConnectionLayout.expand(true);
-                        if(!mIsOnline) mIsOnline = false;
+                        if(mIsOnline) mIsOnline = false;
                     }
                 );
 

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

@@ -59,6 +59,7 @@ public class MtbColt extends EntityBase {
     public List<MtbCols> mtbCols;
 
     private Boolean disablePrint;
+    private String ragSocCliente;
 
     public void generaFiltroOrdine() throws Exception {
 
@@ -100,11 +101,13 @@ public class MtbColt extends EntityBase {
         setSerCollo("/");
     }
 
-    public void initDefaultFields() {
+    public MtbColt initDefaultFields() {
         setCodMdep(SettingsManager.i().userSession.depo.getCodMdep());
         setPreparatoDa(SettingsManager.i().user.fullname);
         setOraInizPrep(UtilityDate.getDateInstance());
         setCodAnag(SettingsManager.iDB().getDefaultCodAnag());
+
+        return this;
     }
 
 
@@ -470,6 +473,15 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
+    public String getRagSocCliente() {
+        return ragSocCliente;
+    }
+
+    public MtbColt setRagSocCliente(String ragSocCliente) {
+        this.ragSocCliente = ragSocCliente;
+        return this;
+    }
+
     public void generaFiltroOrdineFromDTO(List<FiltroOrdineDTO> filtroOrdineDtos) {
 
         String xmlPrefix = "{\"whereCond\": \"";

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java

@@ -72,7 +72,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer{
             public void onFailed(Exception ex) {
                 if(onFailed != null) onFailed.run(ex);
             }
-        }, true);
+        }, true, MtbColt.class);
 
     }
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java

@@ -58,7 +58,7 @@ public class EntityRESTConsumer {
 
     }
 
-    public static <T extends EntityBase> void processEntityList(List<T> entitiesToSave, final ISimpleOperationCallback<List<T>> callback, boolean singleTransaction){
+    public static <T extends EntityBase> void processEntityList(List<T> entitiesToSave, final ISimpleOperationCallback<List<T>> callback, boolean singleTransaction, Class<T> type){
 
         EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class);
         Call<List<ServiceRESTResponse<JsonObject>>> request = service.processEntityList(singleTransaction, entitiesToSave);
@@ -71,12 +71,13 @@ public class EntityRESTConsumer {
 
                         ArrayList<T> responseList = new ArrayList<>();
                         Gson gson = new Gson();
-                        Type typeOfObjectsList = new TypeToken<T>() {}.getType();
+//                        Type typeOfObjectsList = new TypeToken<T>() {}.getType();
 
                         for(ServiceRESTResponse<JsonObject> jsonSingleObject : response.body()) {
 
                             if (jsonSingleObject.getEsito() == EsitoType.OK) {
-                                responseList.add(gson.fromJson(jsonSingleObject.getEntity(), typeOfObjectsList));
+                                String jsonText = gson.toJson(jsonSingleObject.getEntity());
+                                responseList.add(gson.fromJson(jsonText, type));
                             } else {
                                 Log.e("EntityRESTConsumer", jsonSingleObject.getErrorMessage());
                                 callback.onFailed(new Exception(jsonSingleObject.getErrorMessage()));

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java

@@ -4,6 +4,7 @@ import android.util.Log;
 
 import java.util.List;
 
+import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.exception.printer.PrinterNotFoundException;
@@ -92,6 +93,11 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
 
     public static void printCollo(String printerName, MtbColt testataColloToPrint, int quantity, String reportName, Runnable onComplete, RunnableArgs<Exception> onFailed) {
 
+        if(BuildConfig.DEBUG) {
+            onComplete.run();
+            return;
+        }
+
         if(UtilityString.isNullOrEmpty(printerName)) {
             onFailed.run(new Exception("Nessuna stampante configurata: valore null"));
             return;

app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java

@@ -39,8 +39,6 @@ public class SettingsManager {
             //settingsModelIstance.user = new SettingsModel.User();
             //settingsModelIstance.userSession = new SettingsModel.UserSession();
 
-            dbSettingsModelIstance = new DBSettingsModel();
-
             firstStart = true;
         }
 

app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java

@@ -33,6 +33,7 @@ public class SettingsModel {
     public static class UserSession {
         public String profileDB;
         public AvailableCodMdepsDTO depo;
+        public Integer defaultOrdinamentoPickingAccettazione = 0;
 //        public String codMdep;
     }
 

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java

@@ -20,8 +20,8 @@ public class UtilityDate {
         public static final String DMY_SLASH = "dd/MM/yyyy";
         public static final String YMD_SLASH = "yyyy/MM/dd";
         public static final String YMD_DASH = "yyyy-MM-dd";
-        public static final String DMY_TIME_SLASH = DMY_SLASH + " hh:mm:ss";
+        public static final String DMY_TIME_SLASH = DMY_SLASH + " HH:mm:ss";
-        public static final String YMD_TIME_SLASH = YMD_SLASH + " hh:mm:ss";
+        public static final String YMD_TIME_SLASH = YMD_SLASH + " HH:mm:ss";
 
 
         public static final String DM_HUMAN = "dd MMM";
@@ -78,7 +78,7 @@ public class UtilityDate {
             format = new SimpleDateFormat(dateFormatString);
         }
 
-        format.setTimeZone(TimeZone.getTimeZone("Europe/Rome"));
+        //format.setTimeZone(TimeZone.getTimeZone("GMT"));
 
         return format.parse(dateString);
     }
@@ -87,7 +87,7 @@ public class UtilityDate {
     public static String formatDate(Date dateToFormat, String format) {
         if(dateToFormat != null) {
             SimpleDateFormat sdf = new SimpleDateFormat(format);
-            sdf.setTimeZone(TimeZone.getTimeZone("Europe/Rome"));
+            //sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
             return sdf.format(dateToFormat);
         }
         else return null;
@@ -99,6 +99,6 @@ public class UtilityDate {
     }
 
     public static Calendar getCalendarInstance() {
-        return Calendar.getInstance(TimeZone.getTimeZone("Europe/Rome"));
+        return Calendar.getInstance();
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java

@@ -90,6 +90,9 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
     }
 
     private void init(){
+
+        currentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(SettingsManager.i().userSession.defaultOrdinamentoPickingAccettazione);
+
         mArticoliInColloBottomSheetViewModel.setOnCloseColloCallbackListener(this);
         mArticoliInColloBottomSheetViewModel.setOnItemDeletedCallback(this::onRowDeleted);
         mArticoliInColloBottomSheetViewModel.setOnItemEditedCallback(this::onRowEdited);
@@ -413,7 +416,10 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
 
         AlertDialog dialog = new AlertDialog.Builder(mActivity)
                 .setTitle(mActivity.getText(R.string.action_orderBy))
-                .setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, currentOrderBy.getVal(), (dialog12, which) -> currentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(which))
+                .setSingleChoiceItems(AccettazioneOrdineInevasoOrderBy.descriptions, currentOrderBy.getVal(), (dialog12, which) ->  {
+                    currentOrderBy = AccettazioneOrdineInevasoOrderBy.Enum.fromInt(which);
+                    SettingsManager.i().userSession.defaultOrdinamentoPickingAccettazione = which;
+                })
                 .setPositiveButton("Ok", (dialog1, which) -> refreshOrderBy(false))
                 .create();
         dialog.show();
@@ -766,7 +772,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
 
     private void postCloseOperations(Runnable onComplete) {
 
-        MtbColt mtbColt = (MtbColt) mtbColtOfAccettazione.clone();
+        MtbColt mtbColt = (MtbColt) getColloRef().clone();
 
         resetUL();
 
@@ -779,16 +785,35 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
 
                 if(currentRow.getRigaOrd() != null) {
 
-                    Stream.of(this.groupedOrdini)
+                    for(int k = 0; k < this.groupedOrdini.size(); k++) {
-                            .filter(x ->
+
-                                    x.getQtaDaEvadere().floatValue() > 0 &&
+                        OrdineAccettazioneDTO.Riga x = this.groupedOrdini.get(k);
-                                            x.getMtbAart().getCodMart().equalsIgnoreCase(currentRow.getCodMart()) &&
+
-                                            x.getCodJcom().equalsIgnoreCase(currentRow.getCodJcom()) &&
+                        if(x.getQtaDaEvadere().floatValue() > 0 &&
-                                            x.getRigaOrd() == currentRow.getRigaOrd() &&
+                                x.getMtbAart().getCodMart().equalsIgnoreCase(currentRow.getCodMart()) &&
-                                            x.getDataOrdD().equals(currentRow.getDataOrdD()) &&
+                                x.getCodJcom().equalsIgnoreCase(currentRow.getCodJcom()) &&
-                                            x.getNumOrd() == currentRow.getNumOrd()
+                                x.getRigaOrd() == currentRow.getRigaOrd() &&
-                            )
+                                x.getDataOrdD().equals(currentRow.getDataOrdD()) &&
-                            .forEach(x -> x.setQtaRiservate(x.getQtaRiservate().add(currentRow.getQtaCol())));
+                                x.getNumOrd() == currentRow.getNumOrd()) {
+
+                            x.setQtaRiservate(x.getQtaRiservate().add(currentRow.getQtaCol()));
+                        }
+
+
+                    }
+
+//                    Stream.of(this.groupedOrdini)
+//                            .filter(x ->
+//                                    x.getQtaDaEvadere().floatValue() > 0 &&
+//                                            x.getMtbAart().getCodMart().equalsIgnoreCase(currentRow.getCodMart()) &&
+//                                            x.getCodJcom().equalsIgnoreCase(currentRow.getCodJcom()) &&
+//                                            x.getRigaOrd() == currentRow.getRigaOrd() &&
+//                                            x.getDataOrdD().equals(currentRow.getDataOrdD()) &&
+//                                            x.getNumOrd() == currentRow.getNumOrd()
+//                            )
+//                            .forEach(x -> {
+//                                x.setQtaRiservate(x.getQtaRiservate().add(currentRow.getQtaCol()));
+//                            });
 
                 }
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java

@@ -66,8 +66,6 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr
             ((IPoppableActivity) getActivity()).pop();
         });
 
-//        mViewmodel.openLU();
-
     }
 
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java

@@ -13,6 +13,7 @@ import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.ProdRecuperoMaterialeListHeaderBinding;
 import it.integry.integrywmsnative.databinding.ProdRecuperoMaterialeListItemBinding;
@@ -28,6 +29,8 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter<HistoryU
     private List<HistoryVersamentoProdUL> mDataset;
 
 
+    private RunnableArgs<HistoryVersamentoProdUL> mOnItemClicked;
+
     static class SubheaderHolder extends RecyclerView.ViewHolder {
 
         ProdRecuperoMaterialeListHeaderBinding binding;
@@ -57,10 +60,13 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter<HistoryU
         mDataset = orderItems(myDataset);
     }
 
+    public void setOnItemClicked(RunnableArgs<HistoryVersamentoProdUL> onItemClicked) {
+        this.mOnItemClicked = onItemClicked;
+    }
+
     public void updateItems(List<HistoryVersamentoProdUL> updatedDataset) {
         mDataset.clear();
         mDataset.addAll(orderItems(updatedDataset));
-        notifyDataSetChanged();
         notifyDataChanged();
     }
 
@@ -112,7 +118,7 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter<HistoryU
 
 
         holder.binding.getRoot().setOnClickListener(v -> {
-
+            if(this.mOnItemClicked != null) this.mOnItemClicked.run(ul);
         });
 
 
@@ -136,5 +142,4 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter<HistoryU
     }
 
 
-
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java

@@ -2,12 +2,15 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.core;
 
 import android.content.Context;
 
+import com.annimon.stream.Stream;
 import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
+import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -30,6 +33,7 @@ public class ProdRecuperoMaterialeHelper {
                 "mtb_colr.gestione, " +
                 "mtb_colr.data_collo, " +
                 "mtb_colr.num_collo, " +
+                "mtb_colr.ser_collo, " +
                 "mtb_colr.cod_mart, " +
                 "mtb_colr.cod_col, " +
                 "mtb_colr.cod_tagl, " +
@@ -58,6 +62,7 @@ public class ProdRecuperoMaterialeHelper {
                 "mtb_colr.gestione, " +
                 "mtb_colr.data_collo, " +
                 "mtb_colr.num_collo, " +
+                "mtb_colr.ser_collo, " +
                 "mtb_colr.cod_mart, " +
                 "mtb_colr.cod_col, " +
                 "mtb_colr.cod_tagl, " +
@@ -73,8 +78,42 @@ public class ProdRecuperoMaterialeHelper {
         Type typeOfObjectsList = new TypeToken<ArrayList<HistoryVersamentoProdUL>>() {}.getType();
         SystemRESTConsumer.processSql(sql, typeOfObjectsList, new ISimpleOperationCallback<List<HistoryVersamentoProdUL>>() {
             @Override
-            public void onSuccess(List<HistoryVersamentoProdUL> value) {
+            public void onSuccess(List<HistoryVersamentoProdUL> ulList) {
-                onComplete.run(value);
+
+                if(ulList != null && ulList.size() > 0){
+                    List<String> codMarts = Stream.of(ulList)
+                            .map(HistoryVersamentoProdUL::getCodMart)
+                            .withoutNulls()
+                            .distinct()
+                            .toList();
+
+                    ArticoloRESTConsumer.getByCodMart(codMarts, arts -> {
+
+                        if(arts != null && arts.size() > 0) {
+                            for (HistoryVersamentoProdUL value : ulList) {
+
+                                MtbAart foundMtbAart = null;
+
+                                List<MtbAart> mtbAartStream = Stream.of(arts)
+                                        .filter(x -> x.getCodMart().equalsIgnoreCase(value.getCodMart())).toList();
+
+                                if(mtbAartStream != null && mtbAartStream.size() > 0){
+                                    foundMtbAart = mtbAartStream.get(0);
+                                }
+
+                                value.setMtbAart(foundMtbAart);
+                            }
+
+
+                            onComplete.run(ulList);
+                        }
+
+                    }, onFailed);
+
+                } else {
+                    onComplete.run(ulList);
+                }
+
             }
 
             @Override

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdUL.java

@@ -2,11 +2,14 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.dto;
 
 import java.math.BigDecimal;
 
+import it.integry.integrywmsnative.core.model.MtbAart;
+
 public class HistoryVersamentoProdUL {
 
 
     private String gestione;
     private String dataCollo;
+    private String serCollo;
     private Integer numCollo;
     private String segno;
     private String codMart;
@@ -22,6 +25,8 @@ public class HistoryVersamentoProdUL {
     private String descrizioneArt;
     private String untMis;
 
+    private MtbAart mtbAart;
+
     public String getGestione() {
         return gestione;
     }
@@ -40,6 +45,15 @@ public class HistoryVersamentoProdUL {
         return this;
     }
 
+    public String getSerCollo() {
+        return serCollo;
+    }
+
+    public HistoryVersamentoProdUL setSerCollo(String serCollo) {
+        this.serCollo = serCollo;
+        return this;
+    }
+
     public Integer getNumCollo() {
         return numCollo;
     }
@@ -165,4 +179,13 @@ public class HistoryVersamentoProdUL {
         this.untMis = untMis;
         return this;
     }
+
+    public MtbAart getMtbAart() {
+        return mtbAart;
+    }
+
+    public HistoryVersamentoProdUL setMtbAart(MtbAart mtbAart) {
+        this.mtbAart = mtbAart;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java

@@ -6,18 +6,33 @@ import android.content.Context;
 import android.text.Html;
 import android.text.SpannableString;
 
+import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableField;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.tfb.fbtoast.FBToast;
+
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
+import it.integry.integrywmsnative.core.model.CommonModelConsts;
+import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.report.ReportManager;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.Ean128Model;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.core.utility.UtilityLogger;
 import it.integry.integrywmsnative.core.utility.UtilityPosizione;
 import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.core.utility.UtilityString;
@@ -26,7 +41,10 @@ import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.HistoryULsL
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.ProdRecuperoMaterialeHelper;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdUL;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.views.InputQuantityToReturnDialog;
+import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
+import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU;
 
 public class ProdRecuperoMaterialeViewModel {
@@ -39,6 +57,7 @@ public class ProdRecuperoMaterialeViewModel {
 
 
     private HistoryULsListAdapter mAdapter;
+    private List<HistoryVersamentoProdUL> mDataset;
 
     public ObservableField<MtbColt> mtbColt = new ObservableField<>();
 
@@ -49,15 +68,8 @@ public class ProdRecuperoMaterialeViewModel {
         mHelper = helper;
         mOnRecuperoCompleted = onRecuperoCompleted;
 
-        ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
+        initRecyclerView();
-
+        refreshAdapter();
-        mHelper.loadLastULVersate(historyULs -> {
-            progressDialog.dismiss();
-            initRecyclerView(historyULs);
-        }, ex -> {
-            UtilityExceptions.defaultException(mContext, ex, progressDialog);
-            BarcodeManager.enable();
-        });
     }
 
     public void openLU() {
@@ -75,7 +87,7 @@ public class ProdRecuperoMaterialeViewModel {
 
                     } else {
                         setMtbColt(mtbColt);
-                        chooseQuantityToReturn();
+//                        chooseQuantityToReturn();
                     }
 
                 } else {
@@ -93,10 +105,8 @@ public class ProdRecuperoMaterialeViewModel {
     }
 
 
-    private void chooseQuantityToReturn() {
+    private void chooseQuantityToReturn(MtbAart mtbAart, BigDecimal min, BigDecimal max) {
-        InputQuantityToReturnDialog.make(mContext, mtbColt.get().getMtbColr().get(0).getMtbAart(), BigDecimal.ZERO, BigDecimal.ONE, data -> {
 
-        }).show();
     }
 
 
@@ -105,29 +115,165 @@ public class ProdRecuperoMaterialeViewModel {
         this.mtbColt.set(mtbColt);
     }
 
-    public void resetMtbColt() {
-        this.mtbColt.set(null);
-        openLU();
-    }
-
-
-    private void showDataSavedDialog(Runnable onPositiveClick) {
-
-        DialogSimpleMessageHelper.makeSuccessDialog(
-                mContext,
-                mContext.getResources().getString(R.string.completed),
-                new SpannableString(mContext.getResources().getString(R.string.data_saved)),
-                null, onPositiveClick).show();
-
-    }
 
 
 
-    private void initRecyclerView(List<HistoryVersamentoProdUL> historyULs) {
+    private void initRecyclerView() {
-        mAdapter = new HistoryULsListAdapter(mContext, historyULs);
+        mAdapter = new HistoryULsListAdapter(mContext, new ArrayList<>());
+        mAdapter.setOnItemClicked(this::onListItemClicked);
 
         mBinding.prodRecuperoMaterialeMainList.setLayoutManager(new LinearLayoutManager(mContext));
         mBinding.prodRecuperoMaterialeMainList.setAdapter(mAdapter);
     }
 
+    private void onListItemClicked(HistoryVersamentoProdUL item) {
+        BigDecimal qtaDaEvadere = BigDecimal.ZERO;
+
+        qtaDaEvadere = qtaDaEvadere.add(item.getQtaCol());
+
+
+        InputQuantityToReturnDialog.make(mContext, item.getMtbAart(), BigDecimal.ONE, qtaDaEvadere, quantity -> {
+            onItemDispatched(item, quantity);
+        }).show();
+
+    }
+
+    private void onItemDispatched(HistoryVersamentoProdUL item, BigDecimal quantity) {
+
+        final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mContext);
+
+        final MtbColt mtbColtCarico = new MtbColt()
+                .initDefaultFields()
+                .setGestione(GestioneEnum.LAVORAZIONE)
+                .setSegno(+1)
+                .setMtbColr(new ObservableArrayList<>());
+        mtbColtCarico
+                .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
+
+        final MtbColr mtbColrCarico = new MtbColr()
+                .setCodMart(item.getCodMart())
+                .setPartitaMag(UtilityString.empty2null(item.getPartitaMag()))
+                .setQtaCol(quantity)
+                .setDescrizione(UtilityString.isNullOrEmpty(item.getMtbAart().getDescrizioneEstesa()) ? item.getMtbAart().getDescrizione() : item.getMtbAart().getDescrizioneEstesa())
+                .setDatetimeRow(UtilityDate.getDateInstance());
+
+
+        mtbColtCarico.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
+        mtbColtCarico.getMtbColr().add(mtbColrCarico);
+
+
+
+        final MtbColt mtbColtScarico = new MtbColt()
+                .setDataCollo(item.getDataCollo())
+                .setSerCollo(item.getSerCollo())
+                .setNumCollo(item.getNumCollo())
+                .setGestione(item.getGestione())
+                .setMtbColr(new ObservableArrayList<>());
+        mtbColtScarico
+                .setOperation(CommonModelConsts.OPERATION.NO_OP);
+
+        final MtbColr mtbColrScarico = new MtbColr()
+                .setCodMart(item.getCodMart())
+                .setPartitaMag(UtilityString.empty2null(item.getPartitaMag()))
+                .setQtaCol(quantity.multiply(new BigDecimal(-1)))
+                .setDescrizione(UtilityString.isNullOrEmpty(item.getMtbAart().getDescrizioneEstesa()) ? item.getMtbAart().getDescrizione() : item.getMtbAart().getDescrizioneEstesa())
+                .setDatetimeRow(UtilityDate.getDateInstance());
+
+
+
+        mtbColtScarico.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
+        mtbColtScarico.getMtbColr().add(mtbColrScarico);
+
+        List<MtbColt> colliToSave = new ArrayList<>();
+        colliToSave.add(mtbColtCarico);
+        colliToSave.add(mtbColtScarico);
+
+        ColliMagazzinoRESTConsumer.saveColli(colliToSave, value -> {
+
+            FBToast.successToast(mContext, mContext.getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+
+            printCollo(progress, value.get(0), () -> {
+                this.refreshAdapter();
+                mOnRecuperoCompleted.run();
+            });
+
+        }, ex -> {
+            UtilityExceptions.defaultException(mContext, ex, progress);
+        });
+
+    }
+
+
+    private void printCollo(ProgressDialog progress, MtbColt mtbColtToPrint, Runnable onComplete) {
+        DialogAskShouldPrint.make(mContext, "Packing List", shouldPrint -> {
+
+            if(shouldPrint) {
+                PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, printerList -> {
+
+                    if (printerList.size() > 0) {
+                        try {
+                            singlePrint(mtbColtToPrint, printerList.get(0), () -> {
+                                onComplete.run();
+                                progress.dismiss();
+                            }, ex -> {
+                                progress.dismiss();
+                                String errorMessage = ex.getMessage();
+                                DialogSimpleMessageHelper.makeErrorDialog(
+                                        mContext,
+                                        new SpannableString(errorMessage),
+                                        null,
+                                        null,
+                                        R.string.button_ignore_print,
+                                        onComplete).show();
+                            });
+
+                        } catch (Exception ex) {
+                            UtilityExceptions.defaultException(mContext, ex, progress);
+                            onComplete.run();
+                        }
+                    } else {
+                        progress.dismiss();
+                        String errorMessage = "Nessuna stampante configurata";
+                        DialogSimpleMessageHelper.makeWarningDialog(mContext, new SpannableString(errorMessage), null, onComplete).show();
+                    }
+                }, ex -> {
+                    UtilityExceptions.defaultException(mContext, ex, progress);
+                });
+            } else {
+                onComplete.run();
+                progress.dismiss();
+            }
+        }).show();
+    }
+
+
+
+    private void singlePrint(MtbColt mtbColtToPrint, String printerName, Runnable onComplete, RunnableArgs<Exception> onAbort) {
+        ReportManager.getRightReportNameByGestione(mtbColtToPrint.getGestioneEnum(), reportName -> {
+
+            PrinterRESTConsumer.printCollo(
+                    printerName,
+                    mtbColtToPrint,
+                    1,
+                    reportName, onComplete, onAbort);
+
+        }, onAbort);
+    }
+
+
+
+    private void refreshAdapter() {
+        ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
+
+        mHelper.loadLastULVersate(historyULs -> {
+            this.mDataset = historyULs;
+            progressDialog.dismiss();
+
+            this.mAdapter.updateItems(this.mDataset);
+        }, ex -> {
+            UtilityExceptions.defaultException(mContext, ex, progressDialog);
+            BarcodeManager.enable();
+        });
+
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java

@@ -5,12 +5,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.core.content.ContextCompat;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.amulyakhare.textdrawable.TextDrawable;
 import com.annimon.stream.Stream;
 import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter;
 

app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.gest.vendita.core;
 import android.content.Context;
 import android.text.Html;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.core.content.res.ResourcesCompat;
@@ -20,6 +21,7 @@ import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.VenditaMainListGroupModelBinding;
 import it.integry.integrywmsnative.databinding.VenditaMainListModelBinding;
 import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
@@ -71,7 +73,7 @@ public class MainListVenditaAdapter extends SectionedRecyclerViewAdapter<MainLis
 
     private List<OrdineVenditaInevasoDTO> orderItems(List<OrdineVenditaInevasoDTO> dataset) {
         return Stream.of(dataset)
-                .sortBy(OrdineVenditaInevasoDTO::getRagSocOrd)
+                .sortBy(x -> x.getRagSocOrd() + " - " + x.getDestinatario())
                 .toList();
 
     }
@@ -95,6 +97,14 @@ public class MainListVenditaAdapter extends SectionedRecyclerViewAdapter<MainLis
     public void onBindSubheaderViewHolder(SubheaderHolder subheaderHolder, int nextItemPosition) {
         subheaderHolder.binding.venditaMainListGroupHeader.setText(mDataset.get(nextItemPosition).getRagSocOrd());
 
+        if(!UtilityString.isNullOrEmpty(mDataset.get(nextItemPosition).getDestinatario())) {
+            subheaderHolder.binding.venditaMainListGroupSubheader.setVisibility(View.VISIBLE);
+            subheaderHolder.binding.venditaMainListGroupSubheader.setText(mDataset.get(nextItemPosition).getDestinatario());
+        } else {
+            subheaderHolder.binding.venditaMainListGroupSubheader.setVisibility(View.GONE);
+        }
+
+
         subheaderHolder.binding.getRoot().setOnClickListener(v -> {
 
             boolean anySelected = Stream.of(mDataset)
@@ -159,7 +169,8 @@ public class MainListVenditaAdapter extends SectionedRecyclerViewAdapter<MainLis
 
     @Override
     public boolean onPlaceSubheaderBetweenItems(int position) {
-        return !this.mDataset.get(position).getRagSocOrd().equalsIgnoreCase(this.mDataset.get(position + 1).getRagSocOrd());
+        return !this.mDataset.get(position).getRagSocOrd().equalsIgnoreCase(this.mDataset.get(position + 1).getRagSocOrd()) &&
+                !this.mDataset.get(position).getDestinatario().equalsIgnoreCase(this.mDataset.get(position + 1).getDestinatario());
 
     }
 

app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java

@@ -23,7 +23,6 @@ import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.Ean128Model;
@@ -91,6 +90,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
     private String defaultCodMdepOfUL = null;
     private List<FiltroOrdineDTO> defaultFiltroOrdine = new ArrayList<>();
     private String defaultCodAnagOfUL = null;
+    private String defaultRagSocOfUL = null;
     private String defaultRifOrdOfUL = null;
     private Integer defaultNumOrdOfUL = null;
     private Date defaultDataOrdOfUL = null;
@@ -222,6 +222,19 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             }
 
 
+
+            //Definizione del codAnag
+            List<String> foundRagSoc = Stream.of(mTestateOrdini)
+                    .map(OrdineVenditaInevasoDTO::getRagSocOrd)
+//                    .withoutNulls()
+                    .distinctBy(x -> x)
+                    .toList();
+
+            if(foundRagSoc != null && foundRagSoc.size() == 1){
+                defaultRagSocOfUL = foundRagSoc.get(0);
+            }
+
+
             //Definizione del rifOrd
             List<String> foundRifOrd = Stream.of(mTestateOrdini)
                     .map(OrdineVenditaInevasoDTO::getRifOrd)
@@ -837,9 +850,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
         mtbColt.generaFiltroOrdineFromDTO(defaultFiltroOrdine);
 
         ProgressDialog finalProgress = progress;
-        ColliMagazzinoRESTConsumer.saveCollo(mtbColt, new ISimpleOperationCallback<MtbColt>() {
+        ColliMagazzinoRESTConsumer.saveCollo(mtbColt, value -> {
-            @Override
-            public void onSuccess(MtbColt value) {
 
                 mtbColt
                         .setNumCollo(value.getNumCollo())
@@ -848,7 +859,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
 
                 value
                         .setDisablePrint(disablePrint)
-                        .setMtbColr(new ObservableArrayList<>());
+                        .setMtbColr(new ObservableArrayList<>())
+                        .setRagSocCliente(defaultRagSocOfUL);
 
                 setULToCurrentContext(value);
 
@@ -857,13 +869,9 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                 FBToast.successToast(mActivity, mActivity.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT);
 
                 if(onComplete != null) onComplete.run();
-            }
+            }, ex ->{
-
-            @Override
-            public void onFailed(Exception ex) {
                 UtilityExceptions.defaultException(mActivity, ex, finalProgress);
-            }
+            });
-        });
 
     }
 
@@ -1320,9 +1328,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
         cloneMtbColt.setMtbColr(new ObservableArrayList());
         cloneMtbColt.getMtbColr().add(mtbColr);
 
-        ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, new ISimpleOperationCallback<MtbColt>() {
+        ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, value -> {
-            @Override
-            public void onSuccess(MtbColt value) {
 
                 mtbColr
                         .setDataCollo(value.getDataColloS())
@@ -1345,13 +1351,9 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                 progress.dismiss();
 
                 if(closeUL) onColloClosed(null);
-            }
+            }, ex -> {
-
-            @Override
-            public void onFailed(Exception ex) {
                 UtilityExceptions.defaultException(mActivity, ex, progress);
-            }
+            });
-        });
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java

@@ -8,6 +8,11 @@ import androidx.databinding.ObservableField;
 import androidx.databinding.ObservableList;
 import androidx.annotation.NonNull;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.shape.CornerFamily;
+import com.google.android.material.shape.CornerTreatment;
+import com.google.android.material.shape.MaterialShapeDrawable;
+import com.google.android.material.shape.ShapeAppearanceModel;
+
 import androidx.appcompat.app.AppCompatActivity;
 import android.text.SpannableString;
 import android.view.LayoutInflater;
@@ -57,6 +62,14 @@ public class ArticoliInColloBottomSheetViewModel {
 
         mBindings.setViewModel(this);
 
+//        ShapeAppearanceModel shapeAppearanceModel = new ShapeAppearanceModel();
+//
+//        shapeAppearanceModel.setTopLeftCorner(CornerFamily.ROUNDED, 6);
+//        shapeAppearanceModel.setTopRightCorner(CornerFamily.ROUNDED, 6);
+//
+//        MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable(shapeAppearanceModel);
+//        mBindings.getRoot().setBackground(materialShapeDrawable);
+
         mtbColt.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
             @Override
             public void onPropertyChanged(Observable sender, int propertyId) {

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
@@ -43,51 +44,141 @@
             </RelativeLayout>
 
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:paddingTop="24dp"
-                android:paddingLeft="24dp"
+                android:paddingStart="8dp"
-                android:paddingRight="24dp">
+                android:paddingEnd="8dp">
 
-                <TextView
-                    android:id="@+id/title_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/TextViewMaterial.DialogTitle"
-                    android:text="Title here"
-                    android:gravity="center_horizontal"/>
-
-                <TextView
-                    android:id="@+id/description_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/TextViewMaterial"
-                    android:text="Description here"
-                    android:gravity="left"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginBottom="16dp" />
 
 
                 <LinearLayout
-                    android:id="@+id/dialog_content_hashmap"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:paddingLeft="12dp"
+                    android:paddingStart="16dp"
-                    android:paddingRight="12dp"
+                    android:paddingEnd="16dp">
-                    android:layout_marginTop="12dp">
+
+                    <TextView
+                        android:id="@+id/title_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/TextViewMaterial.DialogTitle"
+                        tools:text="Title here"
+                        android:gravity="center_horizontal"/>
+
+                    <TextView
+                        android:id="@+id/description_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/TextViewMaterial"
+                        tools:text="Description here"
+                        android:gravity="left"
+                        android:layout_marginTop="16dp"
+                        android:layout_marginBottom="16dp" />
 
 
+                    <LinearLayout
+                        android:id="@+id/dialog_content_hashmap"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:paddingLeft="12dp"
+                        android:paddingRight="12dp"
+                        android:layout_marginTop="12dp">
+
+
+
+                    </LinearLayout>
+
+
+
+
+
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:visibility="@{viewmodel.negativeVisible &amp;&amp; !viewmodel.neutralVisible ? View.VISIBLE : View.GONE}">
+
+                        <androidx.constraintlayout.widget.Guideline
+                            android:id="@+id/center_guideline"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            app:layout_constraintGuide_percent="0.5"/>
+
+
+                        <com.google.android.material.button.MaterialButton
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            style="@style/Button.PrimaryOutline"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginRight="8dp"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toStartOf="@id/center_guideline"
+                            app:strokeColor="@color/colorPrimary"
+                            android:onClick="@{() -> viewmodel.onNegativeClick()}"
+                            android:text="@string/no"/>
+
+
+                        <com.google.android.material.button.MaterialButton
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            style="@style/Button.PrimaryFull"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginRight="8dp"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintStart_toStartOf="@id/center_guideline"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            android:onClick="@{() -> viewmodel.onPositiveClick()}"
+                            android:text="@string/yes"/>
+
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:visibility="@{!viewmodel.negativeVisible &amp;&amp; !viewmodel.neutralVisible ? View.VISIBLE : View.GONE}">
+
+
+                        <androidx.constraintlayout.widget.Guideline
+                            android:id="@+id/ok_left_buttons_guideline"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            app:layout_constraintGuide_percent="0.25"/>
+
+                        <androidx.constraintlayout.widget.Guideline
+                            android:id="@+id/ok_right_buttons_guideline"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            app:layout_constraintGuide_percent="0.75"/>
+
+                        <com.google.android.material.button.MaterialButton
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            style="@style/Button.PrimaryFull"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginRight="8dp"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintStart_toStartOf="@id/ok_left_buttons_guideline"
+                            app:layout_constraintEnd_toEndOf="@id/ok_right_buttons_guideline"
+                            android:onClick="@{() -> viewmodel.onPositiveClick()}"
+                            android:text="@string/ok"/>
+
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                 </LinearLayout>
 
-
-
-
-
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -151,84 +242,6 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:visibility="@{viewmodel.negativeVisible &amp;&amp; !viewmodel.neutralVisible ? View.VISIBLE : View.GONE}">
-
-                    <androidx.constraintlayout.widget.Guideline
-                        android:id="@+id/center_guideline"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintGuide_percent="0.5"/>
-
-
-                    <com.google.android.material.button.MaterialButton
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        style="@style/Button.PrimaryOutline"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/center_guideline"
-                        app:strokeColor="@color/colorPrimary"
-                        android:onClick="@{() -> viewmodel.onNegativeClick()}"
-                        android:text="@string/no"/>
-
-
-                    <com.google.android.material.button.MaterialButton
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        style="@style/Button.PrimaryFull"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintStart_toStartOf="@id/center_guideline"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        android:onClick="@{() -> viewmodel.onPositiveClick()}"
-                        android:text="@string/yes"/>
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:visibility="@{!viewmodel.negativeVisible &amp;&amp; !viewmodel.neutralVisible ? View.VISIBLE : View.GONE}">
-
-
-                    <androidx.constraintlayout.widget.Guideline
-                        android:id="@+id/ok_left_buttons_guideline"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintGuide_percent="0.25"/>
-
-                    <androidx.constraintlayout.widget.Guideline
-                        android:id="@+id/ok_right_buttons_guideline"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintGuide_percent="0.75"/>
-
-                    <com.google.android.material.button.MaterialButton
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        style="@style/Button.PrimaryFull"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintStart_toStartOf="@id/ok_left_buttons_guideline"
-                        app:layout_constraintEnd_toEndOf="@id/ok_right_buttons_guideline"
-                        android:onClick="@{() -> viewmodel.onPositiveClick()}"
-                        android:text="@string/ok"/>
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
 
             </LinearLayout>
 

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

@@ -54,7 +54,8 @@
                         android:paddingRight="16dp"
                         android:elevation="0dp"
                         android:textAllCaps="true"
-                        android:textSize="16sp"/>
+                        android:textSize="16sp"
+                        style="@style/AppTheme.NewMaterial.Text"/>
 
                     <!--<Button-->
                         <!--android:id="@+id/articoli_in_collo_close_collo"-->
@@ -131,10 +132,11 @@
                             <TextView
                                 android:textColor="@android:color/black"
                                 android:layout_marginTop="10dp"
-                                android:layout_marginLeft="10dp"
+                                android:layout_marginStart="10dp"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/details_text"
+                                style="@style/AppTheme.NewMaterial.Text"
                                 android:textAllCaps="true"
                                 android:textStyle="bold"/>
 
@@ -153,8 +155,7 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:orientation="vertical"
-                                        app:layout_constraintGuide_percent="0.40"
+                                        app:layout_constraintGuide_percent="0.40" />
-                                        app:layout_constraintGuide_begin="100dp" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
                                         android:layout_width="0dp"
@@ -162,19 +163,21 @@
                                         android:layout_marginStart="8dp"
                                         android:text="@string/date_text"
                                         android:textColor="@android:color/black"
-                                        app:layout_constraintEnd_toStartOf="@+id/guideline"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline1"
                                         app:layout_constraintStart_toStartOf="parent" />
 
-                                    <TextView
+                                    <androidx.appcompat.widget.AppCompatTextView
                                         android:id="@+id/articoli_in_collo_details_date"
                                         android:layout_width="0dp"
-                                        android:layout_height="wrap_content"
+                                        android:layout_height="0dp"
-                                        android:layout_marginEnd="0dp"
+                                        app:layout_constraintTop_toTopOf="parent"
-                                        android:layout_marginStart="0dp"
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:text="TextView"
-                                        android:textSize="16sp"
                                         app:layout_constraintStart_toStartOf="@+id/guideline1"
-                                        app:layout_constraintEnd_toEndOf="parent" />
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        tools:text="TextView" />
 
                                 </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -190,24 +193,26 @@
                                         app:layout_constraintGuide_percent="0.40" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
+                                        android:id="@+id/articoli_in_collo_details_posizione"
+                                        app:layout_constraintTop_toTopOf="parent"
                                         android:layout_width="0dp"
                                         android:layout_height="wrap_content"
                                         android:layout_marginStart="8dp"
                                         android:text="@string/position_text"
                                         android:textColor="@android:color/black"
-                                        app:layout_constraintEnd_toStartOf="@+id/guideline"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline2"
                                         app:layout_constraintStart_toStartOf="parent" />
 
-                                    <TextView
+                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:id="@+id/articoli_in_collo_details_posizione"
+                                        app:layout_constraintTop_toTopOf="parent"
                                         android:layout_width="0dp"
-                                        android:layout_height="wrap_content"
+                                        android:layout_height="0dp"
-                                        android:layout_marginEnd="0dp"
-                                        android:layout_marginStart="0dp"
                                         android:text="@{viewModel.mtbColt.posizione}"
-                                        android:textSize="16sp"
+                                        style="@style/AppTheme.NewMaterial"
                                         app:layout_constraintStart_toStartOf="@+id/guideline2"
-                                        app:layout_constraintEnd_toEndOf="parent" />
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        tools:text="TextView" />
 
                                 </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -223,24 +228,59 @@
                                         app:layout_constraintGuide_percent="0.40" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
+                                        app:layout_constraintTop_toTopOf="parent"
                                         android:layout_width="0dp"
                                         android:layout_height="wrap_content"
                                         android:layout_marginStart="8dp"
                                         android:text="@string/prepared_by_text"
                                         android:textColor="@android:color/black"
-                                        app:layout_constraintEnd_toStartOf="@+id/guideline"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline3"
                                         app:layout_constraintStart_toStartOf="parent" />
 
-                                    <TextView
+                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:id="@+id/articoli_in_collo_details_preparatoDa"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:text="@{viewModel.mtbColt.preparatoDa}"
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline3"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        tools:text="TextView" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline4"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        app:layout_constraintTop_toTopOf="parent"
                                         android:layout_width="0dp"
                                         android:layout_height="wrap_content"
-                                        android:layout_marginEnd="0dp"
+                                        android:layout_marginStart="8dp"
-                                        android:layout_marginStart="0dp"
+                                        android:text="@string/customer"
-                                        android:text="@{viewModel.mtbColt.preparatoDa}"
+                                        android:textColor="@android:color/black"
-                                        android:textSize="16sp"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline4"
-                                        app:layout_constraintStart_toStartOf="@+id/guideline3"
+                                        app:layout_constraintStart_toStartOf="parent" />
-                                        app:layout_constraintEnd_toEndOf="parent" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:text="@{viewModel.mtbColt.ragSocCliente}"
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline4"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        tools:text="TextView" />
 
                                 </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -270,7 +310,7 @@
                             <TextView
                                 android:textColor="@android:color/black"
                                 android:layout_marginTop="10dp"
-                                android:layout_marginLeft="10dp"
+                                android:layout_marginStart="10dp"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/already_read_articles"
@@ -305,6 +345,7 @@
                                        android:text="@string/empty_rows_in_mtbcolt"
                                        android:textSize="20sp"
                                        android:gravity="center"
+                                       style="@style/AppTheme.NewMaterial.Text"
                                        android:textColor="@color/empty_view_gray"/>
 
                                </LinearLayout>

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

@@ -33,18 +33,33 @@
                 <CheckBox
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:checked="true"
                     android:enabled="false" />
 
-                <TextView
+                <LinearLayout
-                    android:id="@+id/vendita_main_list_group_header"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@android:color/white"
+                    android:orientation="vertical">
-                    android:textStyle="bold"
-                    style="@android:style/TextAppearance.Medium"
-                    tools:text="NOME GRUPPO"/>
 
+                    <TextView
+                        android:id="@+id/vendita_main_list_group_header"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@android:color/white"
+                        android:textStyle="bold"
+                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        tools:text="NOME GRUPPO"/>
+
+                    <TextView
+                        android:id="@+id/vendita_main_list_group_subheader"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@android:color/white"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        tools:text="SOTTO GRUPPO"/>
+
+                </LinearLayout>
             </LinearLayout>
 
 

app/src/main/res/values-it/strings.xml

@@ -96,6 +96,7 @@
     <string name="date_text">Data</string>
     <string name="position_text">Posizione</string>
     <string name="prepared_by_text">Preparato da</string>
+    <string name="customer_text">Cliente</string>
     <string name="piece">Pezzo</string>
 
 

app/src/main/res/values/strings.xml

@@ -92,6 +92,7 @@
     <string name="date_text">Date</string>
     <string name="position_text">Position</string>
     <string name="prepared_by_text">Prepared by</string>
+    <string name="customer_text">Customer</string>
     <string name="picking_not_available">Picking not available</string>
     <string name="scan_item">Please scan an <b>item</b> barcode</string>
     <string name="extra_item">Extra item</string>

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.2.0'
         classpath 'com.google.firebase:perf-plugin:1.2.1'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Apr 18 18:31:44 CEST 2019
+#Mon Aug 26 11:42:29 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip