From d210e3b3e0d55cc05c8dfd0ea7faf18d2e496aa7 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 14 Feb 2023 11:00:33 +0100 Subject: [PATCH] Rimossa parte delle dynamic feature --- .../core/class_router/ClassRouter.java | 2 - .../rest/model/uds/CloseUDSRequestDTO.java | 10 - .../gest/main/MainFragment.java | 6 +- .../DialogVenditaFiltroAvanzatoView.java | 459 ------------------ .../DialogVenditaFiltroAvanzatoViewModel.java | 167 ------- ...logOrdineProduzioneFiltroAvanzatoView.java | 164 ------- ...dineProduzioneFiltroAvanzatoViewModel.java | 76 --- .../gest/spedizione/SpedizioneViewModel.java | 11 +- .../main/res/layout/dialog_input_peso_lu.xml | 1 - ...alog_ordine_produzione_filtro_avanzato.xml | 146 ------ .../layout/dialog_vendita_filtro_avanzato.xml | 314 ------------ .../dynamic_customization/DynamicContext.java | 4 - .../extensions/FiltroOrdiniVendita.java | 21 - .../extensions/OrdiniVendita.java | 16 - .../dynamic_customization/DynamicContext.java | 4 - .../extensions/FiltroOrdiniVendita.java | 22 - .../extensions/OrdiniVendita.java | 21 - 17 files changed, 2 insertions(+), 1442 deletions(-) delete mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoView.java delete mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoViewModel.java delete mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/dialog/DialogOrdineProduzioneFiltroAvanzatoView.java delete mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/dialog/DialogOrdineProduzioneFiltroAvanzatoViewModel.java delete mode 100644 app/src/main/res/layout/dialog_ordine_produzione_filtro_avanzato.xml delete mode 100644 app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml delete mode 100644 dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java delete mode 100644 dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java delete mode 100644 dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java delete mode 100644 dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java index d234cebb..097612fa 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java @@ -9,8 +9,6 @@ import java.util.List; public class ClassRouter { public enum PATH { - FILTRO_ORDINI_VENDITA, - ORDINI_VENDITA, CUSTOM_CONFIGURATION, BARCODE_CUSTOMIZATION } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CloseUDSRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CloseUDSRequestDTO.java index e88cbc5e..f53ca7ea 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CloseUDSRequestDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CloseUDSRequestDTO.java @@ -5,7 +5,6 @@ import it.integry.integrywmsnative.core.model.MtbColt; public class CloseUDSRequestDTO { private boolean printSSCC; - private boolean enableTransferLogic; private String orderCodMdep; private MtbColt mtbColt; @@ -18,15 +17,6 @@ public class CloseUDSRequestDTO { return this; } - public boolean isEnableTransferLogic() { - return enableTransferLogic; - } - - public CloseUDSRequestDTO setEnableTransferLogic(boolean enableTransferLogic) { - this.enableTransferLogic = enableTransferLogic; - return this; - } - public String getOrderCodMdep() { return orderCodMdep; } 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 78674f6b..c664fb9c 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 @@ -212,14 +212,10 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab (recoveredMtbColt.getGestioneEnum() == GestioneEnum.VENDITA || recoveredMtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE)) { - OrdiniVenditaInterface ordiniVendita = ClassRouter.getInstance(ClassRouter.PATH.ORDINI_VENDITA); - boolean isTransferLogicEnabled = ordiniVendita != null && ordiniVendita.isTrasfOrder(recoveredMtbColtDto.getTestateOrdini()); - var closeUDSRequestDto = new CloseUDSRequestDTO() .setMtbColt(recoveredMtbColt) //.setPrintSSCC(shouldPrint) - .setOrderCodMdep(recoveredMtbColtDto.getTestateOrdini().get(0).getCodMdep()) - .setEnableTransferLogic(isTransferLogicEnabled); + .setOrderCodMdep(recoveredMtbColtDto.getTestateOrdini().get(0).getCodMdep()); RunnableArgs onRequestComplete = closeUDSResponseDto -> { colliDataRecoverService.closeSession(recoveredMtbColtID); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoView.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoView.java deleted file mode 100644 index 12faa6c2..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoView.java +++ /dev/null @@ -1,459 +0,0 @@ -package it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs; - -import android.app.DatePickerDialog; -import android.content.Context; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; -import android.view.LayoutInflater; -import android.view.View; -import android.view.WindowManager; -import android.widget.ArrayAdapter; -import android.widget.MultiAutoCompleteTextView; - -import androidx.appcompat.app.AlertDialog; -import androidx.databinding.DataBindingUtil; - -import com.annimon.stream.Stream; - -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.List; -import java.util.Objects; - -import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.class_router.ClassRouter; -import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita; -import it.integry.integrywmsnative.core.di.BindableString; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.utility.UtilityDate; -import it.integry.integrywmsnative.databinding.DialogVenditaFiltroAvanzatoBinding; -import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoDTO; - - -public class DialogVenditaFiltroAvanzatoView { - - - private final AlertDialog currentAlert; - private final Context currentContext; - - private final RunnableArgs currentOnFilterDone; - - - - public BindableString deposito = new BindableString(); - public BindableString idViaggio = new BindableString(); - public BindableString numOrds = new BindableString(); - public BindableString cliente = new BindableString(); - public BindableString dataConsegna = new BindableString(); - public BindableString terminiConsegna = new BindableString(); - public BindableString agente = new BindableString(); - public BindableString vettore = new BindableString(); - public BindableString automezzo = new BindableString(); - public BindableString paese = new BindableString(); - - public Date dataConsegnaDate; - - private ArrayAdapter arrayAdapterCodMdep; - private ArrayAdapter arrayAdapterIdViaggio; - private ArrayAdapter arrayAdapterNumOrds; - private ArrayAdapter arrayAdapterCliente; - private ArrayAdapter arrayAdapterTermCons; - private ArrayAdapter arrayAdapterVettore; - private ArrayAdapter arrayAdapterAgente; - private ArrayAdapter arrayAdapterAutomezzo; - private ArrayAdapter arrayAdapterPaese; - - private final DialogVenditaFiltroAvanzatoViewModel viewModel; - - public static AlertDialog make(final Context context, - final List ordersList, - DialogVenditaFiltroAvanzatoViewModel baseViewModel, - RunnableArgs onDismiss) { - return new DialogVenditaFiltroAvanzatoView(context, ordersList, baseViewModel, onDismiss).currentAlert; - } - - private DialogVenditaFiltroAvanzatoView(final Context context, final List ordersList, DialogVenditaFiltroAvanzatoViewModel baseViewModel, RunnableArgs onDismiss) { - currentContext = context; - currentOnFilterDone = onDismiss; - - viewModel = baseViewModel != null ? baseViewModel : new DialogVenditaFiltroAvanzatoViewModel(); - viewModel.init(ordersList); - - LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); - - DialogVenditaFiltroAvanzatoBinding binding = DataBindingUtil.inflate(inflater, R.layout.dialog_vendita_filtro_avanzato, null, false); - - final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context) - .setView(binding.getRoot()); - - binding.setView(this); - binding.setViewmodel(viewModel); - initViewModel(viewModel); - initView(binding); - - currentAlert = alertDialog.create(); - currentAlert.setCanceledOnTouchOutside(false); - - currentAlert.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); - currentAlert.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - - binding.positiveBtn.setOnClickListener(view -> { - currentAlert.dismiss(); - }); - - binding.neutralBtn.setOnClickListener(view -> { - resetAll(); - }); - - - currentAlert.setOnDismissListener(dialogInterface -> { - if(currentOnFilterDone != null) currentOnFilterDone.run(viewModel); - }); - - } - - private void initView(DialogVenditaFiltroAvanzatoBinding bindings) { - IFiltroOrdiniVendita filtroOrdiniVendita = ClassRouter.getInstance(ClassRouter.PATH.FILTRO_ORDINI_VENDITA); - -// bindings.filledExposedDropdownDataCons.setOnFocusChangeListener((v, hasFocus) -> { -// bindings.filledExposedDropdownDataCons.callOnClick(); -// }); - - bindings.filledExposedDropdownDataCons.setOnClickListener(view -> { - Calendar c = UtilityDate.getCalendarInstance(); - - if(dataConsegnaDate != null) { - c.setTime(dataConsegnaDate); - } - - int mYear = c.get(Calendar.YEAR); - int mMonth = c.get(Calendar.MONTH); - int mDay = c.get(Calendar.DAY_OF_MONTH); - - DatePickerDialog datePickerDialog = new DatePickerDialog(currentContext, - (view2, year, month, day) -> { - - dataConsegnaDate = new GregorianCalendar(year, month, day).getTime(); - dataConsegna.set(UtilityDate.formatDate(dataConsegnaDate, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)); - - }, mYear, mMonth, mDay); - datePickerDialog.show(); - }); - - - arrayAdapterCodMdep = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item); - arrayAdapterCodMdep.addAll(getAvailableCodMdeps(false)); - bindings.inputCodMdepNew.setVisibility(filtroOrdiniVendita.shoudShowCodMdepFilter() ? View.VISIBLE : View.GONE); - bindings.filledExposedDropdownCodMdep.setAdapter(arrayAdapterCodMdep); - - arrayAdapterIdViaggio = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item); - arrayAdapterIdViaggio.addAll(getAvailableIdViaggio(false)); - bindings.inputIdViaggio.setVisibility(filtroOrdiniVendita.shoudShowIdViaggioFilter() ? View.VISIBLE : View.GONE); - bindings.filledExposedDropdownIdViaggio.setAdapter(arrayAdapterIdViaggio); - - arrayAdapterAgente = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item); - arrayAdapterAgente.addAll(getAvailableAgente(false)); - bindings.inputAgente.setVisibility(filtroOrdiniVendita.shoudShowAgenteFilter() ? View.VISIBLE : View.GONE); - bindings.filledExposedDropdownAgente.setAdapter(arrayAdapterAgente); - - arrayAdapterNumOrds = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item); - arrayAdapterNumOrds.addAll(getAvailableNumOrds(false)); - bindings.filledExposedDropdownNumOrds.setAdapter(arrayAdapterNumOrds); - bindings.filledExposedDropdownNumOrds.setTokenizer(new MultiAutoCompleteTextView.CommaTokenizer()); - - arrayAdapterCliente = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item); - arrayAdapterCliente.addAll(getAvailableCliente(false)); - bindings.filledExposedDropdownCliente.setAdapter(arrayAdapterCliente); - - arrayAdapterTermCons = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item); - arrayAdapterTermCons.addAll(getAvailableTermCons(false)); - bindings.filledExposedDropdownTermCons.setAdapter(arrayAdapterTermCons); - - arrayAdapterVettore = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item); - arrayAdapterVettore.addAll(getAvailableVettori(false)); - bindings.filledExposedDropdownVettore.setAdapter(arrayAdapterVettore); - - arrayAdapterAutomezzo = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item); - arrayAdapterAutomezzo.addAll(getAvailableAutomezzi(false)); - bindings.filledExposedDropdownAutomezzo.setAdapter(arrayAdapterAutomezzo); - - arrayAdapterPaese = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item); - arrayAdapterPaese.addAll(getAvailablePaesi(false)); - bindings.filledExposedDropdownPaese.setAdapter(arrayAdapterPaese); - - - refreshAll(); - } - - private void initViewModel(DialogVenditaFiltroAvanzatoViewModel viewModel) { - viewModel.applyAllTests(); - - BindableString.registerListener(idViaggio, value -> { - viewModel.setIDViaggioFilter(value); - viewModel.applyAllTests(); - - refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true)); - refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true)); - refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true)); - refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true)); - refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true)); - refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true)); - refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true)); - refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true)); - }); - - BindableString.registerListener(deposito, value -> { - viewModel.setDepositoFilter(value); - viewModel.applyAllTests(); - - refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true)); - refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true)); - refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true)); - refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true)); - refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true)); - refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true)); - refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true)); - refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true)); - }); - - BindableString.registerListener(numOrds, value -> { - viewModel.setNumOrdFilter(value); - viewModel.applyAllTests(); - - refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true)); - refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true)); - refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true)); - refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true)); - refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true)); - refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true)); - refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true)); - refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true)); - }); - - BindableString.registerListener(cliente, value -> { - viewModel.setClienteFilter(value); - viewModel.applyAllTests(); - - refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true)); - refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true)); - refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true)); - refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true)); - refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true)); - refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true)); - refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true)); - refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true)); - }); - - BindableString.registerListener(terminiConsegna, value -> { - viewModel.setTerminiConsegnaFilter(value); - viewModel.applyAllTests(); - - refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true)); - refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true)); - refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true)); - refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true)); - refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true)); - refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true)); - refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true)); - refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true)); - }); - - BindableString.registerListener(vettore, value -> { - viewModel.setVettoreFilter(value); - viewModel.applyAllTests(); - - refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true)); - refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true)); - refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true)); - refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true)); - refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true)); - refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true)); - refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true)); - refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true)); - }); - - BindableString.registerListener(automezzo, value -> { - viewModel.setAutomezzoFilter(value); - viewModel.applyAllTests(); - - refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true)); - refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true)); - refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true)); - refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true)); - refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true)); - refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true)); - refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true)); - refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true)); - }); - - BindableString.resetListeners(dataConsegna); - BindableString.registerListener(dataConsegna, value -> { - viewModel.setDataConsegnaFilter(dataConsegnaDate); - viewModel.applyAllTests(); - - refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true)); - refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true)); - refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true)); - refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true)); - refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true)); - refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true)); - refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true)); - refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true)); - refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true)); - }); - - BindableString.resetListeners(agente); - BindableString.registerListener(agente, value -> { - viewModel.setAgenteFilter(value); - viewModel.applyAllTests(); - - refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true)); - refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true)); - refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true)); - refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true)); - refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true)); - refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true)); - refreshArrayAdapter(arrayAdapterPaese, getAvailablePaesi(true)); - refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true)); - }); - - BindableString.resetListeners(paese); - BindableString.registerListener(paese, value -> { - viewModel.setPaeseFilter(value); - viewModel.applyAllTests(); - - refreshArrayAdapter(arrayAdapterCodMdep, getAvailableCodMdeps(true)); - refreshArrayAdapter(arrayAdapterIdViaggio, getAvailableIdViaggio(true)); - refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true)); - refreshArrayAdapter(arrayAdapterCliente, getAvailableCliente(true)); - refreshArrayAdapter(arrayAdapterTermCons, getAvailableTermCons(true)); - refreshArrayAdapter(arrayAdapterVettore, getAvailableVettori(true)); - refreshArrayAdapter(arrayAdapterAgente, getAvailableAgente(true)); - refreshArrayAdapter(arrayAdapterAutomezzo, getAvailableAutomezzi(true)); - }); - - } - - - private void refreshArrayAdapter(ArrayAdapter arrayAdapter, List inputList) { - arrayAdapter.clear(); - arrayAdapter.addAll(inputList); - arrayAdapter.notifyDataSetChanged(); - } - - - private List getAvailableIdViaggio(boolean skipRecalc) { - return Stream - .of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue())) - .filter(x -> x.getIdViaggio() != null) - .sortBy(x -> -x.getIdViaggio()) - .map(x -> x.getIdViaggio() != null ? x.getIdViaggio().toString() : null) - .distinct() - .toList(); - } - - private List getAvailableAgente(boolean skipRecalc) { - return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue())) - .map(OrdiniUscitaElencoDTO::getNomeAgente) - .distinct() - .withoutNulls() - .sorted() - .toList(); - } - - private List getAvailableCodMdeps(boolean skipRecalc) { - return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue())) - .map(OrdiniUscitaElencoDTO::getCodMdep) - .distinct() - .withoutNulls() - .sorted() - .toList(); - } - - private List getAvailableCliente(boolean skipRecalc) { - return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue())) - .map(OrdiniUscitaElencoDTO::getRagSocOrd) - .distinct() - .withoutNulls() - .sorted() - .toList(); - } - - private List getAvailableNumOrds(boolean skipRecalc) { - return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue())) - .map(x -> x.getNumOrd().toString()) - .distinct() - .withoutNulls() - .sorted() - .toList(); - } - - private List getAvailableTermCons(boolean skipRecalc) { - return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue())) - .map(OrdiniUscitaElencoDTO::getTermCons) - .distinct() - .withoutNulls() - .sorted() - .toList(); - } - - private List getAvailableVettori(boolean skipRecalc) { - return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue())) - .filter(x -> x.getCodVvet() != null) - .map(x -> x.getCodVvet() + " - " + x.getDescrizioneVettore()) - .distinct() - .withoutNulls() - .sorted() - .toList(); - } - - private List getAvailableAutomezzi(boolean skipRecalc) { - return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue())) - .map(OrdiniUscitaElencoDTO::getDescrizioneAuto) - .distinct() - .withoutNulls() - .sorted() - .toList(); - } - - private List getAvailablePaesi(boolean skipRecalc) { - return Stream.of(Objects.requireNonNull(viewModel.getMutableFilteredOrderList().getValue())) - .map(OrdiniUscitaElencoDTO::getCitta) - .withoutNulls() - .distinct() - .sorted() - .toList(); - } - - - public void refreshAll() { - deposito.refresh(); - idViaggio.refresh(); - numOrds.refresh(); - cliente.refresh(); - terminiConsegna.refresh(); - vettore.refresh(); - automezzo.refresh(); - dataConsegna.refresh(); - agente.refresh(); - paese.refresh(); - } - - - public void resetAll() { - deposito.set(null); - idViaggio.set(null); - numOrds.set(null); - cliente.set(null); - dataConsegna.set(null); - terminiConsegna.set(null); - vettore.set(null); - automezzo.set(null); - agente.set(null); - paese.set(null); - } - - - -} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoViewModel.java deleted file mode 100644 index b1e7a3bb..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/dialogs/DialogVenditaFiltroAvanzatoViewModel.java +++ /dev/null @@ -1,167 +0,0 @@ -package it.integry.integrywmsnative.gest.ordini_uscita_elenco.dialogs; - -import androidx.lifecycle.MutableLiveData; - -import com.annimon.stream.Stream; -import com.annimon.stream.function.Predicate; - -import java.util.Date; -import java.util.List; - -import it.integry.integrywmsnative.core.utility.UtilityString; -import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoDTO; - -public class DialogVenditaFiltroAvanzatoViewModel { - - private Predicate currentDepositoPredicate = null; - private Predicate currentIdViaggioPredicate = null; - private Predicate currentNumOrdsPredicate = null; - private Predicate currentClientePredicate = null; - private Predicate currentDataConsPredicate = null; - private Predicate currentTermConsPredicate = null; - private Predicate currentVettorePredicate = null; - private Predicate currentAgentePredicate = null; - private Predicate currentAutomezzoPredicate = null; - private Predicate currentPaesePredicate = null; - - - private List initialOrderList; - private final MutableLiveData> currentFilteredOrderList = new MutableLiveData<>(); - - public void init(List initialList) { - this.initialOrderList = initialList; - this.currentFilteredOrderList.setValue(this.initialOrderList); - } - - public MutableLiveData> getMutableFilteredOrderList() { - return this.currentFilteredOrderList; - } - - public void setIDViaggioFilter(String idViaggio) { - if(UtilityString.isNullOrEmpty(idViaggio)) currentIdViaggioPredicate = null; - else { - String[] idViaggiSplitted = idViaggio.split("[,\\ ]"); - - try{ - List idViaggiInteger = Stream.of(idViaggiSplitted) - .filter(x -> !UtilityString.isNullOrEmpty(x)) - .map(Integer::parseInt).toList(); - - currentIdViaggioPredicate = o -> idViaggiInteger.contains(o.getIdViaggio()); - } catch (NumberFormatException ex) { - currentIdViaggioPredicate = null; - } - } - } - - public void setDepositoFilter(String deposito) { - if(UtilityString.isNullOrEmpty(deposito)) currentDepositoPredicate = null; - else { - currentDepositoPredicate = o -> o.getCodMdep().toLowerCase().equalsIgnoreCase(deposito); - } - } - - public void setNumOrdFilter(String numOrds) { - if(UtilityString.isNullOrEmpty(numOrds)) currentNumOrdsPredicate = null; - else { - String[] numOrdsSplitted = numOrds.split("[,\\ ]"); - - try{ - List numOrdsInteger = Stream.of(numOrdsSplitted) - .filter(x -> !UtilityString.isNullOrEmpty(x)) - .map(Integer::parseInt).toList(); - - currentNumOrdsPredicate = o -> numOrdsInteger.contains(o.getNumOrd()); - } catch (NumberFormatException ex) { - currentNumOrdsPredicate = null; - } - } - } - - public void setClienteFilter(String cliente) { - if(UtilityString.isNullOrEmpty(cliente)) currentClientePredicate = null; - else { - currentClientePredicate = o -> o.getRagSocOrd().toLowerCase().contains(cliente.toLowerCase()); - } - } - - public void setTerminiConsegnaFilter(String terminiConsegna) { - if(UtilityString.isNullOrEmpty(terminiConsegna)) currentTermConsPredicate = null; - else { - currentTermConsPredicate = o -> !UtilityString.isNullOrEmpty(o.getTermCons()) && o.getTermCons().equalsIgnoreCase(terminiConsegna); - } - } - - public void setVettoreFilter(String vettore) { - if(UtilityString.isNullOrEmpty(vettore)) currentVettorePredicate = null; - else { - currentVettorePredicate = o -> (o.getCodVvet() + " - " + o.getDescrizioneVettore()).equalsIgnoreCase(vettore); - } - } - - public void setAutomezzoFilter(String automezzo) { - if(UtilityString.isNullOrEmpty(automezzo)) currentAutomezzoPredicate = null; - else { - currentAutomezzoPredicate = o -> !UtilityString.isNullOrEmpty(o.getDescrizioneAuto()) && (o.getDescrizioneAuto().toLowerCase().contains(automezzo) || o.getDescrizioneAuto().equalsIgnoreCase(automezzo)); - } - } - - public void setDataConsegnaFilter(Date dataConsegna) { - if(dataConsegna == null) currentDataConsPredicate = null; - else { - currentDataConsPredicate = o -> o.getDataConsD().equals(dataConsegna); - } - } - - public void setAgenteFilter(String agente) { - if(UtilityString.isNullOrEmpty(agente)) currentAgentePredicate = null; - else { - currentAgentePredicate = o -> !UtilityString.isNullOrEmpty(o.getNomeAgente()) && (o.getNomeAgente().toLowerCase().contains(agente) || o.getNomeAgente().equalsIgnoreCase(agente)); - } - } - - public void setPaeseFilter(String paese) { - if(UtilityString.isNullOrEmpty(paese)) currentPaesePredicate = null; - else { - currentPaesePredicate = o -> !UtilityString.isNullOrEmpty(o.getCitta()) && (o.getCitta().toLowerCase().contains(paese) || o.getCitta().equalsIgnoreCase(paese)); - } - } - - public void applyAllTests() { - - List returnList = null; - - if (currentNumOrdsPredicate == null && - currentClientePredicate == null && - currentDataConsPredicate == null && - currentTermConsPredicate == null && - currentVettorePredicate == null && - currentAutomezzoPredicate == null && - currentDepositoPredicate == null && - currentIdViaggioPredicate == null && - currentAgentePredicate == null && - currentPaesePredicate == null - ) { - returnList = this.initialOrderList; - } else { - Stream tmpStream = Stream.of(this.initialOrderList) - .filter(x -> - (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) && - (currentClientePredicate == null || (currentClientePredicate.test(x))) && - (currentDataConsPredicate == null || (currentDataConsPredicate.test(x))) && - (currentTermConsPredicate == null || (currentTermConsPredicate.test(x))) && - (currentVettorePredicate == null || (currentVettorePredicate.test(x))) && - (currentAutomezzoPredicate == null || (currentAutomezzoPredicate.test(x))) && - (currentDepositoPredicate == null || (currentDepositoPredicate.test(x))) && - (currentIdViaggioPredicate == null || (currentIdViaggioPredicate.test(x))) && - (currentAgentePredicate == null || (currentAgentePredicate.test(x))) && - (currentPaesePredicate == null || (currentPaesePredicate.test(x))) - ); - - returnList = tmpStream.toList(); - } - - this.currentFilteredOrderList.setValue(returnList); - } - -} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/dialog/DialogOrdineProduzioneFiltroAvanzatoView.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/dialog/DialogOrdineProduzioneFiltroAvanzatoView.java deleted file mode 100644 index 092e2982..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/dialog/DialogOrdineProduzioneFiltroAvanzatoView.java +++ /dev/null @@ -1,164 +0,0 @@ -package it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.dialog; - -import android.content.Context; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; -import android.view.LayoutInflater; -import android.view.WindowManager; -import android.widget.ArrayAdapter; -import android.widget.MultiAutoCompleteTextView; - -import androidx.appcompat.app.AlertDialog; -import androidx.databinding.DataBindingUtil; - -import com.annimon.stream.Stream; - -import java.util.List; -import java.util.Objects; - -import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.di.BindableString; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.databinding.DialogOrdineProduzioneFiltroAvanzatoBinding; -import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; - -public class DialogOrdineProduzioneFiltroAvanzatoView { - - - private AlertDialog currentAlert; - private Context currentContext; - - private RunnableArgs currentOnFilterDone; - - public BindableString numOrds = new BindableString(); - public BindableString codJcoms = new BindableString(); - - private ArrayAdapter arrayAdapterNumOrds; - private ArrayAdapter arrayAdapterCodJcoms; - - private DialogOrdineProduzioneFiltroAvanzatoViewModel mViewModel; - - - - public static AlertDialog make(final Context context, - final List ordersList, - DialogOrdineProduzioneFiltroAvanzatoViewModel baseViewModel, - RunnableArgs onDismiss) { - return new DialogOrdineProduzioneFiltroAvanzatoView(context, ordersList, baseViewModel, onDismiss).currentAlert; - } - - - private DialogOrdineProduzioneFiltroAvanzatoView(final Context context, final List ordersList, DialogOrdineProduzioneFiltroAvanzatoViewModel baseViewModel, RunnableArgs onDismiss) { - currentContext = context; - currentOnFilterDone = onDismiss; - - mViewModel = baseViewModel != null ? baseViewModel : new DialogOrdineProduzioneFiltroAvanzatoViewModel(); - mViewModel.init(ordersList); - - LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - - DialogOrdineProduzioneFiltroAvanzatoBinding binding = DataBindingUtil.inflate(inflater, R.layout.dialog_ordine_produzione_filtro_avanzato, null, false); - - final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context) - .setView(binding.getRoot()); - - binding.setView(this); - binding.setViewmodel(mViewModel); - initViewModel(mViewModel); - initView(binding); - - currentAlert = alertDialog.create(); - currentAlert.setCanceledOnTouchOutside(false); - - currentAlert.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); - currentAlert.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - - binding.positiveBtn.setOnClickListener(view -> { - currentAlert.dismiss(); - }); - - binding.neutralBtn.setOnClickListener(view -> { - resetAll(); - }); - - - currentAlert.setOnDismissListener(dialogInterface -> { - if(currentOnFilterDone != null) currentOnFilterDone.run(mViewModel); - }); - } - - private void initView(DialogOrdineProduzioneFiltroAvanzatoBinding bindings) { - - arrayAdapterNumOrds = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item); - arrayAdapterNumOrds.addAll(getAvailableNumOrds(false)); - bindings.filledExposedDropdownNumOrds.setAdapter(arrayAdapterNumOrds); - bindings.filledExposedDropdownNumOrds.setTokenizer(new MultiAutoCompleteTextView.CommaTokenizer()); - - arrayAdapterCodJcoms = new ArrayAdapter(currentContext, R.layout.dialog_vendita_filtro_avanzato__single_item); - arrayAdapterCodJcoms.addAll(getAvailableCodJcoms(false)); - bindings.filledExposedDropdownCodJcoms.setAdapter(arrayAdapterCodJcoms); - bindings.filledExposedDropdownCodJcoms.setTokenizer(new MultiAutoCompleteTextView.CommaTokenizer()); - - - refreshAll(); - } - - - private void initViewModel(DialogOrdineProduzioneFiltroAvanzatoViewModel viewModel) { - viewModel.applyAllTests(); - - BindableString.registerListener(numOrds, value -> { - viewModel.setNumOrdFilter(value); - viewModel.applyAllTests(); - - refreshArrayAdapter(arrayAdapterCodJcoms, getAvailableCodJcoms(true)); - }); - - BindableString.registerListener(codJcoms, value -> { - viewModel.setCodJcomFilter(value); - viewModel.applyAllTests(); - - refreshArrayAdapter(arrayAdapterNumOrds, getAvailableNumOrds(true)); - }); - - } - - - private void refreshArrayAdapter(ArrayAdapter arrayAdapter, List inputList) { - arrayAdapter.clear(); - arrayAdapter.addAll(inputList); - arrayAdapter.notifyDataSetChanged(); - } - - - private List getAvailableNumOrds(boolean skipRecalc) { - return Stream.of(Objects.requireNonNull(mViewModel.getMutableFilteredOrderList().getValue())) - .map(x -> x.getNumero().toString()) - .distinct() - .withoutNulls() - .sorted() - .toList(); - } - - - private List getAvailableCodJcoms(boolean skipRecalc) { - return Stream.of(Objects.requireNonNull(mViewModel.getMutableFilteredOrderList().getValue())) - .map(OrdineAccettazioneInevasoDTO::getCodJcom) - .distinct() - .withoutNulls() - .sorted() - .toList(); - } - - - public void refreshAll() { - numOrds.refresh(); - codJcoms.refresh(); - } - - - public void resetAll() { - numOrds.set(null); - codJcoms.set(null); - } -} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/dialog/DialogOrdineProduzioneFiltroAvanzatoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/dialog/DialogOrdineProduzioneFiltroAvanzatoViewModel.java deleted file mode 100644 index 900fc91d..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/dialog/DialogOrdineProduzioneFiltroAvanzatoViewModel.java +++ /dev/null @@ -1,76 +0,0 @@ -package it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.dialog; - -import androidx.lifecycle.MutableLiveData; - -import com.annimon.stream.Stream; -import com.annimon.stream.function.Predicate; - -import java.util.List; - -import it.integry.integrywmsnative.core.utility.UtilityString; -import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; - -public class DialogOrdineProduzioneFiltroAvanzatoViewModel { - - - private Predicate currentNumOrdsPredicate = null; - private Predicate currentCodJcomsPredicate = null; - - private List initialOrderList; - private final MutableLiveData> currentFilteredOrderList = new MutableLiveData<>(); - - public void init(List initialList) { - this.initialOrderList = initialList; - this.currentFilteredOrderList.setValue(this.initialOrderList); - } - - public MutableLiveData> getMutableFilteredOrderList() { - return this.currentFilteredOrderList; - } - - public void setNumOrdFilter(String numOrds) { - if(UtilityString.isNullOrEmpty(numOrds)) currentNumOrdsPredicate = null; - else { - String[] numOrdsSplitted = numOrds.split("[,\\ ]"); - - try{ - List numOrdsInteger = Stream.of(numOrdsSplitted) - .filter(x -> !UtilityString.isNullOrEmpty(x)) - .map(Integer::parseInt).toList(); - - currentNumOrdsPredicate = o -> numOrdsInteger.contains(o.getNumero()); - } catch (NumberFormatException ex) { - currentNumOrdsPredicate = null; - } - } - } - - public void setCodJcomFilter(String codJcom) { - if(UtilityString.isNullOrEmpty(codJcom)) currentCodJcomsPredicate = null; - else { - currentCodJcomsPredicate = o -> o.getCodJcom().toLowerCase().equalsIgnoreCase(codJcom); - } - } - - public void applyAllTests() { - - List returnList = null; - - if (currentNumOrdsPredicate == null && - currentCodJcomsPredicate == null - ) { - returnList = this.initialOrderList; - } else { - Stream tmpStream = Stream.of(this.initialOrderList) - .filter(x -> - (currentNumOrdsPredicate == null || (currentNumOrdsPredicate.test(x))) && - (currentCodJcomsPredicate == null || (currentCodJcomsPredicate.test(x))) - ); - - returnList = tmpStream.toList(); - } - - this.currentFilteredOrderList.setValue(returnList); - } - -} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index b1b73eee..134b28ef 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -13,14 +13,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; import javax.inject.Inject; import it.integry.barcode_base_android_library.model.BarcodeScanDTO; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.class_router.ClassRouter; -import it.integry.integrywmsnative.core.class_router.interfaces.OrdiniVenditaInterface; import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService; import it.integry.integrywmsnative.core.exception.EmptyLUException; import it.integry.integrywmsnative.core.exception.InvalidLUException; @@ -1515,8 +1512,7 @@ public class SpedizioneViewModel { var closeUDSRequestDto = new CloseUDSRequestDTO() .setMtbColt(this.mCurrentMtbColt) //.setPrintSSCC(shouldPrint) - .setOrderCodMdep(mTestateOrdini.get(0).getCodMdep()) - .setEnableTransferLogic(isTrasfOrderLogicEnabled()); + .setOrderCodMdep(mTestateOrdini.get(0).getCodMdep()); this.mColliSpedizioneRESTConsumer.closeUDS(closeUDSRequestDto, closeResponse -> { @@ -1549,11 +1545,6 @@ public class SpedizioneViewModel { onComplete, this::sendError); } - private boolean isTrasfOrderLogicEnabled() { - OrdiniVenditaInterface ordiniVendita = ClassRouter.getInstance(ClassRouter.PATH.ORDINI_VENDITA); - return ordiniVendita != null && ordiniVendita.isTrasfOrder(mTestateOrdini); - } - private void askPeso(Runnable onComplete) { if (mDefaultSegnoCol != -1 || !mShouldAskPesoLU) { diff --git a/app/src/main/res/layout/dialog_input_peso_lu.xml b/app/src/main/res/layout/dialog_input_peso_lu.xml index 654b5440..e126c856 100644 --- a/app/src/main/res/layout/dialog_input_peso_lu.xml +++ b/app/src/main/res/layout/dialog_input_peso_lu.xml @@ -85,7 +85,6 @@ android:ellipsize="end" android:imeOptions="actionNext" android:inputType="textNoSuggestions" - android:nextFocusForward="@id/filled_exposed_dropdown_vettore" android:singleLine="true" app:binding="@{view.codTcol}" /> diff --git a/app/src/main/res/layout/dialog_ordine_produzione_filtro_avanzato.xml b/app/src/main/res/layout/dialog_ordine_produzione_filtro_avanzato.xml deleted file mode 100644 index c421a0e4..00000000 --- a/app/src/main/res/layout/dialog_ordine_produzione_filtro_avanzato.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml b/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml deleted file mode 100644 index db13d298..00000000 --- a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml +++ /dev/null @@ -1,314 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java index a1ebb716..a5aa6209 100644 --- a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java +++ b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java @@ -6,8 +6,6 @@ import android.util.Log; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.wms.dynamic_customization.extensions.CustomConfiguration; -import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita; -import it.integry.wms.dynamic_customization.extensions.OrdiniVendita; public class DynamicContext { @@ -15,8 +13,6 @@ public class DynamicContext { Log.d("DynamicContext", "Caricamento personalizzazioni per Azienda BASE"); try { - ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class); ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class); } catch (Exception ex) { UtilityExceptions.defaultException(context, ex); diff --git a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java deleted file mode 100644 index 77adb537..00000000 --- a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java +++ /dev/null @@ -1,21 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita; - -public class FiltroOrdiniVendita implements IFiltroOrdiniVendita { - - @Override - public boolean shoudShowCodMdepFilter() { - return false; - } - - @Override - public boolean shoudShowIdViaggioFilter() { - return false; - } - - @Override - public boolean shoudShowAgenteFilter() { - return false; - } -} diff --git a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java deleted file mode 100644 index 62bafe5e..00000000 --- a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ /dev/null @@ -1,16 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import java.util.List; - -import it.integry.integrywmsnative.core.class_router.interfaces.OrdiniVenditaInterface; -import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO; - -public class OrdiniVendita implements OrdiniVenditaInterface { - - - @Override - public boolean isTrasfOrder(List testateOrdini) { - return false; - } - -} diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java index 55507696..7a842728 100644 --- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java +++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java @@ -6,8 +6,6 @@ import android.util.Log; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.wms.dynamic_customization.extensions.CustomConfiguration; -import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita; -import it.integry.wms.dynamic_customization.extensions.OrdiniVendita; public class DynamicContext { @@ -15,8 +13,6 @@ public class DynamicContext { Log.d("DynamicContext", "Caricamento personalizzazioni per VGAlimenti"); try { - ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class); - ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class); ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class); } catch (Exception ex) { UtilityExceptions.defaultException(context, ex); diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java deleted file mode 100644 index 12b5a5c9..00000000 --- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java +++ /dev/null @@ -1,22 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita; - -public class FiltroOrdiniVendita implements IFiltroOrdiniVendita { - - - @Override - public boolean shoudShowCodMdepFilter() { - return true; - } - - @Override - public boolean shoudShowIdViaggioFilter() { - return true; - } - - @Override - public boolean shoudShowAgenteFilter() { - return true; - } -} 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 deleted file mode 100644 index 825a141b..00000000 --- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ /dev/null @@ -1,21 +0,0 @@ -package it.integry.wms.dynamic_customization.extensions; - -import java.util.List; - -import it.integry.integrywmsnative.core.class_router.interfaces.OrdiniVenditaInterface; -import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO; -import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.core.utility.UtilityString; - -public class OrdiniVendita implements OrdiniVenditaInterface { - - @Override - public boolean isTrasfOrder(List testateOrdini) { - // Se il deposito del collo รจ diverso dal deposito dell'utente allora sto "evadendo" - // la merce per una vendita presente su un altro deposito - - String codMdepOrder = testateOrdini.get(0).getCodMdep(); - return !UtilityString.isNullOrEmpty(codMdepOrder) && - !codMdepOrder.equalsIgnoreCase(SettingsManager.i().getUserSession().getDepo().getCodMdep()); - } -}