From 057e61289e774b7419e42fb13b02ce03fa75bca1 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 14 Feb 2020 16:20:20 +0100 Subject: [PATCH] Aggiunto dialog note aggiuntive nei resi da cliente --- .../integrywmsnative/core/model/MtbColr.java | 20 ++ .../consumers/ColliMagazzinoRESTConsumer.java | 4 +- .../rest/consumers/EntityRESTConsumer.java | 28 ++- ...oneOrdineAccettazioneInevasoViewModel.java | 183 ++++++++---------- .../views/NoteAggiuntiveNuovaULDialog.java | 57 ------ .../gest/main/MainFragment.java | 2 +- .../picking_resi/PickingResiActivity.java | 43 ++-- .../VenditaOrdineInevasoViewModel.java | 2 +- .../NoteAggiuntiveLUDialog.java | 48 +++++ .../dialog_note_aggiuntive_nuova_ul.xml | 3 +- app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 12 files changed, 205 insertions(+), 187 deletions(-) delete mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/note_aggiuntive_lu/NoteAggiuntiveLUDialog.java diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java index 7071b040..50b992ec 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java @@ -54,6 +54,8 @@ public class MtbColr extends EntityBase { private String serDoc; private Integer numDoc; private Integer idRigaDoc; + private BigDecimal pesoNettoKg; + private BigDecimal pesoLordoKg; private MtbAart mtbAart; @@ -489,4 +491,22 @@ public class MtbColr extends EntityBase { this.idRigaDoc = idRigaDoc; return this; } + + public BigDecimal getPesoNettoKg() { + return pesoNettoKg; + } + + public MtbColr setPesoNettoKg(BigDecimal pesoNettoKg) { + this.pesoNettoKg = pesoNettoKg; + return this; + } + + public BigDecimal getPesoLordoKg() { + return pesoLordoKg; + } + + public MtbColr setPesoLordoKg(BigDecimal pesoLordoKg) { + this.pesoLordoKg = pesoLordoKg; + 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 b951468d..3806fcf5 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 @@ -61,6 +61,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { public static void saveCollo(MtbColt mtbColtToSave, RunnableArgs onComplete, RunnableArgs onFailed) { MtbColt mtbColtToSaveClone = (MtbColt) mtbColtToSave.clone(); + mtbColtToSave.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); mtbColtToSaveClone.setMtbColr(new ObservableArrayList<>()); @@ -590,7 +591,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { } - public static void updateDataFine(Context context, Dialog progress, MtbColt mtbColt, Runnable onComplete) { + public static void updateDataFine(Context context, Dialog progress, MtbColt mtbColt, Runnable onComplete, RunnableArgs onFailed) { MtbColt cloneMtbColt = (MtbColt) mtbColt.clone(); cloneMtbColt.setOperation(CommonModelConsts.OPERATION.UPDATE); @@ -601,6 +602,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { onComplete.run(); }, ex -> { UtilityExceptions.defaultException(context, ex, progress); + if(onFailed != null) onFailed.run(ex); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java index 9d30ce3b..e1a13d90 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java @@ -10,10 +10,12 @@ 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.rest.RESTBuilder; import it.integry.integrywmsnative.core.rest.model.EsitoType; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.EntityBase; +import it.integry.integrywmsnative.core.utility.UtilityExceptions; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -22,6 +24,11 @@ public class EntityRESTConsumer { public static void processEntity(T entityToSave, final ISimpleOperationCallback callback, Class type){ + RunnableArgs tmpFailed = ex -> { +// UtilityExceptions.defaultException(null, ex); + if(callback != null) callback.onFailed(ex); + }; + EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class); Call> request = service.processEntity(entityToSave); request.enqueue(new Callback>() { @@ -37,22 +44,22 @@ public class EntityRESTConsumer { callback.onSuccess(object); } else { Log.e("EntityRESTConsumer", response.body().getErrorMessage()); - callback.onFailed(new Exception(response.body().getErrorMessage())); + tmpFailed.run(new Exception(response.body().getErrorMessage())); } } else { Log.e("EntityRESTConsumer", response.message()); - callback.onFailed(new Exception(response.message())); + tmpFailed.run(new Exception(response.message())); } } else { Log.e("EntityRESTConsumer", "Status " + response.code() + ": " + response.message()); - callback.onFailed(new Exception("Status " + response.code() + ": " + response.message())); + tmpFailed.run(new Exception("Status " + response.code() + ": " + response.message())); } } @Override public void onFailure(Call> call, Throwable t) { Log.e("EntityRESTConsumer", t.toString()); - callback.onFailed(new Exception(t)); + tmpFailed.run(new Exception(t)); } }); @@ -60,6 +67,11 @@ public class EntityRESTConsumer { public static void processEntityList(List entitiesToSave, final ISimpleOperationCallback> callback, boolean singleTransaction, Class type){ + RunnableArgs tmpFailed = ex -> { +// UtilityExceptions.defaultException(null, ex); + if(callback != null) callback.onFailed(ex); + }; + EntityRESTConsumerService service = RESTBuilder.getService(EntityRESTConsumerService.class); Call>> request = service.processEntityList(singleTransaction, entitiesToSave); request.enqueue(new Callback>>() { @@ -80,7 +92,7 @@ public class EntityRESTConsumer { responseList.add(gson.fromJson(jsonText, type)); } else { Log.e("EntityRESTConsumer", jsonSingleObject.getErrorMessage()); - callback.onFailed(new Exception(jsonSingleObject.getErrorMessage())); + tmpFailed.run(new Exception(jsonSingleObject.getErrorMessage())); return; } @@ -89,18 +101,18 @@ public class EntityRESTConsumer { callback.onSuccess(responseList); } else { Log.e("EntityRESTConsumer", response.message()); - callback.onFailed(new Exception(response.message())); + tmpFailed.run(new Exception(response.message())); } } else { Log.e("EntityRESTConsumer", "Status " + response.code() + ": " + response.message()); - callback.onFailed(new Exception("Status " + response.code() + ": " + response.message())); + tmpFailed.run(new Exception("Status " + response.code() + ": " + response.message())); } } @Override public void onFailure(Call>> call, Throwable t) { Log.e("EntityRESTConsumer", t.toString()); - callback.onFailed(new Exception(t)); + tmpFailed.run(new Exception(t)); } }); 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 cb33bd1d..400c1e51 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,7 +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; @@ -10,7 +9,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import android.text.SpannableString; -import com.annimon.stream.Optional; import com.annimon.stream.Stream; import com.tfb.fbtoast.FBToast; @@ -39,7 +37,6 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.report.ReportManager; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBarcode; -import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityLogger; @@ -52,7 +49,7 @@ import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.IOnOrdi import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.MainListOrdineAccettazioneAdapter; import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto.AccettazioneOrdineInevasoOrderBy; import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.rest.OrdineAccettazioneInevasoRESTConsumerService; -import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.views.NoteAggiuntiveNuovaULDialog; +import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog; import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback; import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; @@ -439,108 +436,98 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC } Dialog finalProgress = progress; - NoteAggiuntiveNuovaULDialog.make(mActivity, new NoteAggiuntiveNuovaULDialog.Callback() { - @Override - public void onSuccess(String noteString) { + NoteAggiuntiveLUDialog.make(mActivity, noteString -> { + //Add loading dialog here + finalProgress.show(); - //Add loading dialog here - finalProgress.show(); + GestSetupRESTConsumer.getValue("PICKING", "SETUP", "DEFAULT_POSIZIONE_COLLI_ACCETTAZIONE", defaultPosAccettazioneDTO -> { - GestSetupRESTConsumer.getValue("PICKING", "SETUP", "DEFAULT_POSIZIONE_COLLI_ACCETTAZIONE", defaultPosAccettazioneDTO -> { + String defaultPosAccettazione = ""; + if (defaultPosAccettazioneDTO != null && !UtilityString.isNullOrEmpty(defaultPosAccettazioneDTO.value)) + defaultPosAccettazione = defaultPosAccettazioneDTO.value; - String defaultPosAccettazione = ""; - if (defaultPosAccettazioneDTO != null && !UtilityString.isNullOrEmpty(defaultPosAccettazioneDTO.value)) - defaultPosAccettazione = defaultPosAccettazioneDTO.value; + MtbColt mtbColt = new MtbColt(); + mtbColt + .initDefaultFields() + .setGestione(defaultGestioneOfUL) + .setAnnotazioni(noteString) + .setPosizione(defaultPosAccettazione) + .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); - MtbColt mtbColt = new MtbColt(); - mtbColt - .initDefaultFields() - .setGestione(defaultGestioneOfUL) - .setAnnotazioni(noteString) - .setPosizione(defaultPosAccettazione) - .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); + if (customNumCollo != null) { + mtbColt.setNumCollo(customNumCollo); + } + + if (!UtilityString.isNullOrEmpty(customSerCollo)) { + mtbColt.setSerCollo(customSerCollo); + } + + List codAnags = + stream(mOrders) + .select(OrdineAccettazioneDTO::getCodAnag) + .distinct() + .toList(); + + if (codAnags != null && codAnags.size() == 1) { + mtbColt.setCodAnag(codAnags.get(0)); + } + + List rifOrds = + stream(mOrders) + .select(OrdineAccettazioneDTO::getRifOrd) + .distinct() + .toList(); + + if (rifOrds != null && rifOrds.size() == 1) { + mtbColt.setRifOrd(rifOrds.get(0)); + } + + List numDataOrds = + stream(mOrders) + .select(value -> ("" + value.getNumero()) + value.getData()) + .distinct() + .toList(); + + if (numDataOrds != null && numDataOrds.size() == 1) { + mtbColt.setNumOrd(mOrders.get(0).getNumero()); + mtbColt.setDataOrd(mOrders.get(0).getData()); + + try { + mtbColt.generaFiltroOrdine(); + } catch (Exception ex) { + DialogSimpleMessageHelper.makeErrorDialog(mActivity, new SpannableString(ex.getMessage()), null, null).show(); + return; + } + } + + + ColliMagazzinoRESTConsumer.saveCollo(mtbColt, new ISimpleOperationCallback() { + @Override + public void onSuccess(MtbColt value) { + + value + .setDisablePrint(disablePrint) + .setMtbColr(new ObservableArrayList<>()); + + value.setMtbCols(null); + + setULToCurrentContext(value); + + finalProgress.dismiss(); + + FBToast.successToast(mActivity, mActivity.getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + + if (onComplete != null) onComplete.run(); - if (customNumCollo != null) { - mtbColt.setNumCollo(customNumCollo); } - if (!UtilityString.isNullOrEmpty(customSerCollo)) { - mtbColt.setSerCollo(customSerCollo); + @Override + public void onFailed(Exception ex) { + UtilityExceptions.defaultException(mActivity, ex, finalProgress); } + }); + }, ex -> UtilityExceptions.defaultException(mActivity, ex, finalProgress)); - List codAnags = - stream(mOrders) - .select(OrdineAccettazioneDTO::getCodAnag) - .distinct() - .toList(); - - if (codAnags != null && codAnags.size() == 1) { - mtbColt.setCodAnag(codAnags.get(0)); - } - - List rifOrds = - stream(mOrders) - .select(OrdineAccettazioneDTO::getRifOrd) - .distinct() - .toList(); - - if (rifOrds != null && rifOrds.size() == 1) { - mtbColt.setRifOrd(rifOrds.get(0)); - } - - List numDataOrds = - stream(mOrders) - .select(value -> ("" + value.getNumero()) + value.getData()) - .distinct() - .toList(); - - if (numDataOrds != null && numDataOrds.size() == 1) { - mtbColt.setNumOrd(mOrders.get(0).getNumero()); - mtbColt.setDataOrd(mOrders.get(0).getData()); - - try { - mtbColt.generaFiltroOrdine(); - } catch (Exception ex) { - DialogSimpleMessageHelper.makeErrorDialog(mActivity, new SpannableString(ex.getMessage()), null, null).show(); - return; - } - } - - - ColliMagazzinoRESTConsumer.saveCollo(mtbColt, new ISimpleOperationCallback() { - @Override - public void onSuccess(MtbColt value) { - - value - .setDisablePrint(disablePrint) - .setMtbColr(new ObservableArrayList<>()); - - value.setMtbCols(null); - - setULToCurrentContext(value); - - finalProgress.dismiss(); - - FBToast.successToast(mActivity, mActivity.getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); - - if (onComplete != null) onComplete.run(); - - } - - @Override - public void onFailed(Exception ex) { - UtilityExceptions.defaultException(mActivity, ex, finalProgress); - } - }); - }, ex -> UtilityExceptions.defaultException(mActivity, ex, finalProgress)); - - } - - @Override - public void onAbort() { - BarcodeManager.enable(); - finalProgress.dismiss(); - } }).show(); @@ -947,7 +934,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC // // } else { // - this.refreshOrderBy(false); + this.refreshOrderBy(false); // } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java deleted file mode 100644 index 6133b8c2..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java +++ /dev/null @@ -1,57 +0,0 @@ -package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.views; - -import android.app.Dialog; -import android.content.Context; -import com.google.android.material.textfield.TextInputEditText; -import androidx.appcompat.app.AlertDialog; - -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; -import android.view.LayoutInflater; -import android.view.ViewGroup; -import android.widget.RelativeLayout; - -import androidx.databinding.DataBindingUtil; -import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.utility.UtilityDimension; -import it.integry.integrywmsnative.databinding.DialogNoteAggiuntiveNuovaUlBinding; - -public class NoteAggiuntiveNuovaULDialog { - - private Dialog currentDialog; - - public interface Callback { - void onSuccess(String noteString); - void onAbort(); - } - - public static Dialog make(Context context, final Callback callback) { - return new NoteAggiuntiveNuovaULDialog(context, callback).currentDialog; - } - - private NoteAggiuntiveNuovaULDialog(Context context, final Callback callback){ - - LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); - DialogNoteAggiuntiveNuovaUlBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_note_aggiuntive_nuova_ul, null, false); - - currentDialog = new Dialog(context); - currentDialog.setContentView(bindings.getRoot()); - - currentDialog.setCanceledOnTouchOutside(false); - currentDialog.setCancelable(false); - currentDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - - bindings.buttonConfirm.setOnClickListener(v -> { - currentDialog.dismiss(); - callback.onSuccess(bindings.additionalNotesText.getText().toString()); - }); - - bindings.buttonAbort.setOnClickListener(v -> { - currentDialog.dismiss(); - callback.onAbort(); - }); - - - } - -} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index c56db6ab..7d091cf9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -170,7 +170,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab cyclicRecover(sessionsIterator, onComplete, onFailed); }); - }); + }, onFailed); } else { ColliDataRecover.closeSession(recoveredMtbColtID); cyclicRecover(sessionsIterator, onComplete, onFailed); 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 7e498277..c63c3158 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 @@ -50,6 +50,7 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO; import it.integry.barcode_base_android_library.model.BarcodeScanDTO; +import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog; public class PickingResiActivity extends BaseActivity implements IOnColloClosedCallback { @@ -362,11 +363,29 @@ public class PickingResiActivity extends BaseActivity implements IOnColloClosedC progress.show(); if(thereIsAnyRowInUL()) { - ColliMagazzinoRESTConsumer.updateDataFine( - this, - progress, - currentMtbColt.get(), - () -> printCollo(progress, currentMtbColt.get(), onComplete)); + NoteAggiuntiveLUDialog.make(this, noteString -> { + + MtbColt currentLU = currentMtbColt.get(); + + Runnable postNoteSave = () -> { + ColliMagazzinoRESTConsumer.updateDataFine( + this, + progress, + currentLU, + () -> printCollo(progress, currentMtbColt.get(), onComplete), + ex -> UtilityExceptions.defaultException(this, ex, progress)); + }; + + if(!UtilityString.isNullOrEmpty(noteString)) { + currentLU.setAnnotazioni(noteString); + + ColliMagazzinoRESTConsumer.saveCollo(currentLU, mtbColt -> { + postNoteSave.run(); + }, ex -> UtilityExceptions.defaultException(this, ex, progress)); + } else postNoteSave.run(); + + + }).show(); } else { deleteCollo(progress, onComplete); } @@ -523,21 +542,7 @@ public class PickingResiActivity extends BaseActivity implements IOnColloClosedC } - public void applyFilter(String descriptionText) { - -// this.mBindings.filteredArtsInListExpandableLayout.expand(true); -// -// this.mBindings.descriptionFilterText.setText(descriptionText); - } - public void removeListFilter() { -// for(int i = 0; i < mPickingList.size(); i++) { -// mPickingList.get(i).setTempHidden(false); -// mPickingList.get(i).setTempPickData(null); -// } -// -// refreshOrderBy(false); -// this.mBindings.filteredArtsInListExpandableLayout.collapse(true); } 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 787b65f9..c50d4c26 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 @@ -879,7 +879,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO postCloseOperations(generatedMtbColts, onComplete); progress.dismiss(); } - })); + }), ex -> UtilityExceptions.defaultException(mActivity, ex, progress)); }; if(SettingsManager.iDB().isFlagAskPesoColloSpedizione()) { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/note_aggiuntive_lu/NoteAggiuntiveLUDialog.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/note_aggiuntive_lu/NoteAggiuntiveLUDialog.java new file mode 100644 index 00000000..ecf03469 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/note_aggiuntive_lu/NoteAggiuntiveLUDialog.java @@ -0,0 +1,48 @@ +package it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu; + +import android.app.Dialog; +import android.content.Context; + +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.view.LayoutInflater; + +import androidx.databinding.DataBindingUtil; +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.databinding.DialogNoteAggiuntiveNuovaUlBinding; + +public class NoteAggiuntiveLUDialog { + + private Dialog mDialog; + + public static Dialog make(Context context, final RunnableArgs onComplete) { + return new NoteAggiuntiveLUDialog(context, onComplete).mDialog; + } + + private NoteAggiuntiveLUDialog(Context context, final RunnableArgs onComplete){ + + LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); + DialogNoteAggiuntiveNuovaUlBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_note_aggiuntive_nuova_ul, null, false); + + mDialog = new Dialog(context); + mDialog.setContentView(bindings.getRoot()); + + mDialog.setCanceledOnTouchOutside(false); + mDialog.setCancelable(false); + mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + + bindings.buttonConfirm.setOnClickListener(v -> { + mDialog.dismiss(); + if(onComplete != null) onComplete.run(bindings.additionalNotesText.getText().toString()); + }); + + bindings.buttonAbort.setOnClickListener(v -> { + mDialog.dismiss(); + if(onComplete != null) onComplete.run(null); + }); + + + } + +} diff --git a/app/src/main/res/layout/dialog_note_aggiuntive_nuova_ul.xml b/app/src/main/res/layout/dialog_note_aggiuntive_nuova_ul.xml index ff997e8d..4facf703 100644 --- a/app/src/main/res/layout/dialog_note_aggiuntive_nuova_ul.xml +++ b/app/src/main/res/layout/dialog_note_aggiuntive_nuova_ul.xml @@ -50,7 +50,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/TextViewMaterial.DialogTitle" - android:text="@string/action_create_ul" + android:text="@string/lu_info" android:gravity="center_horizontal"/> @@ -65,7 +65,6 @@ Scansiona il codice a barre di un articolo Prima di procedere apri una nuova UL Articolo extra + Info UL Impostazioni diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e6cc977f..9f78a3a1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -75,6 +75,7 @@ Insert weight Show already created LU Insert info about LU TYPE and NET / GROSS weight + LU\'s info