diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index efd9b6c5..57644773 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 00000000..681f41ae
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index 52f57fad..2845a8ea 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
index fce98d84..5d951475 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
+++ b/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;
}
);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
index f4bb9320..8382021c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java
+++ b/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);
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java
index 4d58dc69..9d30ce3b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java
@@ -58,7 +58,7 @@ public class EntityRESTConsumer {
}
- public static void processEntityList(List entitiesToSave, final ISimpleOperationCallback> callback, boolean singleTransaction){
+ public static void processEntityList(List entitiesToSave, final ISimpleOperationCallback> callback, boolean singleTransaction, Class type){
EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class);
Call>> request = service.processEntityList(singleTransaction, entitiesToSave);
@@ -71,12 +71,13 @@ public class EntityRESTConsumer {
ArrayList responseList = new ArrayList<>();
Gson gson = new Gson();
- Type typeOfObjectsList = new TypeToken() {}.getType();
+// Type typeOfObjectsList = new TypeToken() {}.getType();
for(ServiceRESTResponse 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()));
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java
index 9d38a097..e99da070 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java
+++ b/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 onFailed) {
+ if(BuildConfig.DEBUG) {
+ onComplete.run();
+ return;
+ }
+
if(UtilityString.isNullOrEmpty(printerName)) {
onFailed.run(new Exception("Nessuna stampante configurata: valore null"));
return;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index 6f8e4ded..ec14f43a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/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;
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java
index bf520924..27d2b48b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java
+++ b/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;
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java
index 5aee048c..3c7abcf7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java
+++ b/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 YMD_TIME_SLASH = YMD_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 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();
}
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java
index 6a035df9..82acb2a7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java
+++ b/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)
- .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())));
+ for(int k = 0; k < this.groupedOrdini.size(); k++) {
+
+ OrdineAccettazioneDTO.Riga x = this.groupedOrdini.get(k);
+
+ if(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()) {
+
+ 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()));
+// });
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java
index b062b5cf..27e6b132 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java
@@ -67,7 +67,6 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter updatedDataset) {
mDataset.clear();
mDataset.addAll(orderItems(updatedDataset));
- notifyDataSetChanged();
notifyDataChanged();
}
@@ -143,5 +142,4 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter mDataset;
public ObservableField mtbColt = new ObservableField<>();
@@ -66,15 +68,8 @@ public class ProdRecuperoMaterialeViewModel {
mHelper = helper;
mOnRecuperoCompleted = onRecuperoCompleted;
- ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
-
- mHelper.loadLastULVersate(historyULs -> {
- progressDialog.dismiss();
- initRecyclerView(historyULs);
- }, ex -> {
- UtilityExceptions.defaultException(mContext, ex, progressDialog);
- BarcodeManager.enable();
- });
+ initRecyclerView();
+ refreshAdapter();
}
public void openLU() {
@@ -92,7 +87,7 @@ public class ProdRecuperoMaterialeViewModel {
} else {
setMtbColt(mtbColt);
- chooseQuantityToReturn();
+// chooseQuantityToReturn();
}
} else {
@@ -110,10 +105,8 @@ public class ProdRecuperoMaterialeViewModel {
}
- private void chooseQuantityToReturn() {
- InputQuantityToReturnDialog.make(mContext, mtbColt.get().getMtbColr().get(0).getMtbAart(), BigDecimal.ZERO, BigDecimal.ONE, data -> {
+ private void chooseQuantityToReturn(MtbAart mtbAart, BigDecimal min, BigDecimal max) {
- }).show();
}
@@ -122,26 +115,11 @@ 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 historyULs) {
- mAdapter = new HistoryULsListAdapter(mContext, historyULs);
+ private void initRecyclerView() {
+ mAdapter = new HistoryULsListAdapter(mContext, new ArrayList<>());
mAdapter.setOnItemClicked(this::onListItemClicked);
mBinding.prodRecuperoMaterialeMainList.setLayoutManager(new LinearLayoutManager(mContext));
@@ -153,53 +131,69 @@ public class ProdRecuperoMaterialeViewModel {
qtaDaEvadere = qtaDaEvadere.add(item.getQtaCol());
- DialogInputQuantity.DTO dto = new DialogInputQuantity.DTO()
- .setBatchLot(item.getPartitaMag())
- .setMtbAart(item.getMtbAart())
- .setQtaDisponibile(qtaDaEvadere)
- .setQtaTot(qtaDaEvadere)
- .setCanPartitaMagBeChanged(false)
- .setMaxQta(qtaDaEvadere);
-
- DialogInputQuantity.makeBase(mContext, dto, false, (quantityDTO) -> {
- onItemDispatched(item, quantityDTO);
- }, () -> {
- BarcodeManager.enable();
+ InputQuantityToReturnDialog.make(mContext, item.getMtbAart(), BigDecimal.ONE, qtaDaEvadere, quantity -> {
+ onItemDispatched(item, quantity);
}).show();
+
}
- private void onItemDispatched(HistoryVersamentoProdUL item, QuantityDTO quantityDTO) {
+ private void onItemDispatched(HistoryVersamentoProdUL item, BigDecimal quantity) {
final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mContext);
- final MtbColt mtbColt = new MtbColt()
+ final MtbColt mtbColtCarico = new MtbColt()
.initDefaultFields()
.setGestione(GestioneEnum.LAVORAZIONE)
.setSegno(+1)
.setMtbColr(new ObservableArrayList<>());
- mtbColt
+ mtbColtCarico
.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
- final MtbColr mtbColr = new MtbColr()
+ final MtbColr mtbColrCarico = new MtbColr()
.setCodMart(item.getCodMart())
- .setPartitaMag(UtilityString.empty2null(quantityDTO.batchLot.get()))
- .setQtaCol(quantityDTO.qtaTot.getBigDecimal())
- .setQtaCnf(quantityDTO.qtaCnf.getBigDecimal())
- .setNumCnf(quantityDTO.numCnf.getBigDecimal())
+ .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());
- mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
- mtbColt.getMtbColr().add(mtbColr);
+ mtbColtScarico.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
+ mtbColtScarico.getMtbColr().add(mtbColrScarico);
- ColliMagazzinoRESTConsumer.saveCollo(mtbColt, value -> {
+ List 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, () -> {
+ printCollo(progress, value.get(0), () -> {
+ this.refreshAdapter();
mOnRecuperoCompleted.run();
});
@@ -265,4 +259,21 @@ public class ProdRecuperoMaterialeViewModel {
}, 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();
+ });
+
+ }
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java
index 573b4b59..70cd50e5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java
+++ b/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 orderItems(List dataset) {
return Stream.of(dataset)
- .sortBy(OrdineVenditaInevasoDTO::getRagSocOrd)
+ .sortBy(x -> x.getRagSocOrd() + " - " + x.getDestinatario())
.toList();
}
@@ -95,6 +97,14 @@ public class MainListVenditaAdapter extends SectionedRecyclerViewAdapter {
boolean anySelected = Stream.of(mDataset)
@@ -159,7 +169,8 @@ public class MainListVenditaAdapter extends SectionedRecyclerViewAdapter
-
+
@@ -43,51 +44,141 @@
-
+ android:paddingStart="8dp"
+ android:paddingEnd="8dp">
-
-
-
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/vendita_main_list_model.xml b/app/src/main/res/layout/vendita_main_list_model.xml
index 8934bb9b..9cfaf594 100644
--- a/app/src/main/res/layout/vendita_main_list_model.xml
+++ b/app/src/main/res/layout/vendita_main_list_model.xml
@@ -33,18 +33,33 @@
-
+ android:orientation="vertical">
+
+
+
+
+
diff --git a/build.gradle b/build.gradle
index bce98564..11d0df20 100644
--- a/build.gradle
+++ b/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'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7ae5a961..9d810b90 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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