Finish v1_6_12(73)

app/build.gradle

@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 72
+    def appVersionCode = 73
-    def appVersionName = '1.6.11'
+    def appVersionName = '1.6.12'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/core/exception/DateNotRecognizedException.java

@@ -0,0 +1,9 @@
+package it.integry.integrywmsnative.core.exception;
+
+public class DateNotRecognizedException extends Exception {
+
+    public DateNotRecognizedException(String dateString) {
+        super("Data non riconosciuta (" + dateString + ")");
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/exception/TimeNotRecognizedException.java

@@ -0,0 +1,9 @@
+package it.integry.integrywmsnative.core.exception;
+
+public class TimeNotRecognizedException extends Exception {
+
+    public TimeNotRecognizedException(String dateString) {
+        super("Time non riconosciuto (" + dateString + ")");
+    }
+
+}

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

@@ -83,14 +83,17 @@ public class FiltroOrdineDTO {
         FiltroOrdineDTO that = (FiltroOrdineDTO) o;
 
         if (getNumOrd() != that.getNumOrd()) return false;
-        if (!getGestioneOrd().equals(that.getGestioneOrd())) return false;
+        if (getGestioneOrd() != null ? !getGestioneOrd().equals(that.getGestioneOrd()) : that.getGestioneOrd() != null)
-        return dataOrd.equals(that.dataOrd);
+            return false;
+        if (dataOrd != null ? !dataOrd.equals(that.dataOrd) : that.dataOrd != null) return false;
+        return dataCons != null ? dataCons.equals(that.dataCons) : that.dataCons == null;
     }
 
     @Override
     public int hashCode() {
-        int result = getGestioneOrd().hashCode();
+        int result = getGestioneOrd() != null ? getGestioneOrd().hashCode() : 0;
-        result = 31 * result + dataOrd.hashCode();
+        result = 31 * result + (dataOrd != null ? dataOrd.hashCode() : 0);
+        result = 31 * result + (dataCons != null ? dataCons.hashCode() : 0);
         result = 31 * result + getNumOrd();
         return result;
     }

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

@@ -1,8 +1,12 @@
 package it.integry.integrywmsnative.core.utility;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import it.integry.integrywmsnative.core.exception.DateNotRecognizedException;
+import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException;
+
 /**
  * Created by GiuseppeS on 07/03/2018.
  */
@@ -21,7 +25,16 @@ public class UtilityDate {
         public static final String DMY_HUMAN_LONG = "dd MMMM yyyy";
     }
 
-    public static Date recognizeDate(String dateString) throws Exception{
+    public static Date recognizeDateWithExceptionHandler(String dateString)  {
+        try{
+            return UtilityDate.recognizeDate(dateString);
+        } catch (ParseException | DateNotRecognizedException | TimeNotRecognizedException pex){
+            UtilityLogger.errorMe(pex);
+            return null;
+        }
+    }
+
+    public static Date recognizeDate(String dateString) throws ParseException, DateNotRecognizedException, TimeNotRecognizedException {
 
         if (dateString == null) {
             return null;
@@ -36,7 +49,7 @@ public class UtilityDate {
         if(onlyDateSubstring.contains("/")) dateSeparator = '/';
         else if(onlyDateSubstring.contains("-")) dateSeparator = '-';
         else if(onlyDateSubstring.contains(".")) dateSeparator = '.';
-        else throw new Exception("Data non riconosciuta (" + dateString + ")");
+        else throw new DateNotRecognizedException(dateString);
 
         String dateFormatString = (dateString.charAt(2) == dateSeparator)
                 ? "dd" + dateSeparator + "MM" + dateSeparator + "yyyy"
@@ -50,7 +63,7 @@ public class UtilityDate {
             String onlyTimeSubstring = dateString.substring(10, 14);
             if(onlyTimeSubstring.contains("-")) timeSeparator = '-';
             else if(onlyTimeSubstring.contains(":")) timeSeparator = ':';
-            else throw new Exception("Time non riconosciuto (" + dateString + ")");
+            else throw new TimeNotRecognizedException(dateString);
 
             String timeFormatString = "HH" + timeSeparator + "mm" + timeSeparator + "ss";
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java

@@ -185,96 +185,6 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
         }
     };
 
-//    private void groupOrdiniAndMakeRecycler(List<OrdineAccettazioneInevasoDTO> ordini){
-//
-//        for(OrdineAccettazioneInevasoDTO ordine : ordini){
-//            if(UtilityString.isNullOrEmpty(ordine.getCodJcom()) || ordine.getCodJcom().equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)){
-//                ordine.setCodJcom(CommonConst.Config.COMMESSA_MAG);
-//                ordine.setDescrizioneCom("MAGAZZINO");
-//            }
-//        }
-//
-//        groupedOrdiniInevasi = new ArrayList<>();
-//
-//        //Splitto gli ordini per codAnagClie
-//        List<OrdineAccettazioneGroupedInevasoDTO> groupedOrdini = Stream.of(ordini)
-//                .map(x -> {
-//                    OrdineAccettazioneGroupedInevasoDTO groupedOrdine = new OrdineAccettazioneGroupedInevasoDTO();
-//
-//                    groupedOrdine.codAnagForn = x.getCodAnagOrd();
-//                    groupedOrdine.nomeFornitore = x.getRagSocOrd();
-//                    groupedOrdine.ordini = new ArrayList<>();
-//
-//                    return groupedOrdine;
-//                })
-//                .distinctBy(x -> x.codAnagForn + "_" + x.nomeFornitore)
-//                .sortBy(x -> x.nomeFornitore)
-//        .toList();
-//
-//
-//         Stream.of(groupedOrdini).forEach(groupedOrdine -> {
-//
-//
-//            //Splitto gli ordini di ogni fornitore per data e numero
-//            List<OrdineAccettazioneGroupedInevasoDTO.Ordine> tmpOrd = Stream.of(ordini)
-//                    .filter(x -> x.getCodAnagOrd().equals(groupedOrdine.codAnagForn))
-//
-//                    .sortBy(x -> x.getDataConsD() != null ? x.getDataConsD() : new Date(2000, 01, 01))
-//                    .map(x -> {
-//
-//                        OrdineAccettazioneGroupedInevasoDTO.Ordine rigaOrdine = new OrdineAccettazioneGroupedInevasoDTO.Ordine();
-//
-//                        rigaOrdine.data = x.getData();
-//                        rigaOrdine.numero = x.getNumero();
-//                        rigaOrdine.gestione = x.getGestione();
-//                        rigaOrdine.codAnagOrd = x.getCodAnagOrd();
-//                        rigaOrdine.ragSocOrd = x.getRagSocOrd();
-//                        rigaOrdine.pesoTotale = x.getPesoTotale();
-//                        rigaOrdine.barcode = x.getBarcode();
-//                        rigaOrdine.termCons = x.getTermCons();
-//                        rigaOrdine.dataCons = x.getDataConsS();
-//                        rigaOrdine.rifOrd = x.getRifOrd();
-//                        rigaOrdine.clienti = new ArrayList<>();
-//
-//                        return rigaOrdine;
-//                    })
-//                    .distinctBy(x -> x.barcode)
-//                    .toList();
-//
-//
-//                    Stream.of(tmpOrd)
-//                            .forEach(rigaOrdine -> {
-//
-//                                Stream.of(ordini)
-//                                        .filter(x ->
-//                                                    x.getCodAnagOrd().equals(rigaOrdine.codAnagOrd) &&
-//                                                    x.getNumero() == rigaOrdine.numero &&
-//                                                    x.getData().equals(rigaOrdine.data))
-//                                        .forEach(x -> {
-//                                            OrdineAccettazioneGroupedInevasoDTO.Cliente cliente = new OrdineAccettazioneGroupedInevasoDTO.Cliente();
-//
-//                                            cliente.codJcom = x.getCodJcom();
-//                                            cliente.ragSocCom = x.getRagSocCom();
-//                                            cliente.descrCom = x.getDescrizioneCom();
-//                                            cliente.dataCons = x.getDataConsS();
-//                                            cliente.numCnf = x.getNumCnf();
-//                                            cliente.rifOrd = x.getRifOrd();
-//
-//                                            rigaOrdine.clienti.add(cliente);
-//                                        });
-//
-//
-//                        groupedOrdine.ordini.add(rigaOrdine);
-//
-//                    });
-//
-//            groupedOrdiniInevasi.add(groupedOrdine);
-//        });
-//
-//        mAdapter = new MainListAccettazioneAdapter(getActivity(), groupedOrdiniInevasi, onGroupSelectionChanged);
-//        mBinding.accettazioneMainList.setAdapter(mAdapter);
-//    }
-
     private void onAccettazioneMainFabClick() {
 
         List<OrdineAccettazioneInevasoDTO> selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList);
@@ -332,23 +242,6 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
 
     }
 
-//    private RunnableArgs<OrdineAccettazioneGroupedInevasoDTO> onGroupSelectionChanged = dto -> {
-//        List<OrdineAccettazioneGroupedInevasoDTO> selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList);
-//
-//        if(selectedOrders != null && selectedOrders.size() > 1){
-//            for (OrdineAccettazioneGroupedInevasoDTO selectedOrder : selectedOrders) {
-//                if(!dto.codAnagForn.equalsIgnoreCase(selectedOrder.codAnagForn)) {
-//                    Stream.of(selectedOrder.ordini).forEach(x -> x.setCheckbox(false));
-//                }
-//            }
-//        }
-//
-//        if(selectedOrders.size() > 0) mBinding.accettazioneMainFab.show();
-//        else mBinding.accettazioneMainFab.hide();
-//    };
-
-
-
 
     @Override
     public void onSearchEnabled() {

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java

@@ -50,7 +50,7 @@ public class AccettazioneHelper {
                             callback.onLoadSuccess(response.body().getDto());
                         } else {
                             Log.e("Accettazione", response.body().getErrorMessage());
-                            callback.onLoadFail(new Exception(response.message()));
+                            callback.onLoadFail(new Exception(response.body().getErrorMessage()));
                         }
                     } else {
                         Log.e("Accettazione", response.message());
@@ -97,7 +97,7 @@ public class AccettazioneHelper {
                             onComplete.run(dto);
                         } else {
                             Log.e("Accettazione", response.body().getErrorMessage());
-                            onFailed.run(new Exception(response.message()));
+                            onFailed.run(new Exception(response.body().getErrorMessage()));
                         }
                     } else {
                         Log.e("Accettazione", response.message());

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

@@ -236,9 +236,19 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
         ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mActivity);
 
         BarcodeManager.disable();
-
+        if(UtilityBarcode.isEtichettaAnonima(data)){
-        if(UtilityBarcode.isEtichettaAnonima(data) && !thereIsAnOpenedUL()){
+            if(!thereIsAnOpenedUL()) this.executeEtichettaAnonima(data, progressDialog);
-            this.executeEtichettaAnonima(data, progressDialog);
+            else {
+                DialogSimpleMessageHelper.makeErrorDialog(
+                        mActivity,
+                        new SpannableString(mActivity.getString(R.string.lu_scan_not_granted_here)),
+                        null,
+                        () -> {
+                            BarcodeManager.enable();
+                            progressDialog.dismiss();
+                        })
+                 .show();
+            }
         } else if(UtilityBarcode.isEtichetta128(data)) {
             this.executeEtichettaEan128(data, progressDialog);
         } else if(UtilityBarcode.isEanPeso(data)){

app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java

@@ -120,7 +120,7 @@ public class ProdOrdineLavorazioneHelper {
                         } else {
                             Log.e("Ord Lavorazione", response.body().getErrorMessage());
                             UtilityFirebase.stopPerformanceTrace(perfTrace, true);
-                            onFailed.run(new Exception(response.message()));
+                            onFailed.run(new Exception(response.body().getErrorMessage()));
                         }
                     } else {
                         Log.e("Ord Lavorazione", response.message());

app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java

@@ -43,7 +43,7 @@ public class OrdineProduzioneHelper {
                             onComplete.run(response.body().getDto());
                         } else {
                             Log.e("Accettazione", response.body().getErrorMessage());
-                            onFailed.run(new Exception(response.message()));
+                            onFailed.run(new Exception(response.body().getErrorMessage()));
                         }
                     } else {
                         Log.e("Accettazione", response.message());
@@ -91,7 +91,7 @@ public class OrdineProduzioneHelper {
                             onComplete.run(dto);
                         } else {
                             Log.e("Produzione", response.body().getErrorMessage());
-                            onFailed.run(new Exception(response.message()));
+                            onFailed.run(new Exception(response.body().getErrorMessage()));
                         }
                     } else {
                         Log.e("Produzione", response.message());

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

@@ -105,7 +105,7 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter<HistoryU
         holder.binding.codMart.setText(ul.getCodMart());
         holder.binding.descrizione.setText(ul.getDescrizioneArt());
         holder.binding.numCollo.setText(String.valueOf(ul.getNumCollo()));
-        holder.binding.partitaMag.setText(ul.getPartitaMag());
+        holder.binding.partitaMag.setText("(" + ul.getPartitaMag() + ")");
 
         holder.binding.qtaVersata.setText(String.valueOf(ul.getQtaCol()));
         holder.binding.untMisQtaVersata.setText(ul.getUntMis());

app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java

@@ -50,7 +50,7 @@ public class UltimeConsegneClienteViewModel {
     private void initDataAdapter(ArrayList<ConsegnaClienteDTO> dataset) {
         UltimeConsegneMainListAdapter adapter = new UltimeConsegneMainListAdapter(mContext, dataset);
         adapter.setOnItemClickListener(consegna -> {
-            Toast.makeText(mContext, String.format("Selezionato doc n° %d del %s", consegna.getNumDoc(), consegna.getDataDoc()), Toast.LENGTH_SHORT).show();
+            Toast.makeText(mContext, String.format("Selezionato doc n° %d del %s", consegna.getNumDoc(), consegna.getDataDocS()), Toast.LENGTH_SHORT).show();
         });
 
         mBinding.recyclerView.setHasFixedSize(true);

app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java

@@ -112,7 +112,7 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
                 .width(40)
                 .height(40)
                 .fontSize(24)
-                .useFont(ResourcesCompat.getFont(mContext, R.font.product_sans_regular))
+                .useFont(ResourcesCompat.getFont(mContext, R.font.google_sans_regular))
                 .endConfig();
 
         mediumIconBuilder = TextDrawable.builder()
@@ -120,7 +120,7 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
                 .width(40)
                 .height(40)
                 .fontSize(20)
-                .useFont(ResourcesCompat.getFont(mContext, R.font.product_sans_regular))
+                .useFont(ResourcesCompat.getFont(mContext, R.font.google_sans_regular))
                 .endConfig();
 
         largeIconBuilder = TextDrawable.builder()
@@ -128,7 +128,7 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
                 .width(40)
                 .height(40)
                 .fontSize(16)
-                .useFont(ResourcesCompat.getFont(mContext, R.font.product_sans_regular))
+                .useFont(ResourcesCompat.getFont(mContext, R.font.google_sans_regular))
                 .endConfig();
 
     }
@@ -150,7 +150,11 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
     public void onBindItemViewHolder(final SingleItemViewHolder holder, final int position) {
         final ConsegnaClienteDTO consegna = this.mDataset.get(position);
 
-        holder.mBinding.descriptionMain.setText(UtilityString.isNullOrEmpty(consegna.getRifOrd()) ? "" : consegna.getRifOrd());
+        holder.mBinding.descriptionMain.setText(UtilityString.isNullOrEmpty(consegna.getIndirizzo()) ? "" : consegna.getIndirizzo());
+
+        if(consegna.getDataInizTraspD() != null) {
+            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();
 
@@ -163,18 +167,16 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
         }
 
         try {
-            Date dataDoc = UtilityDate.recognizeDate(consegna.getDataDoc());
-
             Calendar calendarNow = Calendar.getInstance(TimeZone.getDefault());
             Calendar calendarDataDoc = Calendar.getInstance(TimeZone.getDefault());
-            calendarDataDoc.setTime(dataDoc);
+            calendarDataDoc.setTime(consegna.getDataDocD());
 
             String dataDocString = "";
 
             if(calendarDataDoc.get(Calendar.YEAR) == calendarNow.get(Calendar.YEAR)) {
-                dataDocString = UtilityDate.formatDate(dataDoc, UtilityDate.COMMONS_DATE_FORMATS.DM_HUMAN);
+                dataDocString = UtilityDate.formatDate(consegna.getDataDocD(), UtilityDate.COMMONS_DATE_FORMATS.DM_HUMAN);
             } else {
-                dataDocString = UtilityDate.formatDate(dataDoc, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN);
+                dataDocString = UtilityDate.formatDate(consegna.getDataDocD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN);
             }
 
             holder.mBinding.date.setText(dataDocString);

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

@@ -110,7 +110,7 @@ public class VenditaHelper {
                         } else {
                             Log.e("Vendita", response.body().getErrorMessage());
                             UtilityFirebase.stopPerformanceTrace(perfTrace, true);
-                            callback.onLoadFail(new Exception(response.message()));
+                            callback.onLoadFail(new Exception(response.body().getErrorMessage()));
                         }
                     } else {
                         Log.e("Vendita", response.message());

app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/model/ConsegnaClienteDTO.java

@@ -1,5 +1,14 @@
 package it.integry.integrywmsnative.gest.vendita.rest.model;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import it.integry.integrywmsnative.core.exception.DateNotRecognizedException;
+import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityLogger;
+
 public class ConsegnaClienteDTO {
 
     private String codAnag;
@@ -8,10 +17,13 @@ public class ConsegnaClienteDTO {
     private String dataDoc;
     private String serDoc;
     private int numDoc;
+    private String destinatario;
+    private String indirizzo;
     private String ragSoc;
     private String compilatoDa;
     private String rifOrd;
-    private String dataord;
+    private String dataOrd;
+    private String dataInizTrasp;
 
     public String getCodAnag() {
         return codAnag;
@@ -40,10 +52,14 @@ public class ConsegnaClienteDTO {
         return this;
     }
 
-    public String getDataDoc() {
+    public String getDataDocS() {
         return dataDoc;
     }
 
+    public Date getDataDocD() {
+        return UtilityDate.recognizeDateWithExceptionHandler(getDataDocS());
+    }
+
     public ConsegnaClienteDTO setDataDoc(String dataDoc) {
         this.dataDoc = dataDoc;
         return this;
@@ -67,6 +83,24 @@ public class ConsegnaClienteDTO {
         return this;
     }
 
+    public String getDestinatario() {
+        return destinatario;
+    }
+
+    public ConsegnaClienteDTO setDestinatario(String destinatario) {
+        this.destinatario = destinatario;
+        return this;
+    }
+
+    public String getIndirizzo() {
+        return indirizzo;
+    }
+
+    public ConsegnaClienteDTO setIndirizzo(String indirizzo) {
+        this.indirizzo = indirizzo;
+        return this;
+    }
+
     public String getRagSoc() {
         return ragSoc;
     }
@@ -94,12 +128,30 @@ public class ConsegnaClienteDTO {
         return this;
     }
 
-    public String getDataord() {
+    public String getDataOrdS() {
-        return dataord;
+        return dataOrd;
     }
 
-    public ConsegnaClienteDTO setDataord(String dataord) {
+    public Date getDataOrdD() {
-        this.dataord = dataord;
+        return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS());
+    }
+
+
+    public ConsegnaClienteDTO setDataOrd(String dataOrd) {
+        this.dataOrd = dataOrd;
+        return this;
+    }
+
+    public String getDataInizTraspS() {
+        return dataInizTrasp;
+    }
+
+    public Date getDataInizTraspD() {
+        return UtilityDate.recognizeDateWithExceptionHandler(getDataInizTraspS());
+    }
+
+    public ConsegnaClienteDTO setDataInizTrasp(String dataInizTrasp) {
+        this.dataInizTrasp = dataInizTrasp;
         return this;
     }
 }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java

@@ -34,7 +34,7 @@ import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
 
 public class DialogScanOrCreateLU {
 
-    private Context currentContext;
+    private Context mContext;
 
     private Dialog mDialog;
 
@@ -46,6 +46,7 @@ public class DialogScanOrCreateLU {
 
 
     private boolean mShouldCheckResiduo = false;
+    private boolean mShouldCheckIfExistDoc = true;
 
 
     public static Dialog make(final Context context, RunnableArgs<MtbColt> onDialogDismiss) {
@@ -65,7 +66,7 @@ public class DialogScanOrCreateLU {
         currentMtbColt = null;
         mShouldCheckResiduo = checkResiduo;
 
-        currentContext = context;
+        mContext = context;
 
         LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
 
@@ -88,12 +89,12 @@ public class DialogScanOrCreateLU {
         mOnDialogDismiss = onDialogDismiss;
 
         mBinding.createNewLuButton.setOnClickListener(v -> {
-            final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(currentContext);
+            final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
 
             ColliMagazzinoRESTConsumer.createColloLavorazione(+1, createdMtbColt -> {
                 sendMtbColt(createdMtbColt, progressDialog);
             }, ex -> {
-                UtilityExceptions.defaultException(currentContext, ex, progressDialog);
+                UtilityExceptions.defaultException(mContext, ex, progressDialog);
             });
         });
     }
@@ -118,7 +119,7 @@ public class DialogScanOrCreateLU {
     private RunnableArgs<BarcodeScanDTO> onScanSuccessfull = data -> {
         BarcodeManager.disable();
 
-        final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(currentContext);
+        final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
 
         if(UtilityBarcode.isEtichettaPosizione(data)){
             this.executeEtichettaPosizione(data, progressDialog);
@@ -150,7 +151,7 @@ public class DialogScanOrCreateLU {
                 ColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), mShouldCheckResiduo, false, mtbColt -> {
                     sendMtbColt(mtbColt, progressDialog);
                 }, ex ->  {
-                    UtilityExceptions.defaultException(currentContext, ex, progressDialog);
+                    UtilityExceptions.defaultException(mContext, ex, progressDialog);
                     BarcodeManager.enable();
                 });
 
@@ -163,7 +164,7 @@ public class DialogScanOrCreateLU {
             }
 
         }, ex -> {
-            UtilityExceptions.defaultException(currentContext, ex, progressDialog);
+            UtilityExceptions.defaultException(mContext, ex, progressDialog);
             BarcodeManager.enable();
         });
 
@@ -180,21 +181,31 @@ public class DialogScanOrCreateLU {
                     createdMtbColt.setDisablePrint(true);
                     sendMtbColt(createdMtbColt, progressDialog);
                 }, ex -> {
-                    UtilityExceptions.defaultException(currentContext, ex, progressDialog);
+                    UtilityExceptions.defaultException(mContext, ex, progressDialog);
                     BarcodeManager.enable();
                 });
 
             } else {
 
+                if(mtbColt.getCodDtip() != null && mShouldCheckIfExistDoc) {
+                    DialogSimpleMessageHelper.makeWarningDialog(mContext,
+                            new SpannableString(mContext.getResources().getText(R.string.lu_already_attache_to_doc)),
+                            null, () -> {
+                                BarcodeManager.enable();
+                                progressDialog.dismiss();
+                            })
+                            .show();
+                } else {
                     BarcodeManager.enable();
 
                     mtbColt.setDisablePrint(true);
                     sendMtbColt(mtbColt, progressDialog);
+                }
 
             }
 
         }, ex -> {
-            UtilityExceptions.defaultException(currentContext, ex, progressDialog);
+            UtilityExceptions.defaultException(mContext, ex, progressDialog);
             BarcodeManager.enable();
         });
     }
@@ -209,8 +220,19 @@ public class DialogScanOrCreateLU {
 
                     if(mtbColt != null) {
 
+                        if(mtbColt.getCodDtip() != null && mShouldCheckIfExistDoc) {
+                            DialogSimpleMessageHelper.makeWarningDialog(mContext,
+                                    new SpannableString(mContext.getResources().getText(R.string.lu_already_attache_to_doc)),
+                                    null, () -> {
+                                        BarcodeManager.enable();
+                                        progressDialog.dismiss();
+                                    })
+                                    .show();
+                        } else {
                             BarcodeManager.enable();
                             sendMtbColt(mtbColt, progressDialog);
+                        }
+
 
                     } else {
                         BarcodeManager.enable();
@@ -219,7 +241,7 @@ public class DialogScanOrCreateLU {
                     }
 
                 }, ex -> {
-                    UtilityExceptions.defaultException(currentContext, ex, progressDialog);
+                    UtilityExceptions.defaultException(mContext, ex, progressDialog);
                     BarcodeManager.enable();
                 });
 
@@ -234,21 +256,21 @@ public class DialogScanOrCreateLU {
 
 
         }, ex -> {
-            UtilityExceptions.defaultException(currentContext, ex, progressDialog);
+            UtilityExceptions.defaultException(mContext, ex, progressDialog);
             BarcodeManager.enable();
         });
     }
 
 
     private void showTooMuchULFound() {
-        DialogSimpleMessageHelper.makeWarningDialog(currentContext,
+        DialogSimpleMessageHelper.makeWarningDialog(mContext,
-                new SpannableString(currentContext.getResources().getText(R.string.too_much_lu_found_message)),
+                new SpannableString(mContext.getResources().getText(R.string.too_much_lu_found_message)),
                 null, null).show();
     }
 
     private void showNoULFound() {
-        DialogSimpleMessageHelper.makeWarningDialog(currentContext,
+        DialogSimpleMessageHelper.makeWarningDialog(mContext,
-                new SpannableString(currentContext.getResources().getText(R.string.no_lu_found_message)),
+                new SpannableString(mContext.getResources().getText(R.string.no_lu_found_message)),
                 null, null).show();
     }
 

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

@@ -32,13 +32,16 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp">
 
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/description_main"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@android:color/black"
-                android:textStyle="italic"
+                style="@android:style/TextAppearance.Small"
-                style="@android:style/TextAppearance.Medium"
+                android:layout_marginEnd="4dp"
+                android:layout_toStartOf="@id/date"
+                android:ellipsize="end"
+                android:singleLine="true"
                 tools:text="TITLE"/>
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -51,6 +54,19 @@
                 android:textSize="14sp"
                 tools:text="13 Apr"/>
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/sub_description_main"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@android:style/TextAppearance.Small"
+                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"/>
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/compilato_da"
                 android:layout_width="wrap_content"

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

@@ -20,7 +20,7 @@
             android:textSize="16sp"
             android:textStyle="bold"
             android:textAllCaps="true"
-            android:textColor="@color/gray_600"
+            android:textColor="@color/colorPrimary"
             android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"/>

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

@@ -6,38 +6,50 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/white"
-        android:paddingTop="4dp"
+        android:paddingTop="8dp"
-        android:paddingBottom="4dp">
+        android:paddingBottom="8dp">
 
         <LinearLayout
             android:id="@+id/left_content"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:layout_alignParentStart="true"
-            android:layout_toStartOf="@id/right_content"
             android:paddingEnd="8dp">
 
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="-8dp"
+                    android:text="@string/logistic_unit"/>
+
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/num_collo"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     tools:text="22"
                     android:textColor="@android:color/black"
+                    android:textStyle="bold"
                     android:textSize="22sp"
-                android:layout_gravity="center_vertical"
+                    android:layout_gravity="center_vertical"/>
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"/>
 
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <LinearLayout
+                <RelativeLayout
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="wrap_content">
-                    android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/cod_mart"
@@ -55,29 +67,20 @@
                         android:textColor="@color/gray_700"
                         tools:text="Lotto articolo"
                         android:layout_marginStart="4dp"
+                        android:layout_toEndOf="@id/cod_mart"
+                        android:layout_toStartOf="@id/right_content"
+                        android:layout_alignBottom="@id/cod_mart"
+                        android:ellipsize="end"
+                        android:singleLine="true"
+                        android:layout_marginEnd="6dp"
                         />
 
-                </LinearLayout>
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/descrizione"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/gray_700"
-                    tools:text="Descrizione estesa articolo"
-                    />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
                     <RelativeLayout
                         android:id="@+id/right_content"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
-            android:layout_alignTop="@id/left_content"
+                        android:layout_alignBottom="@id/cod_mart"
-            android:layout_alignBottom="@id/left_content"
                         android:paddingEnd="8dp">
 
                         <androidx.appcompat.widget.LinearLayoutCompat
@@ -105,4 +108,22 @@
 
                 </RelativeLayout>
 
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/descrizione"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/gray_700"
+                    tools:text="Descrizione estesa articolo"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+
+
+    </RelativeLayout>
+
 </layout>

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

@@ -26,6 +26,7 @@
     <string name="abort">Annulla</string>
     <string name="reset">Resetta</string>
     <string name="dispatched_abbr">Evasi</string>
+    <string name="logistic_unit">UL</string>
 
     <string name="permission_request_message">Questi permessi sono necessari al funzionamento dell\'app</string>
     <string name="picking_not_available">Picking non disponibile</string>
@@ -51,6 +52,8 @@
     <string name="confirm">Conferma</string>
     <string name="hint_additional_notes">Note Aggiuntive</string>
     <string name="dialog_message_additional_notes">Inserisci eventuali note aggiuntive della tua UL</string>
+    <string name="lu_scan_not_granted_here">Non è possibile scansionare il barcode di una UL adesso</string>
+    <string name="lu_already_attache_to_doc">L\'UL selezionata è già agganciata ad un documento per cui non può essere utilizzata</string>
 
     <string name="warehouse">Magazzino</string>
 
@@ -235,4 +238,7 @@
     <string name="select_a_recipient_message">Prima di procedere seleziona un <b>destinatario</b></string>
     <string name="not_valid_customer_error">Cliente non valido</string>
     <string name="not_valid_recipient_error">Destinatario non valido</string>
+
+    <string name="shipped_on">Spedito il %s</string>
+    <string name="delivered_on">Consegnato il %s</string>
 </resources>

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

@@ -49,6 +49,7 @@
     <string name="confirm">Confirm</string>
     <string name="hint_additional_notes">Additional notes</string>
     <string name="dialog_message_additional_notes">Enter any additional notes in your logistics unit</string>
+    <string name="logistic_unit">LU</string>
 
 
     <!-- SETTINGS -->
@@ -204,6 +205,8 @@
     <string name="error_no_gest_found">Can\'t load current order type</string>
     <string name="error_multiple_cod_mdep_ordv">Can\'t load orders of different deposits</string>
     <string name="error_multiple_cod_jfas_ordp">The <b>production line</b> will not be saved because you are selecting orders for different productions</string>
+    <string name="lu_scan_not_granted_here">Logistics Unit\'s barcode is not accepted at this moment</string>
+    <string name="lu_already_attache_to_doc">Selected LU is already attached to a document hence can\'t be opened</string>
 
     <string name="recovering_data">Recovering data</string>
     <string name="wait_a_moment">Wait a moment</string>
@@ -241,5 +244,7 @@
     <string name="not_valid_customer_error">Invalid customer</string>
     <string name="not_valid_recipient_error">Invalid recipient</string>
 
+    <string name="shipped_on">Shipped %s</string>
+    <string name="delivered_on">Delivered on %s</string>
 
 </resources>

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

@@ -8,7 +8,7 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
 
-        <item name="fontFamily">@font/product_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
+        <item name="fontFamily">@font/google_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
 
     </style>
 
@@ -18,10 +18,10 @@
     </style>
 
     <style name="AppTheme.NewMaterial">
-        <item name="android:fontFamily">@font/product_sans_regular</item>
+        <item name="android:fontFamily">@font/google_sans_regular</item>
     </style>
     <style name="AppTheme.NewMaterial.Text" parent = "AppTheme.NewMaterial">
-        <item name="android:fontFamily">@font/product_sans_regular</item>
+        <item name="android:fontFamily">@font/google_sans_regular</item>
         <item name="android:textStyle">normal</item>
     </style>
     <style name="AppTheme.NewMaterial.Text.Small" parent = "AppTheme.NewMaterial.Text">
@@ -29,7 +29,7 @@
         <item name="android:textSize">14sp</item>
     </style>
     <style name="AppTheme.NewMaterial.Text.Badge" parent = "AppTheme.NewMaterial">
-        <item name="android:fontFamily">@font/product_sans_regular</item>
+        <item name="android:fontFamily">@font/google_sans_regular</item>
         <item name="android:textStyle">normal</item>
         <item name="android:background">@drawable/gray_detail_background_round4</item>
         <item name="android:paddingStart">8dp</item>