diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index df132727..ba984289 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 460cd12a..251785ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'com.google.firebase.firebase-perf' apply plugin: 'io.fabric' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -apply plugin: 'com.google.gms.google-services' +apply plugin: 'com.google.gms.google-services' android { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/IOrdiniVendita.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/IOrdiniVendita.java index fdfb1a2f..1f147dd9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/IOrdiniVendita.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/IOrdiniVendita.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.core.class_router.interfaces; +import android.app.Dialog; import android.app.ProgressDialog; import java.util.List; @@ -10,6 +11,6 @@ import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; public interface IOrdiniVendita { - void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed); + void distribuisciCollo(Dialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java new file mode 100644 index 00000000..10500a29 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbTCol.java @@ -0,0 +1,108 @@ +package it.integry.integrywmsnative.core.model; + +import java.math.BigDecimal; + +public class MtbTCol { + + + private String codTcol; + private BigDecimal pesoKg; + private BigDecimal lunghezzaCm; + private BigDecimal larghezzaCm; + private BigDecimal altezzaCm; + private BigDecimal taraKg; + private String descrizione; + private String codMart; + private String flagUIUL; + private String circuito; + + public String getCodTcol() { + return codTcol; + } + + public MtbTCol setCodTcol(String codTcol) { + this.codTcol = codTcol; + return this; + } + + public BigDecimal getPesoKg() { + return pesoKg; + } + + public MtbTCol setPesoKg(BigDecimal pesoKg) { + this.pesoKg = pesoKg; + return this; + } + + public BigDecimal getLunghezzaCm() { + return lunghezzaCm; + } + + public MtbTCol setLunghezzaCm(BigDecimal lunghezzaCm) { + this.lunghezzaCm = lunghezzaCm; + return this; + } + + public BigDecimal getLarghezzaCm() { + return larghezzaCm; + } + + public MtbTCol setLarghezzaCm(BigDecimal larghezzaCm) { + this.larghezzaCm = larghezzaCm; + return this; + } + + public BigDecimal getAltezzaCm() { + return altezzaCm; + } + + public MtbTCol setAltezzaCm(BigDecimal altezzaCm) { + this.altezzaCm = altezzaCm; + return this; + } + + public BigDecimal getTaraKg() { + return taraKg; + } + + public MtbTCol setTaraKg(BigDecimal taraKg) { + this.taraKg = taraKg; + return this; + } + + public String getDescrizione() { + return descrizione; + } + + public MtbTCol setDescrizione(String descrizione) { + this.descrizione = descrizione; + return this; + } + + public String getCodMart() { + return codMart; + } + + public MtbTCol setCodMart(String codMart) { + this.codMart = codMart; + return this; + } + + public String getFlagUIUL() { + return flagUIUL; + } + + public MtbTCol setFlagUIUL(String flagUIUL) { + this.flagUIUL = flagUIUL; + return this; + } + + public String getCircuito() { + return circuito; + } + + public MtbTCol setCircuito(String circuito) { + this.circuito = circuito; + return this; + } +} 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 6d195e2d..118e39ab 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 @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.core.rest.consumers; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; @@ -148,6 +149,12 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer{ .setSegno(-1) .setGestione(GestioneEnum.LAVORAZIONE) .setDataVers(null) + .setDataDoc(null) + .setNumDoc(null) + .setSerDoc(null) + .setCodDtip(null) + .setCodAnag(null) + .setCodVdes(null) .setOperation(CommonModelConsts.OPERATION.INSERT); if(posizione != null) { @@ -479,7 +486,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer{ - public static void updateDataFine(Context context, ProgressDialog progress, MtbColt mtbColt, Runnable onComplete) { + public static void updateDataFine(Context context, Dialog progress, MtbColt mtbColt, Runnable onComplete) { MtbColt cloneMtbColt = (MtbColt) mtbColt.clone(); cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java new file mode 100644 index 00000000..8f98dff1 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumer.java @@ -0,0 +1,39 @@ +package it.integry.integrywmsnative.core.rest.consumers; + +import com.google.gson.reflect.TypeToken; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; + +import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.model.MtbColt; +import it.integry.integrywmsnative.core.model.MtbTCol; +import it.integry.integrywmsnative.core.utility.UtilityDB; + +public class MagazzinoRESTConsumer extends _BaseRESTConsumer { + + + + public static void getTipoCollo(String codTcol, RunnableArgs onComplete, RunnableArgs onFailed) { + String baseSql = "SELECT * " + + "FROM mtb_tcol " + + "WHERE cod_tcol = " + UtilityDB.valueToString(codTcol); + + Type typeOfObjectsList = new TypeToken>() {}.getType(); + SystemRESTConsumer.processSql(baseSql, typeOfObjectsList, new ISimpleOperationCallback>() { + @Override + public void onSuccess(List values) { + if(onComplete != null) { + MtbTCol value = values != null && values.size() > 0 ? values.get(0) : null; + onComplete.run(value); + } + } + + @Override + public void onFailed(Exception ex) { + if(onFailed != null) onFailed.run(ex); + } + }); + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumerService.java new file mode 100644 index 00000000..18b07b0f --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MagazzinoRESTConsumerService.java @@ -0,0 +1,4 @@ +package it.integry.integrywmsnative.core.rest.consumers; + +public interface MagazzinoRESTConsumerService { +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java index de25868a..976394c3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.core.utility; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import android.text.SpannableString; @@ -14,12 +15,12 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class UtilityExceptions { - public static void defaultException(Context context, Exception ex, ProgressDialog progressDialog){ + public static void defaultException(Context context, Exception ex, Dialog progressDialog){ progressDialog.dismiss(); defaultException(context, ex); } - public static void defaultException(Context context, Exception ex, ProgressDialog progressDialog, boolean sendMail){ + public static void defaultException(Context context, Exception ex, Dialog progressDialog, boolean sendMail){ progressDialog.dismiss(); defaultException(context, ex, sendMail); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java index 96049ebd..6ac2a5e2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java @@ -1,17 +1,47 @@ package it.integry.integrywmsnative.core.utility; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; +import android.widget.ProgressBar; import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.view.dialogs.DialogProgress; public class UtilityProgress { - public static ProgressDialog createDefaultProgressDialog(Context mContext) { - final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting), - mContext.getText(R.string.loading) + " ...", true); + public static Dialog createDefaultProgressDialog(Context mContext) { +// final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting), +// mContext.getText(R.string.loading) + " ...", true); +// +// return progress; + Dialog progress = DialogProgress.make(mContext); + progress.show(); return progress; } + + public static Thread makeProgressBarIndeterminate(ProgressBar progressBar) { + progressBar.setMax(100); + + Thread updateProgressThread = new Thread(() -> { + + try { + while (true) { + for (int i = 0; i < 100; i++) { + progressBar.setProgress(i); + Thread.sleep(10); + } + } + } catch (Exception ex) { +// String message = ex.toString(); + } + }); + + updateProgressThread.start(); + + return updateProgressThread; + } + } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java index e018cc91..6b29ee4d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.gest.accettazione; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; @@ -29,6 +30,7 @@ import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.ISearcableFragment; +import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.FragmentMainAccettazioneBinding; import it.integry.integrywmsnative.gest.accettazione.core.AccettazioneHelper; import it.integry.integrywmsnative.gest.accettazione.core.MainListAccettazioneAdapter; @@ -120,7 +122,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag private void init() { - final ProgressDialog progress = ProgressDialog.show(getActivity(), getText(R.string.waiting), getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); mHelper = new AccettazioneHelper(getActivity()); @@ -194,8 +196,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag if(!barcodes.contains(ordine.getBarcode())) barcodes.add(ordine.getBarcode()); } - final ProgressDialog progress = ProgressDialog.show(getActivity(), getText(R.string.waiting), - getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); mHelper.retrievePickingList(barcodes, ordini -> { progress.dismiss(); 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 2cece163..087764fa 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 @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.viewmodel; +import android.app.Dialog; import android.app.ProgressDialog; import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableField; @@ -235,7 +236,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC public RunnableArgs onScanSuccessfull = data -> { - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mActivity); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mActivity); BarcodeManager.disable(); if(UtilityBarcode.isEtichettaAnonima(data)){ @@ -262,7 +263,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC }; - private void executeEtichettaAnonima(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaAnonima(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { ColliMagazzinoRESTConsumer.getBySSCC(barcodeScanDTO.getStringValue(), false, false, mtbColt -> { if(mtbColt == null) { @@ -288,7 +289,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC } - private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { BarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> { String barcodeProd = null; @@ -314,7 +315,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC }); } - private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { try { Ean13PesoModel ean13PesoModel = Ean13PesoModel.fromBarcode(barcodeScanDTO.getStringValue()); @@ -328,7 +329,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC - private void loadArticolo(String barcodeProd, Ean128Model ean128Model, ProgressDialog progressDialog) { + private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Dialog progressDialog) { if(barcodeProd.length() == 14) { // barcodeProd = UtilityBarcode.convertITF14toNeutral(barcodeProd); barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); @@ -430,7 +431,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC this.createNewUL(null, null, null, false, null); } - public void createNewUL(Integer customNumCollo, String customSerCollo, ProgressDialog progress, boolean disablePrint, Runnable onComplete) { + public void createNewUL(Integer customNumCollo, String customSerCollo, Dialog progress, boolean disablePrint, Runnable onComplete) { mActivity.bindings.accettazioneOrdineInevasoFab.close(true); @@ -438,7 +439,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC progress = UtilityProgress.createDefaultProgressDialog(mActivity); } - ProgressDialog finalProgress = progress; + Dialog finalProgress = progress; NoteAggiuntiveNuovaULDialog.make(mActivity, new NoteAggiuntiveNuovaULDialog.Callback() { @Override public void onSuccess(String noteString) { @@ -554,8 +555,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC //Al click di "Mostra UL già create" public void showCreatedUL() { - final ProgressDialog progress = ProgressDialog.show(mActivity, mActivity.getText(R.string.waiting), - mActivity.getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); mActivity.bindings.accettazioneOrdineInevasoFab.close(false); @@ -575,14 +575,20 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC } @Override - public void onColloClosed(Runnable onComplete) { + public void onColloClosed(Runnable onComplete, boolean shouldPrint) { if(thereIsAnOpenedUL()) { - final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); progress.show(); if(thereIsAnyRowInUL()) { - updateDataFine(progress, () -> printCollo(progress, onComplete)); + updateDataFine(progress, () -> { + if(shouldPrint) printCollo(progress, onComplete); + else { + postCloseOperations(onComplete); + progress.dismiss(); + } + }); } else { deleteCollo(progress, onComplete); } @@ -593,7 +599,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC } - private void updateDataFine(ProgressDialog progress, Runnable onComplete) { + private void updateDataFine(Dialog progress, Runnable onComplete) { MtbColt cloneMtbColt = (MtbColt) getColloRef().clone(); cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE); @@ -614,7 +620,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC } - private void printCollo(ProgressDialog progress, Runnable onComplete) { + private void printCollo(Dialog progress, Runnable onComplete) { MtbColt currentMtbColt = mArticoliInColloBottomSheetViewModel.mtbColt.get(); if(currentMtbColt.getDisablePrint()){ @@ -671,7 +677,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC } - private void deleteCollo(ProgressDialog progress, Runnable onComplete) { + private void deleteCollo(Dialog progress, Runnable onComplete) { ColliMagazzinoRESTConsumer.deleteCollo(getColloRef(), () -> { mArticoliInColloBottomSheetViewModel.mtbColt.set(null); @@ -842,9 +848,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC } private void onOrdineRowDispatched(OrdineAccettazioneDTO.Riga item, QuantityDTO quantityDTO, boolean closeLU){ - - final ProgressDialog progress = ProgressDialog.show(mActivity, mActivity.getText(R.string.waiting), - mActivity.getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); String gestioneRif = item.getGestioneOrdEnum() == GestioneEnum.PRODUZIONE ? "L" : item.getGestioneOrd(); @@ -894,7 +898,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC FBToast.successToast(mActivity, mActivity.getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); progress.dismiss(); - if(closeLU) onColloClosed(null); + if(closeLU) onColloClosed(null, true); } @Override @@ -919,7 +923,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC if(getColloRef() != null) { - ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); + Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); MtbColr mtbColrToEditOfAccettazione = Stream.of(getColloRef().getMtbColr()) .filter(x -> x.getQtaCol().compareTo(oldValue.getQtaCol()) == 0 && @@ -951,7 +955,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC if(getColloRef() != null) { - ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); + Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); MtbColr mtbColrToDeleteOfAccettazione = Stream.of(getColloRef().getMtbColr()) .filter(x -> x.getQtaCol().compareTo(deletedValue.getQtaCol()) == 0 && diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java index 901c17f6..efd3fc97 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.gest.contenuto_bancale.viewmodel; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Intent; import android.content.res.Resources; @@ -20,6 +21,7 @@ import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.report.ReportManager; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity; import it.integry.integrywmsnative.gest.contenuto_bancale.core.ContenutoBancaleListAdapter; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; @@ -97,9 +99,7 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked public void printUL() { mContext.bindings.contenutoBancaleFab.close(true); - - final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting), - mContext.getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), mPrinterType, value -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java index efe91b42..38a68006 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.gest.lista_bancali.viewmodel; +import android.app.Dialog; import android.app.ProgressDialog; import androidx.databinding.ObservableArrayList; @@ -15,6 +16,7 @@ import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity; import it.integry.integrywmsnative.gest.lista_bancali.core.MainListListaColliAdapter; @@ -53,8 +55,7 @@ public class ListaBancaliViewModel implements IRecyclerItemClicked { @Override public void onItemClick(MtbColt item, int position) { - final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting), - mContext.getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); try { ColliMagazzinoRESTConsumer.getByTestata(item, true, false, mtbColt -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java index 66389586..c090af84 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.gest.login.viewmodel; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Intent; import androidx.appcompat.app.AlertDialog; @@ -50,7 +51,7 @@ public class LoginViewModel { private LoginActivity mActivity; private MainContext mMainContext; - private ProgressDialog mProgress; + private Dialog mProgress; public LoginViewModel(LoginActivity activity, MainContext mainContext) { this.mActivity = activity; @@ -86,8 +87,7 @@ public class LoginViewModel { if(areValidData){ loginButtonEnabled.set(false); - mProgress = ProgressDialog.show(mActivity, mActivity.getText(R.string.waiting), - mActivity.getText(R.string.loading) + " ...", true); + mProgress = UtilityProgress.createDefaultProgressDialog(mActivity); final LoginHelper loginHelper = new LoginHelper(mActivity, codAzienda.get(), username.get(), password.get()); @@ -241,7 +241,7 @@ public class LoginViewModel { SettingsManager.update(); - ProgressDialog loadingProgress = UtilityProgress.createDefaultProgressDialog(mActivity); + Dialog loadingProgress = UtilityProgress.createDefaultProgressDialog(mActivity); mMainContext.init(() -> { loadingProgress.dismiss(); mActivity.finish(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java index 432b8f77..a3a9e88f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.gest.picking_libero.viewmodel; import android.app.Activity; +import android.app.Dialog; import android.app.ProgressDialog; import android.text.SpannableString; import android.view.View; @@ -222,7 +223,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { public RunnableArgs onScanSuccessfull = data -> { - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); BarcodeManager.disable(); if(!thereIsAnOpenedUL.get()) { @@ -240,7 +241,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { }; - private void executeEtichetteBehaviour(BarcodeScanDTO data, ProgressDialog progressDialog){ + private void executeEtichetteBehaviour(BarcodeScanDTO data, Dialog progressDialog){ if(UtilityBarcode.isEtichettaAnonima(data)){ //Cerco gli articoli presenti nell'ul dell'etichetta anonima this.executeEtichettaLU(data.getStringValue(), progressDialog); @@ -260,7 +261,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { } } - private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { try { Ean13PesoModel ean13PesoModel = Ean13PesoModel.fromBarcode(barcodeScanDTO.getStringValue()); @@ -273,7 +274,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { } - private void executeEtichettaLU(String sscc, ProgressDialog progressDialog) { + private void executeEtichettaLU(String sscc, Dialog progressDialog) { ColliMagazzinoRESTConsumer.getBySSCC(sscc, true, false, mtbColtScanned -> { if(mtbColtScanned == null) { @@ -299,7 +300,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { } - private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { BarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> { String barcodeProd = null; @@ -341,7 +342,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { } - private void loadArticolo(String barcodeProd, Ean128Model ean128Model, ProgressDialog progressDialog) { + private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Dialog progressDialog) { if(barcodeProd.length() == 14) { // barcodeProd = UtilityBarcode.convertITF14toNeutral(barcodeProd); barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); @@ -453,7 +454,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { } - private void pickMerceULtoUL(MtbColt sourceMtbColt, MtbColt destMtbColt, ProgressDialog progressDialog) { + private void pickMerceULtoUL(MtbColt sourceMtbColt, MtbColt destMtbColt, Dialog progressDialog) { List mtbColrsToPick = Stream.of(sourceMtbColt.getMtbColr()) .filter(x -> x.getQtaCol().floatValue() > 0) .toList(); @@ -558,7 +559,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { mtbColtToSave.getMtbColr().get(i).setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); } - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); ColliMagazzinoRESTConsumer.saveCollo(mtbColtToSave, value -> { mtbColt.get().getMtbColr().addAll(mtbColtToSave.getMtbColr()); @@ -602,7 +603,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { createNewLU(null, null, null, null, null); } - private void createNewLU(Integer customNumCollo, String customSerCollo, ProgressDialog progressDialog, Runnable onComplete, Runnable onFailed) { + private void createNewLU(Integer customNumCollo, String customSerCollo, Dialog progressDialog, Runnable onComplete, Runnable onFailed) { if(SettingsManager.iDB().isFlagAskClienteInPickingLibero()){ @@ -618,10 +619,10 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { } - private void createNewLUInternal(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, ProgressDialog progressDialog, Runnable onComplete, Runnable onFailed) { + private void createNewLUInternal(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, Dialog progressDialog, Runnable onComplete, Runnable onFailed) { boolean shouldCloseProgress = progressDialog == null; - final ProgressDialog progressDialogFinal = progressDialog == null ? UtilityProgress.createDefaultProgressDialog(mContext) : progressDialog; + final Dialog progressDialogFinal = progressDialog == null ? UtilityProgress.createDefaultProgressDialog(mContext) : progressDialog; MtbColt mtbColt = new MtbColt(); mtbColt.initDefaultFields(); @@ -668,7 +669,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { public void closeLU() { if(thereIsAnOpenedUL.get()) { - final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mContext); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); if(thereIsAnyRowInUL.get()) { updateDataFine(progress, () -> { @@ -682,7 +683,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { } } - private void updateDataFine(ProgressDialog progress, Runnable onComplete) { + private void updateDataFine(Dialog progress, Runnable onComplete) { MtbColt cloneMtbColt = (MtbColt) this.mtbColt.get().clone(); cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE); @@ -703,7 +704,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { } - private void deleteCollo(ProgressDialog progress) { + private void deleteCollo(Dialog progress) { //La delete è stata commentata poichè visto che nel WMS vengono sempre presi i RESIDUI, //controllare che non ci siano righe per poter cancellare il collo era errato. @@ -748,7 +749,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { mtbColtClone.getMtbColr().add(mtbColrToDeleteClone); mtbColtClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); ColliMagazzinoRESTConsumer.saveCollo(mtbColtClone, value -> { progressDialog.dismiss(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index 5859f1b0..aee7b8d8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -7,7 +7,7 @@ import androidx.databinding.ObservableField; import androidx.databinding.ObservableList; import androidx.recyclerview.widget.LinearLayoutManager; -import android.app.ProgressDialog; +import android.app.Dialog; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -135,7 +135,7 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC this.mBinding.elevatedToolbar.setRecyclerView(this.mBinding.mainList); - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(this); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(this); UltimeConsegneClienteRESTConsumer.loadDocRowFromConsegna(mDocumentiResiList, dtbDocrToPick -> { progressDialog.dismiss(); this.mDtbDocrList.addAll(dtbDocrToPick); @@ -194,7 +194,7 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC this.createNewUL(null, null, null, false, true, null); } - public void createNewUL(Integer customNumCollo, String customSerCollo, ProgressDialog progress, boolean disablePrint, boolean closeProgress, Runnable onComplete) { + public void createNewUL(Integer customNumCollo, String customSerCollo, Dialog progress, boolean disablePrint, boolean closeProgress, Runnable onComplete) { this.mBinding.mainFab.close(true); if (progress == null){ @@ -219,7 +219,7 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC } - ProgressDialog finalProgress = progress; + Dialog finalProgress = progress; ColliMagazzinoRESTConsumer.saveCollo(mtbColt, value -> { value.setDisablePrint(disablePrint); @@ -326,7 +326,7 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC private void onOrdineRowDispatched(WithdrawableDtbDocr item, QuantityDTO quantityDTO, boolean closeUL){ - final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(this); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(this); final MtbColr mtbColr = new MtbColr() .setCodMart(item.getCodMart()) @@ -380,10 +380,10 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC @Override - public void onColloClosed(Runnable onComplete) { + public void onColloClosed(Runnable onComplete, boolean shouldPrint) { if(thereIsAnOpenedUL()) { - final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(this); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(this); progress.show(); if(thereIsAnyRowInUL()) { @@ -430,7 +430,7 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC } } - private void printCollo(ProgressDialog progress, MtbColt mtbColtToPrint, Runnable onComplete) { + private void printCollo(Dialog progress, MtbColt mtbColtToPrint, Runnable onComplete) { DialogAskShouldPrint.make(this, "Packing List", shouldPrint -> { if(shouldPrint) { @@ -516,7 +516,7 @@ public class PickingResiActivity extends AppCompatActivity implements IOnColloC } - private void deleteCollo(ProgressDialog progress, Runnable onComplete) { + private void deleteCollo(Dialog progress, Runnable onComplete) { ColliMagazzinoRESTConsumer.deleteCollo(currentMtbColt.get(), () -> { setULToCurrentContext(null); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java index 27f70062..0e5a9d1d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.gest.prod_ord_lavorazione; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; @@ -32,6 +33,7 @@ import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityToast; import it.integry.integrywmsnative.databinding.FragmentProdOrdineLavorazioneElencoBinding; import it.integry.integrywmsnative.gest.prod_ord_lavorazione.core.ProdOrdineLavorazioneHelper; @@ -112,9 +114,7 @@ public class ProdOrdineLavorazioneElencoFragment extends Fragment implements ITi private void init(){ - - final ProgressDialog progress = ProgressDialog.show(getActivity(), getText(R.string.waiting), - getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); mHelper = new ProdOrdineLavorazioneHelper(getActivity()); // mViewModel = new VenditaViewModel(getActivity(), this, mBinding, mHelper); @@ -203,8 +203,7 @@ public class ProdOrdineLavorazioneElencoFragment extends Fragment implements ITi else if(!dataCons.equalsIgnoreCase(ordine.getDataConsS())) dataCons = ""; } - final ProgressDialog progress = ProgressDialog.show(getActivity(), getText(R.string.waiting), - getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); final String finalDataCons = dataCons; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java index 8d468d06..0c073caf 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.gest.prod_ord_produzione; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; @@ -30,6 +31,7 @@ import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; +import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.FragmentProdOrdineProduzioneElencoBinding; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; @@ -105,7 +107,7 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit private void init() { - final ProgressDialog progress = ProgressDialog.show(getActivity(), getText(R.string.waiting), getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); mHelper = new OrdineProduzioneHelper(getActivity()); @@ -186,8 +188,7 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit if(!barcodes.contains(ordine.getBarcode())) barcodes.add(ordine.getBarcode()); } - final ProgressDialog progress = ProgressDialog.show(getActivity(), getText(R.string.waiting), - getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); mHelper.retrievePickingList(barcodes, ordini -> { progress.dismiss(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java index 2f2c7c08..b53f1ee2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java @@ -33,9 +33,6 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr private ProdRecuperoMaterialeViewModel mViewmodel; private ProdRecuperoMaterialeHelper mHelper; - private int mBarcodeScannerIstanceID; - - public ProdRecuperoMaterialeFragment() { // Required empty public constructor } @@ -70,8 +67,6 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr mViewmodel.init(getActivity(), mBinding, mHelper, () -> { ((IPoppableActivity) getActivity()).pop(); }); - - initBarcode(); } @@ -84,16 +79,7 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr @Override public void onDestroy() { - BarcodeManager.removeCallback(mBarcodeScannerIstanceID); super.onDestroy(); } - - private void initBarcode() { - mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO() - .setOnScanSuccessfull(mViewmodel.onScanSuccessfull) - .setOnScanFailed(ex -> UtilityExceptions.defaultException(getActivity(), ex, false))); - - } - } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java index 6c80ab79..428cd6b9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.viewmodel; import android.app.Activity; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import android.text.Html; @@ -75,28 +76,6 @@ public class ProdRecuperoMaterialeViewModel { refreshAdapter(); } - public RunnableArgs onScanSuccessfull = data -> { - - BarcodeManager.disable(); - - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); - -// if(UtilityBarcode.isEtichettaPosizione(data)){ -// progressDialog.show(); -// this.executeEtichettaPosizione(data, progressDialog); -// } else if(data.getType() == BarcodeType.EAN8 || data.getType() == BarcodeType.EAN13 || data.getType() == BarcodeType.UPCA){ -// //searchArtInt(data.getStringValue()); -// } else if(UtilityBarcode.isEtichettaAnonima(data)) { -// this.executeEtichettaLU(data.getStringValue(), true, progressDialog); -// }else if(UtilityBarcode.isEtichetta128(data)) { -// this.executeEtichettaEan128(data, progressDialog); -// } else { -// BarcodeManager.enable(); -// } - - - }; - public void setMtbColt(MtbColt mtbColt) { this.mtbColt.set(mtbColt); @@ -142,7 +121,7 @@ public class ProdRecuperoMaterialeViewModel { private void onItemDispatched(HistoryVersamentoProdUL item, BigDecimal quantity) { - final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mContext); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); final MtbColt mtbColtScarico = new MtbColt() .setDataCollo(item.getDataCollo()) @@ -240,7 +219,7 @@ public class ProdRecuperoMaterialeViewModel { } - private void printCollo(ProgressDialog progress, MtbColt mtbColtToPrint, Runnable onComplete) { + private void printCollo(Dialog progress, MtbColt mtbColtToPrint, Runnable onComplete) { PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, printerList -> { @@ -292,7 +271,7 @@ public class ProdRecuperoMaterialeViewModel { private void refreshAdapter() { - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); mHelper.loadLastULVersate(historyULs -> { this.mDataset = historyULs; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java index 759a34e2..ccb4a128 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.gest.prod_versamento_materiale.viewmodel; import android.app.Activity; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import android.text.Html; @@ -96,7 +97,7 @@ public class ProdVersamentoMaterialViewModel { private void createColloScarico(MtbDepoPosizione mtbDepoPosizione) { - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); MtbColt cloneUL = ((MtbColt) mtbColt.get().clone()); cloneUL.setCodJfas(mtbDepoPosizione.getPosizione()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java index 361ac832..a551efec 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.gest.rettifica_giacenze.core; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; @@ -28,7 +29,7 @@ public class RettificaGiacenzeHelper { public void loadListaFornitori(RunnableArgs> onComplete) { - final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mContext); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); //progress.show(); String sql = "SELECT cod_alis as 'codAlis', descrizione FROM atb_list WHERE flag_attivo = 'S'"; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index 9b3a2d5b..ec933196 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.gest.rettifica_giacenze.viewmodel; import android.app.Activity; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.res.Resources; import androidx.databinding.ObservableArrayList; @@ -163,7 +164,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked BarcodeManager.disable(); - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); if(data.getType() == BarcodeType.EAN8 || data.getType() == BarcodeType.EAN13 || data.getType() == BarcodeType.UPCA){ searchArtInt(data.getStringValue(), progressDialog); @@ -177,7 +178,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked }; - private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { BarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> { String barcodeProd = null; @@ -203,7 +204,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked } - private void loadBarcodeArticolo(String barcodeProd, Ean128Model ean128Model, ProgressDialog progressDialog) { + private void loadBarcodeArticolo(String barcodeProd, Ean128Model ean128Model, Dialog progressDialog) { if(barcodeProd.length() == 14) { // barcodeProd = UtilityBarcode.convertITF14toNeutral(barcodeProd); barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); @@ -302,7 +303,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked } private void searchArtFor(String codAlis, String queryText) { - final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + final Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); //progressDialog.show(); mHelper.searchArtForn(codAlis, queryText, listaArts -> { @@ -314,7 +315,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked }, ex -> UtilityExceptions.defaultException(mContext, ex, progressDialog)); } - private void searchArtInt(String queryText, ProgressDialog progressDialog) { + private void searchArtInt(String queryText, Dialog progressDialog) { //progressDialog.show(); mHelper.searchArtInt(queryText, listaArts -> { @@ -410,8 +411,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked private void onPostDispatch(MtbAart mtbAart, QuantityDTO quantityDTO) { - final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting), - mContext.getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); final MtbColr mtbColr = new MtbColr() .setCodMart(mtbAart.getCodMart()) @@ -500,7 +500,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked if(thereIsAnOpenedUL()) { - final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mContext); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); if (thereIsAnyRowInUL()) { @@ -541,7 +541,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked } } - private void saveCausaleRettificaGiacenze(ProgressDialog progress, Runnable onComplete) { + private void saveCausaleRettificaGiacenze(Dialog progress, Runnable onComplete) { final MtbCols mtbCols = new MtbCols() .setCausale(SettingsManager.iDB().getDefaultCausaleRettificaGiacenze()); @@ -627,7 +627,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked mtbColtClone.getMtbColr().add(mtbColrToEditClone); mtbColtClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); ColliMagazzinoRESTConsumer.saveCollo(mtbColtClone, valueNewMtbColt -> { progressDialog.dismiss(); @@ -664,7 +664,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked mtbColtClone.getMtbColr().add(mtbColrToDeleteClone); mtbColtClone.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); ColliMagazzinoRESTConsumer.saveCollo(mtbColtClone, value -> { progressDialog.dismiss(); @@ -676,7 +676,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked - private void printCollo(ProgressDialog progress) { + private void printCollo(Dialog progress) { this.showAskPrint(shouldPrint -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java index d1c168bb..b52a919b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.gest.ultime_consegne_cliente.viewmodel; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; @@ -40,7 +41,7 @@ public class UltimeConsegneClienteViewModel { private void initList() { - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); UltimeConsegneClienteRESTConsumer.getUltimeConsegneClienti( SettingsManager.i().userSession.depo.getCodMdep(), diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java index ee718b15..99f0d58e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.gest.ultime_consegne_fornitore; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import android.os.Bundle; @@ -108,7 +109,7 @@ public class UltimeConsegneFornitoreFragment extends Fragment implements ITitled } private void initList() { - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(getActivity()); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(getActivity()); UltimeConsegneFornitoreRESTConsumer.getUltimeConsegneFornitori( SettingsManager.i().userSession.depo.getCodMdep(), diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java index 893db7a1..05e46535 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.gest.vendita; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; @@ -35,6 +36,7 @@ import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityToast; import it.integry.integrywmsnative.databinding.FragmentMainVenditaBinding; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; @@ -129,8 +131,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS private void init(){ - final ProgressDialog progress = ProgressDialog.show(getActivity(), getText(R.string.waiting), - getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); mHelper = new VenditaHelper(getActivity()); mViewModel = new VenditaViewModel(getActivity(), this, mBinding, mHelper); @@ -217,8 +218,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS else if(!dataCons.equalsIgnoreCase(ordine.getDataConsS())) dataCons = ""; } - final ProgressDialog progress = ProgressDialog.show(getActivity(), getText(R.string.waiting), - getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); final String finalDataCons = dataCons; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java index ecca57a8..ea315961 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java @@ -38,8 +38,9 @@ public class PickingObjectDTO implements Parcelable { private BigDecimal numCnf; private String codAlis; private BigDecimal colliPedana; - private BigDecimal qtaColloDisponibile; - private BigDecimal numCnfColloDisponibile; + private BigDecimal qtaDisponibileCollo; + private BigDecimal numCnfDisponibileCollo; + private String codTcol; private MtbAart mtbAart; @@ -98,14 +99,14 @@ public class PickingObjectDTO implements Parcelable { numCnfCollo = new BigDecimal(in.readFloat()); } if (in.readByte() == 0) { - qtaColloDisponibile = null; + qtaDisponibileCollo = null; } else { - qtaColloDisponibile = new BigDecimal(in.readFloat()); + qtaDisponibileCollo = new BigDecimal(in.readFloat()); } if (in.readByte() == 0) { - numCnfColloDisponibile = null; + numCnfDisponibileCollo = null; } else { - numCnfColloDisponibile = new BigDecimal(in.readFloat()); + numCnfDisponibileCollo = new BigDecimal(in.readFloat()); } @@ -176,17 +177,17 @@ public class PickingObjectDTO implements Parcelable { dest.writeByte((byte) (0x01)); dest.writeFloat(numCnfCollo.floatValue()); } - if (qtaColloDisponibile == null) { + if (qtaDisponibileCollo == null) { dest.writeByte((byte) (0x00)); } else { dest.writeByte((byte) (0x01)); - dest.writeFloat(qtaColloDisponibile.floatValue()); + dest.writeFloat(qtaDisponibileCollo.floatValue()); } - if (numCnfColloDisponibile == null) { + if (numCnfDisponibileCollo == null) { dest.writeByte((byte) (0x00)); } else { dest.writeByte((byte) (0x01)); - dest.writeFloat(numCnfColloDisponibile.floatValue()); + dest.writeFloat(numCnfDisponibileCollo.floatValue()); } dest.writeValue(mtbAart); @@ -410,21 +411,30 @@ public class PickingObjectDTO implements Parcelable { return this; } - public BigDecimal getQtaColloDisponibile() { - return qtaColloDisponibile; + public BigDecimal getQtaDisponibileCollo() { + return qtaDisponibileCollo; } - public PickingObjectDTO setQtaColloDisponibile(BigDecimal qtaColloDisponibile) { - this.qtaColloDisponibile = qtaColloDisponibile; + public PickingObjectDTO setQtaDisponibileCollo(BigDecimal qtaDisponibileCollo) { + this.qtaDisponibileCollo = qtaDisponibileCollo; return this; } - public BigDecimal getNumCnfColloDisponibile() { - return numCnfColloDisponibile; + public BigDecimal getNumCnfDisponibileCollo() { + return numCnfDisponibileCollo; } - public PickingObjectDTO setNumCnfColloDisponibile(BigDecimal numCnfColloDisponibile) { - this.numCnfColloDisponibile = numCnfColloDisponibile; + public PickingObjectDTO setNumCnfDisponibileCollo(BigDecimal numCnfDisponibileCollo) { + this.numCnfDisponibileCollo = numCnfDisponibileCollo; + return this; + } + + public String getCodTcol() { + return codTcol; + } + + public PickingObjectDTO setCodTcol(String codTcol) { + this.codTcol = codTcol; return this; } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java index 25b2a6de..85bbfcbd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.gest.vendita.viewmodel; import android.app.Activity; +import android.app.Dialog; import android.app.ProgressDialog; import android.text.Html; import android.text.SpannableString; @@ -53,7 +54,7 @@ public class VenditaViewModel { public RunnableArgs onScanSuccessfull = data -> { BarcodeManager.disable(); - final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + final Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); if(UtilityBarcode.isEtichettaAnonima(data)) { this.executeEtichettaLU(data.getStringValue(), progressDialog); @@ -66,7 +67,7 @@ public class VenditaViewModel { }; - private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { BarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> { String barcodeProd = null; @@ -101,7 +102,7 @@ public class VenditaViewModel { } - private void executeEtichettaLU(String SSCC, ProgressDialog progressDialog) { + private void executeEtichettaLU(String SSCC, Dialog progressDialog) { ColliMagazzinoRESTConsumer.getBySSCC(SSCC, true, false, mtbColt -> { if(mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index aaa3c158..e9eb0ab2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.gest.vendita_ordine_inevaso.viewmodel; +import android.app.Dialog; import android.app.ProgressDialog; import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableField; @@ -23,6 +24,7 @@ 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.MagazzinoRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.rest.model.Ean128Model; @@ -373,7 +375,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO public RunnableArgs onScanSuccessfull = data -> { - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mActivity); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mActivity); BarcodeManager.disable(); @@ -431,7 +433,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO }; - private void executeEtichettaAnonimaNotOpenedLU(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaAnonimaNotOpenedLU(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { ColliMagazzinoRESTConsumer.getBySSCC(barcodeScanDTO.getStringValue(), true, false, mtbColt -> { if(mtbColt == null) { @@ -465,7 +467,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO }); } - private void executeEtichettaPosizione(String posizione, ProgressDialog progressDialog) { + private void executeEtichettaPosizione(String posizione, Dialog progressDialog) { MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(posizione); @@ -525,7 +527,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } - private void executeEtichettaLU(String SSCC, ProgressDialog progressDialog) { + private void executeEtichettaLU(String SSCC, Dialog progressDialog) { ColliMagazzinoRESTConsumer.getBySSCC(SSCC, true, false, mtbColt -> { @@ -546,7 +548,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } - private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { BarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> { String barcodeProd = null; @@ -583,7 +585,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } - private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { try { Ean13PesoModel ean13PesoModel = Ean13PesoModel.fromBarcode(barcodeScanDTO.getStringValue()); @@ -595,7 +597,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } } - private void loadArticolo(String barcodeProd, PickingObjectDTO.PickData pickData, ProgressDialog progressDialog) { + private void loadArticolo(String barcodeProd, PickingObjectDTO.PickData pickData, Dialog progressDialog) { if(barcodeProd.length() == 14) { barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); } @@ -638,7 +640,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } - private void searchArtFromUL(MtbColt scannedUL, ProgressDialog progressDialog) { + private void searchArtFromUL(MtbColt scannedUL, Dialog progressDialog) { final List pickingList = mPickingList; @@ -814,7 +816,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO this.createNewUL(null, null, null, false, true, null); } - public void createNewUL(Integer customNumCollo, String customSerCollo, ProgressDialog progress, boolean disablePrint, boolean closeProgress, Runnable onComplete) { + public void createNewUL(Integer customNumCollo, String customSerCollo, Dialog progress, boolean disablePrint, boolean closeProgress, Runnable onComplete) { this.mBindings.venditaOrdineInevasoFab.close(true); if (progress == null){ @@ -847,7 +849,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO mtbColt.generaFiltroOrdineFromDTO(defaultFiltroOrdine); - ProgressDialog finalProgress = progress; + Dialog finalProgress = progress; ColliMagazzinoRESTConsumer.saveCollo(mtbColt, value -> { mtbColt @@ -886,18 +888,23 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } @Override - public void onColloClosed(Runnable onComplete) { + public void onColloClosed(Runnable onComplete, boolean shouldPrint) { if(thereIsAnOpenedUL()) { - final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); - progress.show(); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); if(thereIsAnyRowInUL()) { ColliMagazzinoRESTConsumer.updateDataFine( mActivity, progress, mArticoliInColloBottomSheetViewModel.mtbColt.get(), - () -> distribuisciCollo(progress, (generatedMtbColts) -> printCollo(progress, generatedMtbColts, onComplete))); + () -> distribuisciCollo(progress, (generatedMtbColts) -> { + if(shouldPrint) printCollo(progress, generatedMtbColts, onComplete); + else { + postCloseOperations(generatedMtbColts, onComplete); + progress.dismiss(); + } + })); } else { if(mtbColtSessionID != null) ColliDataRecover.closeSession(mtbColtSessionID); deleteCollo(progress, onComplete); @@ -910,7 +917,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } - private void distribuisciCollo(ProgressDialog progress, RunnableArgs> onComplete) { + private void distribuisciCollo(Dialog progress, RunnableArgs> onComplete) { MtbColt cloneMtbColt = (MtbColt) mArticoliInColloBottomSheetViewModel.mtbColt.get().clone(); @@ -931,7 +938,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO }); } - private void printCollo(ProgressDialog progress, List mtbColtsToPrint, Runnable onComplete) { + private void printCollo(Dialog progress, List mtbColtsToPrint, Runnable onComplete) { DialogAskShouldPrint.make(mActivity, "Packing List", shouldPrint -> { if(shouldPrint) { @@ -997,7 +1004,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } - private void deleteCollo(ProgressDialog progress, Runnable onComplete) { + private void deleteCollo(Dialog progress, Runnable onComplete) { ColliMagazzinoRESTConsumer.deleteCollo(mArticoliInColloBottomSheetViewModel.mtbColt.get(), () -> { mArticoliInColloBottomSheetViewModel.mtbColt.set(null); @@ -1026,8 +1033,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO private void postCloseOperations(List generatedMtbColt, Runnable onComplete) { - MtbColt mtbColt = mArticoliInColloBottomSheetViewModel.mtbColt.get(); - this.mColliRegistrati.addAll(generatedMtbColt); mArticoliInColloBottomSheetViewModel.mtbColt.set(null); @@ -1105,8 +1110,11 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO qtaTest.addAndGet(x.getQtaCol()); }); - BigDecimal qtaDisponibile = (item.isDeactivated() ? item.getQtaOrd() : item.getQtaCollo()).subtract(qtaTest.get()); + BigDecimal qtaDisponibile = (item.isDeactivated() ? item.getQtaOrd() : item.getQtaDisponibileCollo()).subtract(qtaTest.get()); + BigDecimal qtaTot = (item.isDeactivated() ? item.getQtaOrd() : item.getQtaCollo()).subtract(qtaTest.get()); + if(qtaDisponibile.floatValue() < 0) qtaDisponibile = BigDecimal.ZERO; + if(qtaTot.floatValue() < 0) qtaTot = BigDecimal.ZERO; DialogInputQuantity.DTO dto = new DialogInputQuantity.DTO() .setBatchLot(item.getPartitaMag()) @@ -1115,7 +1123,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO .setQtaOrd(item.getQtaOrd()) .setQtaDaEvadere(qtaDaEvadere) .setQtaDisponibile(qtaDisponibile) - .setQtaTot(qtaDisponibile) + .setQtaTot(qtaTot) .setQtaEvasa(new BigDecimal(qtaEvasaTotale)) .setCanPartitaMagBeChanged(item.isDeactivated()) .setMaxQta(qtaDisponibile); @@ -1181,7 +1189,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } private void onOrdineRowDispatched(PickingObjectDTO item, QuantityDTO quantityDTO, boolean closeUL){ - final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); final MtbColr mtbColr = new MtbColr() .setCodMart(item.getCodMart()) @@ -1219,8 +1227,58 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO cloneMtbColt.setMtbColr(new ObservableArrayList()); cloneMtbColt.getMtbColr().add(mtbColr); + + boolean shouldPrint = true; + //Se è l'unico articolo del collo + if(closeUL && mArticoliInColloBottomSheetViewModel.mtbColt.get().getMtbColr().size() == 0) { +// this.addTipoPedanaFromArt(item, cloneMtbColt, closeUL, progress); + shouldPrint = false; + if(UtilityString.isNullOrEmpty(cloneMtbColt.getCodTcol())) { + cloneMtbColt.setCodTcol(item.getCodTcol()); + cloneMtbColt.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); + } + } + + + onOrdineRowSave(item, cloneMtbColt, closeUL, !shouldPrint, progress); + + + + } + + private void addTipoPedanaFromArt(PickingObjectDTO item, MtbColt cloneMtbColt, boolean closeUL, Dialog progress) { + + String codTcol = item.getCodTcol(); + if(codTcol != null) { + MagazzinoRESTConsumer.getTipoCollo(codTcol, mtbTcol -> { + if (mtbTcol != null) { + final MtbColr mtbColr = new MtbColr() + .setCodMart(mtbTcol.getCodMart()) + .setQtaCol(BigDecimal.ONE) + .setDescrizione(mtbTcol.getDescrizione()) + .setDatetimeRow(UtilityDate.getDateInstance()); + mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); + cloneMtbColt.getMtbColr().add(mtbColr); + + onOrdineRowSave(item, cloneMtbColt, closeUL, true, progress); + } else { + onOrdineRowSave(item, cloneMtbColt, closeUL, false, progress); + } + }, ex -> { + UtilityExceptions.defaultException(mActivity, ex, progress); + }); + } else { + onOrdineRowSave(item, cloneMtbColt, closeUL, false, progress); + } + + } + + + private void onOrdineRowSave(PickingObjectDTO item, MtbColt cloneMtbColt, boolean closeUL, boolean hasTipoCollo, Dialog progress) { ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, value -> { + MtbColr mtbColr = cloneMtbColt.getMtbColr().get(0); + mtbColr .setDataCollo(value.getDataColloS()) .setNumCollo(value.getNumCollo()) @@ -1242,14 +1300,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO progress.dismiss(); - if(closeUL) onColloClosed(null); + if(closeUL) onColloClosed(null, !hasTipoCollo); }, ex -> { UtilityExceptions.defaultException(mActivity, ex, progress); }); } - private void addExtraItem() { DialogScanArt.make(mActivity, (status, mtbAart, ean128Model) -> { if(status == DialogConsts.Results.YES) { @@ -1318,8 +1375,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } private void onExtraItemDispatched(MtbAart item, QuantityDTO quantityDTO, boolean closeUL){ - final ProgressDialog progress = ProgressDialog.show(mActivity, mActivity.getText(R.string.waiting), - mActivity.getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity); final MtbColr mtbColr = new MtbColr() .setCodMart(item.getCodMart()) @@ -1361,7 +1417,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO progress.dismiss(); - if(closeUL) onColloClosed(null); + if(closeUL) onColloClosed(null, true); }, ex -> { UtilityExceptions.defaultException(mActivity, ex, progress); }); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java index dd75192a..a97860cd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.gest.versamento_merce.viewmodel; import android.app.Activity; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import androidx.databinding.ObservableArrayList; @@ -92,7 +93,7 @@ public class VersamentoMerceViewModel { BarcodeManager.disable(); - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); if(UtilityBarcode.isEtichettaPosizione(data)){ progressDialog.show(); @@ -110,7 +111,7 @@ public class VersamentoMerceViewModel { }; - private void executeEtichettaPosizione(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaPosizione(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { MtbDepoPosizione foundPosizione = Stream.of(SettingsManager.iDB().getAvailablePosizioni()) .filter(x -> x.getPosizione().equalsIgnoreCase(barcodeScanDTO.getStringValue())) .single(); @@ -144,7 +145,7 @@ public class VersamentoMerceViewModel { } } - private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { BarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> { String barcodeProd = null; @@ -179,7 +180,7 @@ public class VersamentoMerceViewModel { - private void executeEtichettaLU(String sscc, boolean isAnonima, ProgressDialog progressDialog) { + private void executeEtichettaLU(String sscc, boolean isAnonima, Dialog progressDialog) { ColliMagazzinoRESTConsumer.getBySSCC(sscc, true, false, mtbColt -> { if(mtbColt == null && !isAnonima) { @@ -213,7 +214,7 @@ public class VersamentoMerceViewModel { }); } - private void updatePosizione(MtbDepoPosizione mtbDepoPosizione, boolean shouldAskLivello, ProgressDialog progressDialog) { + private void updatePosizione(MtbDepoPosizione mtbDepoPosizione, boolean shouldAskLivello, Dialog progressDialog) { if(shouldAskLivello) { DialogAskLivelloPosizione.make(mContext, mtbDepoPosizione, false, newPosizione -> { @@ -243,7 +244,7 @@ public class VersamentoMerceViewModel { } - private void pickMerceULtoUL(MtbColt destMtbColt, ProgressDialog progressDialog) { + private void pickMerceULtoUL(MtbColt destMtbColt, Dialog progressDialog) { MtbColt sourceMtbColt = mtbColt.get(); List mtbColrsToPick = Stream.of(mtbColt.get().getMtbColr()) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/interfaces/IOnColloClosedCallback.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/interfaces/IOnColloClosedCallback.java index 161d4707..88dcaf96 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/interfaces/IOnColloClosedCallback.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/interfaces/IOnColloClosedCallback.java @@ -2,6 +2,6 @@ package it.integry.integrywmsnative.view.bottomsheet.interfaces; public interface IOnColloClosedCallback { - void onColloClosed(Runnable onComplete); + void onColloClosed(Runnable onComplete, boolean shouldPrint); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java index d0ce723f..3ba14ce7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.view.bottomsheet.viewmodel; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import androidx.databinding.DataBindingUtil; @@ -30,6 +31,7 @@ import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityNumber; +import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetBinding; import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetMtbcolrItemBinding; import it.integry.integrywmsnative.view.bottomsheet.ArticoliInColloBottomSheetHelper; @@ -135,7 +137,7 @@ public class ArticoliInColloBottomSheetViewModel { } public void closeCurrentUL(Runnable onComplete){ - if(onCloseColloCallback != null) onCloseColloCallback.onColloClosed(onComplete); + if(onCloseColloCallback != null) onCloseColloCallback.onColloClosed(onComplete, true); } public boolean isExpanded() { @@ -187,8 +189,7 @@ public class ArticoliInColloBottomSheetViewModel { DialogInputQuantity.makeBase(mContext, dto, false, quantityDTO -> { - final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting), - mContext.getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); itemToEdit.setQtaCol(quantityDTO.qtaTot.getBigDecimal()); @@ -212,8 +213,7 @@ public class ArticoliInColloBottomSheetViewModel { DialogSimpleMessageHelper.makeWarningDialog(mContext, new SpannableString(text), null, () -> { MtbColr itemToDelete = mtbColt.get().getMtbColr().get(position); - final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting), - mContext.getText(R.string.loading) + " ...", true); + final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); progress.show(); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgress.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgress.java new file mode 100644 index 00000000..ed58ea00 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgress.java @@ -0,0 +1,52 @@ +package it.integry.integrywmsnative.view.dialogs; + +import android.app.Dialog; +import android.content.Context; +import android.content.DialogInterface; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ProgressBar; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.utility.UtilityProgress; + +public class DialogProgress { + + private Context mContext; + + + private Dialog mDialog; + + public static Dialog make(Context context) { + return new DialogProgress(context).mDialog; + } + + + + public DialogProgress(Context context) { + mContext = context; + + LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); + View currentView = inflater.inflate(R.layout.dialog_progress, null, false); + + final Thread[] progressBarThread = new Thread[1]; + + mDialog = new Dialog(mContext); + mDialog.setContentView(currentView); + mDialog.setCanceledOnTouchOutside(false); + mDialog.setCancelable(false); + mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + + mDialog.setOnShowListener(dialog -> { +// ((ProgressBar) currentView.findViewById(R.id.progressBar)).setIndeterminate(true); + progressBarThread[0] = UtilityProgress.makeProgressBarIndeterminate(currentView.findViewById(R.id.progressBar)); + }); + + mDialog.setOnDismissListener(dialog -> { + progressBarThread[0].interrupt(); + }); + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java index af4e50f5..785e53da 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java @@ -199,7 +199,7 @@ public class DialogAskPositionOfLU { resetLevelError(); if(mtbColt != null) { - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); ColliMagazzinoRESTConsumer.changePosizione(mtbColt, foundPosizione, () -> { progressDialog.dismiss(); @@ -250,7 +250,7 @@ public class DialogAskPositionOfLU { private void updatePosizione(MtbDepoPosizione mtbDepoPosizione, Runnable onComplete, RunnableArgs onFailed) { - final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + final Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); ColliMagazzinoRESTConsumer.changePosizione(mtbColt, mtbDepoPosizione, () -> { progressDialog.dismiss(); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java index 6165f1e4..94e0ea14 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java @@ -154,7 +154,7 @@ public class DialogChooseArtsFromListaArts { private RunnableArgs onScanSuccessfull = data -> { BarcodeManager.disable(); - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(currentContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(currentContext); if(UtilityBarcode.isEan13(data)){ this.loadArticolo(data.getStringValue(), null, progressDialog); @@ -169,7 +169,7 @@ public class DialogChooseArtsFromListaArts { }; - private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { BarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> { String barcodeProd = null; @@ -208,7 +208,7 @@ public class DialogChooseArtsFromListaArts { - private void loadArticolo(String barcodeProd, Ean128Model ean128Model, ProgressDialog progressDialog) { + private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Dialog progressDialog) { if(barcodeProd.length() == 14) { barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java index 5c418283..dfe096ca 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java @@ -2,6 +2,7 @@ package it.integry.integrywmsnative.view.dialogs.input_quantity; import android.app.AlertDialog; import android.app.DatePickerDialog; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import android.content.res.ColorStateList; @@ -418,7 +419,7 @@ public class DialogInputQuantity { } } else if(UtilityBarcode.isEtichetta128(data)){ - final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(currentContext); + final Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(currentContext); BarcodeRESTConsumer.decodeEan128(data, ean128Model -> { progressDialog.dismiss(); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java index e3c309a0..014288c0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java @@ -83,7 +83,7 @@ public class DialogScanArt { private RunnableArgs onScanSuccessfull = data -> { - ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); BarcodeManager.disable(); @@ -101,7 +101,7 @@ public class DialogScanArt { - private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { BarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> { String barcodeProd = null; @@ -127,7 +127,7 @@ public class DialogScanArt { }); } - private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaEanPeso(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { try { Ean13PesoModel ean13PesoModel = Ean13PesoModel.fromBarcode(barcodeScanDTO.getStringValue()); @@ -141,7 +141,7 @@ public class DialogScanArt { - private void loadArticolo(String barcodeProd, Ean128Model ean128Model, ProgressDialog progressDialog) { + private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Dialog progressDialog) { if(barcodeProd.length() == 14) { // barcodeProd = UtilityBarcode.convertITF14toNeutral(barcodeProd); barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java index facf5564..7f468796 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java @@ -90,7 +90,7 @@ public class DialogScanOrCreateLU { mOnDialogDismiss = onDialogDismiss; mBinding.createNewLuButton.setOnClickListener(v -> { - final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + final Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); ColliMagazzinoRESTConsumer.createColloLavorazione(+1, createdMtbColt -> { sendMtbColt(createdMtbColt, progressDialog); @@ -120,7 +120,7 @@ public class DialogScanOrCreateLU { private RunnableArgs onScanSuccessfull = data -> { BarcodeManager.disable(); - final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + final Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); if(UtilityBarcode.isEtichettaPosizione(data)){ this.executeEtichettaPosizione(data, progressDialog); @@ -136,7 +136,7 @@ public class DialogScanOrCreateLU { }; - private void executeEtichettaPosizione(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaPosizione(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { MtbDepoPosizione foundPosizione = Stream.of(SettingsManager.iDB().getAvailablePosizioni()) .filter(x -> x.getPosizione().equalsIgnoreCase(barcodeScanDTO.getStringValue())) @@ -172,7 +172,7 @@ public class DialogScanOrCreateLU { } - private void executeEtichettaAnonima(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEtichettaAnonima(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { ColliMagazzinoRESTConsumer.getBySSCC(barcodeScanDTO.getStringValue(), mShouldCheckResiduo, false, mtbColt -> { if(mtbColt == null) { @@ -212,7 +212,7 @@ public class DialogScanOrCreateLU { } - private void executeEAN128(BarcodeScanDTO barcodeScanDTO, ProgressDialog progressDialog) { + private void executeEAN128(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { BarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> { if(ean128Model != null && !UtilityString.isNullOrEmpty(ean128Model.Sscc)) { @@ -275,7 +275,7 @@ public class DialogScanOrCreateLU { null, null).show(); } - private void sendMtbColt(MtbColt mtbColtToSend, ProgressDialog progressDialog) { + private void sendMtbColt(MtbColt mtbColtToSend, Dialog progressDialog) { currentMtbColt = mtbColtToSend; progressDialog.dismiss(); mDialog.dismiss(); diff --git a/app/src/main/res/layout/accettazione_main_list_group_clienti.xml b/app/src/main/res/layout/accettazione_main_list_group_clienti.xml index 06626c62..11b8cba3 100644 --- a/app/src/main/res/layout/accettazione_main_list_group_clienti.xml +++ b/app/src/main/res/layout/accettazione_main_list_group_clienti.xml @@ -1,25 +1,26 @@ - + - + android:paddingEnd="6dp" + tools:text="TextView" + style="@style/AppTheme.NewMaterial.Text.Small" /> - + android:layout_alignParentEnd="true" + tools:text="TextView" + style="@style/AppTheme.NewMaterial.Text.Small" /> \ No newline at end of file diff --git a/app/src/main/res/layout/accettazione_main_list_group_model.xml b/app/src/main/res/layout/accettazione_main_list_group_model.xml index 8cf888b5..432747ff 100644 --- a/app/src/main/res/layout/accettazione_main_list_group_model.xml +++ b/app/src/main/res/layout/accettazione_main_list_group_model.xml @@ -29,12 +29,13 @@ android:layout_height="wrap_content" android:layout_toEndOf="@id/accettazione_main_list_group_item_container_checkBox"> - + tools:text="Ord. Prod. 39 del 27 ott 2017" + android:textColor="#000" + style="@style/AppTheme.NewMaterial.Text.Small"/> + + style="@style/AppTheme.NewMaterial.Text.Medium" + tools:text="NOME GRUPPO"/> diff --git a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list___cod_art_for.xml b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list___cod_art_for.xml index 5204f59f..1c960ba9 100644 --- a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list___cod_art_for.xml +++ b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list___cod_art_for.xml @@ -1,8 +1,8 @@ - + android:layout_height="wrap_content" + xmlns:tools="http://schemas.android.com/tools"> - - @@ -15,24 +15,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> - + android:textStyle="bold" + style="@style/AppTheme.NewMaterial.Text.Small"/> - + android:textStyle="bold" + style="@style/AppTheme.NewMaterial.Text.Small" /> + android:gravity="end"> @@ -57,45 +59,46 @@ - + style="@style/AppTheme.NewMaterial.Text.Medium" + tools:text="QTA"/> - - + style="@style/AppTheme.NewMaterial.Text.Medium" + tools:text="QTA"/> - + style="@style/AppTheme.NewMaterial.Text.Medium" + tools:text="DESCRIZIONE"/> diff --git a/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml b/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml index e01814ba..c2551600 100644 --- a/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml +++ b/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml @@ -71,15 +71,16 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentStart="true" - android:layout_toLeftOf="@+id/remove_art_filter_list" + android:layout_toStartOf="@+id/remove_art_filter_list" android:orientation="vertical"> - - + + @@ -116,7 +118,6 @@ - > + - + android:textSize="16sp" + style="@style/AppTheme.NewMaterial.Text.Small" /> - + android:textStyle="bold" + style="@style/AppTheme.NewMaterial.Text.Small" /> - + style="@style/AppTheme.NewMaterial.Text.Small" /> - + android:textStyle="italic" + style="@style/AppTheme.NewMaterial.Text.Small" /> - + style="@style/AppTheme.NewMaterial.Text.Small" /> - + android:textStyle="bold" + style="@style/AppTheme.NewMaterial.Text.Small" /> - + style="@style/AppTheme.NewMaterial.Text.Small" /> - + android:textStyle="bold" + style="@style/AppTheme.NewMaterial.Text.Small" /> - + android:textStyle="bold" + style="@style/AppTheme.NewMaterial.Text.Small" /> diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 0447f070..bc5c3d07 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -61,7 +61,7 @@ app:layout_constraintRight_toLeftOf="@+id/guideline_right_progress" app:layout_constraintTop_toBottomOf="@id/imageView" /> - + android:layout_marginBottom="24dp" + style="@style/AppTheme.NewMaterial.Text.Small"/> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_progress.xml b/app/src/main/res/layout/dialog_progress.xml new file mode 100644 index 00000000..3275cdc9 --- /dev/null +++ b/app/src/main/res/layout/dialog_progress.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml index e28c711f..6104a51e 100644 --- a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml +++ b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml @@ -33,9 +33,9 @@ android:layout_height="wrap_content" android:text="@{mtbColr.codMart}" android:textColor="@color/colorPrimary" - android:textSize="14sp" android:textStyle="bold" - tools:text="COD MART" /> + tools:text="COD MART" + style="@style/AppTheme.NewMaterial.Text.Small" /> + tools:text="DIACOD HERE" + style="@style/AppTheme.NewMaterial.Text.Small" /> - + tools:text="Descrizione lunga articolo" + style="@style/AppTheme.NewMaterial.Text.Small" /> - + tools:text="Lotto: ABCDE" + style="@style/AppTheme.NewMaterial.Text.Small" /> @@ -97,7 +96,8 @@ android:textSize="16sp" android:textColor="@android:color/white" android:textStyle="bold" - tools:text="280.45\nCONF" /> + tools:text="280.45\nCONF" + style="@style/AppTheme.NewMaterial.Text.Small" /> diff --git a/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml b/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml index 9d43e141..8c75cc17 100644 --- a/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml +++ b/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml @@ -16,18 +16,20 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> - + android:textStyle="bold" + style="@style/AppTheme.NewMaterial.Text.Small"/> - + style="@style/AppTheme.NewMaterial.Text.Medium" + tools:text="QTA"/> - - + style="@style/AppTheme.NewMaterial.Text.Medium" + tools:text="QTA"/> - - - - + android:layout_alignParentEnd="true" + style="@style/AppTheme.NewMaterial.Text.Small"/> diff --git a/app/src/main/res/layout/vendita_ordine_inevaso_main_list_model.xml b/app/src/main/res/layout/vendita_ordine_inevaso_main_list_model.xml index 574fd228..1c255128 100644 --- a/app/src/main/res/layout/vendita_ordine_inevaso_main_list_model.xml +++ b/app/src/main/res/layout/vendita_ordine_inevaso_main_list_model.xml @@ -10,7 +10,7 @@ android:background="@color/mainGreen" android:orientation="vertical"> - + android:ellipsize="end" + style="@style/AppTheme.NewMaterial.Text.Medium" /> testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { + public void distribuisciCollo(Dialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { UtilityToast.showToast("Avviato metodo in BaseFeature"); ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(), diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java index 34d0f0f6..ec3ec92a 100644 --- a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java +++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java @@ -7,28 +7,50 @@ public class MenuConfigurationFRUDIS extends BaseMenuConfiguration { public MenuConfigurationFRUDIS() { - this.addGroup(new MenuGroup() - .setGroupText(it.integry.integrywmsnative.R.string.manufacture) + this + .addGroup( + new MenuGroup() + .setGroupText(it.integry.integrywmsnative.R.string.checkout) - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_produzione) - .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_produzione_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione)) + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_spedizione) + .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)) - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_lavorazione) - .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)) + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_free_picking) + .setTitleText(it.integry.integrywmsnative.R.string.free_picking) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero)) - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_versamento_materiale) - .setTitleText(it.integry.integrywmsnative.R.string.prod_versamento_materiale_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_versamento_materiale)) + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_resi_cliente) + .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_consegne_cliente_title) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery)) - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_recupero_materiale) - .setTitleText(it.integry.integrywmsnative.R.string.prod_recupero_materiale_title_fragment) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_recupero_materiale)) + ) + .addGroup(new MenuGroup() + + .setGroupText(it.integry.integrywmsnative.R.string.manufacture) + + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_produzione) + .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_produzione_title_fragment) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione)) + + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_lavorazione) + .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)) + + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_prod_versamento_materiale) + .setTitleText(it.integry.integrywmsnative.R.string.prod_versamento_materiale_title_fragment) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_versamento_materiale)) + + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_prod_recupero_materiale) + .setTitleText(it.integry.integrywmsnative.R.string.prod_recupero_materiale_title_fragment) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_recupero_materiale)) ); diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java index 11892df9..7200ed0c 100644 --- a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java @@ -1,5 +1,6 @@ package it.integry.wms.dynamic_customization.extensions; +import android.app.Dialog; import android.app.ProgressDialog; import java.util.List; @@ -16,7 +17,7 @@ public class OrdiniVendita implements IOrdiniVendita { @Override - public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { + public void distribuisciCollo(Dialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { UtilityToast.showToast("Avviato metodo in Frudis"); ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(), diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java index fcff9ab1..d23532d5 100644 --- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java @@ -1,5 +1,6 @@ package it.integry.wms.dynamic_customization.extensions; +import android.app.Dialog; import android.app.ProgressDialog; import java.util.List; @@ -16,7 +17,7 @@ public class OrdiniVendita implements IOrdiniVendita { @Override - public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { + public void distribuisciCollo(Dialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { UtilityToast.showToast("Avviato metodo in BaseFeature"); ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(), diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java index dbd65cea..e3daa375 100644 --- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java @@ -1,5 +1,6 @@ package it.integry.wms.dynamic_customization.extensions; +import android.app.Dialog; import android.app.ProgressDialog; import java.util.List; @@ -16,7 +17,7 @@ import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; public class OrdiniVendita implements IOrdiniVendita { @Override - public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { + public void distribuisciCollo(Dialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) { String codMdepOrder = testateOrdini.get(0).getCodMdep();