From 9dc3996aef5b9e85c11286ba98660153c4fb0dfb Mon Sep 17 00:00:00 2001 From: ValerioC Date: Wed, 25 May 2022 17:17:58 +0200 Subject: [PATCH] Nuova gestione linee di produzione --- .../MainApplicationComponent.java | 7 +- .../configs/MenuConfiguration.java | 247 +++++++++--------- .../core/utility/UtilityBarcode.java | 4 + .../dialogs/base/DialogSimpleInputHelper.java | 51 +++- .../layout/dialog_print_order_sscc_list.xml | 2 +- .../res/layout/doc_interni_list_model.xml | 10 +- app/src/main/res/values-it/strings.xml | 14 + app/src/main/res/values/config.xml | 5 +- app/src/main/res/values/strings.xml | 14 + 9 files changed, 215 insertions(+), 139 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java index 264185c6..26d9a408 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java @@ -45,6 +45,8 @@ import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisogn import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdModule; import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaComponent; import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaModule; +import it.integry.integrywmsnative.gest.prod_linee_produzione.ProdLineeProduzioneComponent; +import it.integry.integrywmsnative.gest.prod_linee_produzione.ProdLineeProduzioneModule; import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeComponent; import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeModule; import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceComponent; @@ -131,7 +133,8 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr DialogSelectDocRowsModule.class, DialogAskClienteModule.class, DialogEditArticoloModule.class, - DialogPrintOrderSSCCListModule.class + DialogPrintOrderSSCCListModule.class, + ProdLineeProduzioneModule.class }) public interface MainApplicationComponent { @@ -221,6 +224,8 @@ public interface MainApplicationComponent { DialogPrintOrderSSCCListComponent.Factory dialogPrintOrderSSCCListComponent(); + ProdLineeProduzioneComponent.Factory prodLineeProduzioneComponent(); + void inject(MainApplication mainApplication); void inject(AppContext mainApplication); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java index d446996f..8e1c4763 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java @@ -8,6 +8,7 @@ import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoF import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment; import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment; import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdFragment; +import it.integry.integrywmsnative.gest.prod_linee_produzione.ProdLineeProduzioneFragment; import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment; import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceFragment; import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment; @@ -45,137 +46,145 @@ public class MenuConfiguration extends BaseMenuConfiguration { .setDrawerIcon(R.drawable.ic_black_latest_delivery) .setFragmentFactory(UltimiArriviFornitoreFragment::newInstance)) ).addGroup( - new MenuGroup() - .setGroupText(R.string.checkout) - .setGroupId(R.id.nav_group_spedizione) - .setCodMenu("MM010") + new MenuGroup() + .setGroupText(R.string.checkout) + .setGroupId(R.id.nav_group_spedizione) + .setCodMenu("MM010") + + .addItem(new MenuItem() + .setID(R.id.nav_spedizione) + .setCodMenu("MG046") + .setTitleText(R.string.vendita_title_fragment) + .setTitleIcon(R.drawable.ic_dashboard_spedizione) + .setDrawerIcon(R.drawable.ic_black_upload) + .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null))) + + .addItem(new MenuItem() + .setID(R.id.nav_free_picking) + .setCodMenu("MG047") + .setTitleText(R.string.free_picking) + .setTitleIcon(R.drawable.ic_dashboard_picking_libero) + .setDrawerIcon(R.drawable.ic_black_barcode_scanner) + .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA))) + + .addItem(new MenuItem() + .setID(R.id.nav_resi_cliente) + .setCodMenu("MG048") + .setTitleText(R.string.fragment_ultime_consegne_cliente_title) + .setTitleIcon(R.drawable.ic_latest_delivery_customer) + .setDrawerIcon(R.drawable.ic_black_latest_delivery) + .setFragmentFactory(UltimeConsegneClienteFragment::newInstance)) + ).addGroup(new MenuGroup() + .setGroupText(R.string.manufacture) + .setGroupId(R.id.nav_group_produzione) + .setCodMenu("MM009") .addItem(new MenuItem() - .setID(R.id.nav_spedizione) - .setCodMenu("MG046") - .setTitleText(R.string.vendita_title_fragment) - .setTitleIcon(R.drawable.ic_dashboard_spedizione) - .setDrawerIcon(R.drawable.ic_black_upload) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null))) + .setID(R.id.nav_prod_ordine_produzione) + .setCodMenu("MG049") + .setTitleText(R.string.prod_ordine_produzione_title_fragment) + .setTitleIcon(R.drawable.ic_dashboard_prod_accettazione_produzione) + .setDrawerIcon(R.drawable.ic_black_external) + .setFragmentFactory(ProdOrdineProduzioneElencoFragment::newInstance)) .addItem(new MenuItem() - .setID(R.id.nav_free_picking) - .setCodMenu("MG047") - .setTitleText(R.string.free_picking) - .setTitleIcon(R.drawable.ic_dashboard_picking_libero) - .setDrawerIcon(R.drawable.ic_black_barcode_scanner) - .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA))) + .setID(R.id.nav_prod_ordine_lavorazione) + .setCodMenu("MG050") + .setTitleText(R.string.prod_ordine_lavorazione_title_fragment) + .setTitleIcon(R.drawable.ic_dashboard_prod_picking_lavorazione) + .setDrawerIcon(R.drawable.ic_black_external) + .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null))) .addItem(new MenuItem() - .setID(R.id.nav_resi_cliente) - .setCodMenu("MG048") - .setTitleText(R.string.fragment_ultime_consegne_cliente_title) - .setTitleIcon(R.drawable.ic_latest_delivery_customer) - .setDrawerIcon(R.drawable.ic_black_latest_delivery) - .setFragmentFactory(UltimeConsegneClienteFragment::newInstance)) - ).addGroup(new MenuGroup() - .setGroupText(R.string.manufacture) - .setGroupId(R.id.nav_group_produzione) - .setCodMenu("MM009") - - .addItem(new MenuItem() - .setID(R.id.nav_prod_ordine_produzione) - .setCodMenu("MG049") - .setTitleText(R.string.prod_ordine_produzione_title_fragment) - .setTitleIcon(R.drawable.ic_dashboard_prod_accettazione_produzione) - .setDrawerIcon(R.drawable.ic_black_external) - .setFragmentFactory(ProdOrdineProduzioneElencoFragment::newInstance)) - - .addItem(new MenuItem() - .setID(R.id.nav_prod_ordine_lavorazione) - .setCodMenu("MG050") - .setTitleText(R.string.prod_ordine_lavorazione_title_fragment) - .setTitleIcon(R.drawable.ic_dashboard_prod_picking_lavorazione) - .setDrawerIcon(R.drawable.ic_black_external) - .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null))) - - .addItem(new MenuItem() - .setID(R.id.nav_free_lav_picking) - .setCodMenu("MG051") - .setTitleText(it.integry.integrywmsnative.R.string.free_lav_picking) - .setTitleIcon(R.drawable.ic_dashboard_prod_picking_libero) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner) - .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.LAVORAZIONE))) - - .addItem(new MenuItem() - .setID(R.id.nav_prod_posizionamento_da_ord) - .setCodMenu("MG052") - .setTitleText(R.string.prod_fabbisogno_linee_prod_title) - .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_merce) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf) - .setFragmentFactory(ProdFabbisognoLineeProdFragment::newInstance)) - - .addItem(new MenuItem() - .setID(R.id.nav_prod_versamento_materiale) - .setCodMenu("MG053") - .setTitleText(R.string.prod_versamento_materiale_title_fragment) - .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_materiale) - .setDrawerIcon(R.drawable.ic_black_external) - .setFragmentFactory(ProdVersamentoMaterialeFragment::newInstance)) - - .addItem(new MenuItem() - .setID(R.id.nav_prod_recupero_materiale) - .setCodMenu("MG054") - .setTitleText(R.string.prod_recupero_materiale_title_fragment) - .setTitleIcon(R.drawable.ic_dashboard_prod_recupero_materiale) - .setDrawerIcon(R.drawable.ic_black_external) - .setFragmentFactory(ProdRecuperoMaterialeFragment::newInstance)) - - .addItem(new MenuItem() - .setID(it.integry.integrywmsnative.R.id.nav_prod_rientro_merce) - .setCodMenu("MG059") - .setTitleText(it.integry.integrywmsnative.R.string.rientro_merce_fragment_title) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_accettazione_produzione) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) - .setFragmentFactory(ProdRientroMerceFragment::newInstance)) - ).addGroup( - new MenuGroup() - .setGroupText(R.string.internal_handling) - .setGroupId(R.id.nav_group_movimentazione_interna) - .setCodMenu("MM011") + .setID(R.id.nav_free_lav_picking) + .setCodMenu("MG051") + .setTitleText(it.integry.integrywmsnative.R.string.free_lav_picking) + .setTitleIcon(R.drawable.ic_dashboard_prod_picking_libero) + .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner) + .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.LAVORAZIONE))) .addItem(new MenuItem() - .setID(R.id.nav_versamento_merce) - .setCodMenu("MG055") - .setTitleText(R.string.versamento_merce_fragment_title) - .setTitleIcon(R.drawable.ic_dashboard_versamento_merce) - .setDrawerIcon(R.drawable.ic_black_load_shelf) - .setFragmentFactory(VersamentoMerceFragment::newInstance)) + .setID(R.id.nav_prod_posizionamento_da_ord) + .setCodMenu("MG052") + .setTitleText(R.string.prod_fabbisogno_linee_prod_title) + .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_merce) + .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf) + .setFragmentFactory(ProdFabbisognoLineeProdFragment::newInstance)) .addItem(new MenuItem() - .setID(R.id.nav_rettifica_giacenze) - .setCodMenu("MG056") - .setTitleText(R.string.rettifica_giacenze_fragment_title) - .setTitleIcon(R.drawable.ic_dashboard_rettifica_giacenze) - .setDrawerIcon(R.drawable.ic_black_empty_box) - .setFragmentFactory(RettificaGiacenzeFragment::newInstance)) - - - ).addGroup( - new MenuGroup() - .setCodMenu("MM012") - .setGroupText(it.integry.integrywmsnative.R.string.punto_vendita) - .setGroupId(it.integry.integrywmsnative.R.id.nav_group_puntivendita) + .setID(R.id.nav_prod_versamento_materiale) + .setCodMenu("MG053") + .setTitleText(R.string.prod_versamento_materiale_title_fragment) + .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_materiale) + .setDrawerIcon(R.drawable.ic_black_external) + .setFragmentFactory(ProdVersamentoMaterialeFragment::newInstance)) .addItem(new MenuItem() - .setCodMenu("MG057") - .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto) - .setTitleText(it.integry.integrywmsnative.R.string.generate_orders) - .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv) - .setFragmentFactory(PVOrdiniAcquistoGrigliaFragment::newInstance)) + .setID(R.id.nav_prod_recupero_materiale) + .setCodMenu("MG054") + .setTitleText(R.string.prod_recupero_materiale_title_fragment) + .setTitleIcon(R.drawable.ic_dashboard_prod_recupero_materiale) + .setDrawerIcon(R.drawable.ic_black_external) + .setFragmentFactory(ProdRecuperoMaterialeFragment::newInstance)) + .addItem(new MenuItem() - .setCodMenu("MG058") - .setID(it.integry.integrywmsnative.R.id.nav_pv_doc_interni) - .setTitleText(it.integry.integrywmsnative.R.string.doc_interni) - .setTitleIcon(R.drawable.ic_dashboard_contab_doc_interni) - .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_contab_doc_interni) - .setFragmentFactory(DocInterniFragment::newInstance)) + .setID(it.integry.integrywmsnative.R.id.nav_prod_rientro_merce) + .setCodMenu("MG059") + .setTitleText(it.integry.integrywmsnative.R.string.rientro_merce_fragment_title) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_accettazione_produzione) + .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) + .setFragmentFactory(ProdRientroMerceFragment::newInstance)) + + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_prod_linee) + .setCodMenu("MG061") + .setTitleText(it.integry.integrywmsnative.R.string.nav_prod_linee_title) + .setTitleIcon(R.drawable.ic_production_line) + .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_production_line) + .setFragmentFactory(ProdLineeProduzioneFragment::newInstance)) + ).addGroup( + new MenuGroup() + .setGroupText(R.string.internal_handling) + .setGroupId(R.id.nav_group_movimentazione_interna) + .setCodMenu("MM011") + + .addItem(new MenuItem() + .setID(R.id.nav_versamento_merce) + .setCodMenu("MG055") + .setTitleText(R.string.versamento_merce_fragment_title) + .setTitleIcon(R.drawable.ic_dashboard_versamento_merce) + .setDrawerIcon(R.drawable.ic_black_load_shelf) + .setFragmentFactory(VersamentoMerceFragment::newInstance)) + + .addItem(new MenuItem() + .setID(R.id.nav_rettifica_giacenze) + .setCodMenu("MG056") + .setTitleText(R.string.rettifica_giacenze_fragment_title) + .setTitleIcon(R.drawable.ic_dashboard_rettifica_giacenze) + .setDrawerIcon(R.drawable.ic_black_empty_box) + .setFragmentFactory(RettificaGiacenzeFragment::newInstance)) + + + ).addGroup( + new MenuGroup() + .setCodMenu("MM012") + .setGroupText(it.integry.integrywmsnative.R.string.punto_vendita) + .setGroupId(it.integry.integrywmsnative.R.id.nav_group_puntivendita) + + .addItem(new MenuItem() + .setCodMenu("MG057") + .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto) + .setTitleText(it.integry.integrywmsnative.R.string.generate_orders) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv) + .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv) + .setFragmentFactory(PVOrdiniAcquistoGrigliaFragment::newInstance)) + .addItem(new MenuItem() + .setCodMenu("MG058") + .setID(it.integry.integrywmsnative.R.id.nav_pv_doc_interni) + .setTitleText(it.integry.integrywmsnative.R.string.doc_interni) + .setTitleIcon(R.drawable.ic_dashboard_contab_doc_interni) + .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_contab_doc_interni) + .setFragmentFactory(DocInterniFragment::newInstance)) // .addItem(new MenuItem() // .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto_trasmessi) @@ -183,7 +192,7 @@ public class MenuConfiguration extends BaseMenuConfiguration { // .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_trasmitted_orders_list) // .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_trasmitted_orders_list) // .setFragmentClass(PVOrdiniAcquistoTransmittedListFragment.newInstance())) - ); + ); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java index fa6558ac..ef97b9d6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java @@ -32,6 +32,10 @@ public class UtilityBarcode { return barcodeScanDTO != null && (barcodeScanDTO.getType() == BarcodeType.CODE128 || barcodeScanDTO.getType() == BarcodeType.EAN128); } + public static boolean isEan128(BarcodeScanDTO barcodeScanDTO) { + return barcodeScanDTO != null && barcodeScanDTO.getType() == BarcodeType.EAN128; + } + public static boolean isEtichettaPosizione(BarcodeScanDTO barcodeScanDTO) { return isEtichettaPosizione(barcodeScanDTO, true); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleInputHelper.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleInputHelper.java index 1ad3cfae..1bf800bb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleInputHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleInputHelper.java @@ -4,6 +4,7 @@ import android.app.Dialog; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; +import android.text.InputType; import android.view.LayoutInflater; import androidx.databinding.DataBindingUtil; @@ -21,15 +22,14 @@ import it.integry.integrywmsnative.databinding.DialogInputGeneralBinding; public class DialogSimpleInputHelper { - private static Dialog makeBase(Context mContext, String titleText, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick){ + private static Dialog makeBase(Context mContext, String titleText, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick, Integer inputType) { Dialog dialog = new Dialog(mContext); DialogSimpleInputViewModel viewModel = new DialogSimpleInputViewModel(dialog); - DialogInputGeneralBinding mBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.dialog_input_general, null, false); viewModel - .setOnPositive(()->{ + .setOnPositive(() -> { onPositiveClick.run(mBinding.generalInput.getText().toString()); }) @@ -38,50 +38,79 @@ public class DialogSimpleInputHelper { mBinding.setViewmodel(viewModel); //Title VIEW + mBinding.titleText.setText(titleText); - if (!UtilityString.isNullOrEmpty(hintText)){ + if (!UtilityString.isNullOrEmpty(hintText)) { mBinding.generalInput.setHint(hintText); } - if (!UtilityString.isNullOrEmpty(defaultTextValue)){ + if (!UtilityString.isNullOrEmpty(defaultTextValue)) { mBinding.generalInput.setText(defaultTextValue); } - + if (inputType != null) { + mBinding.generalInput.setInputType(InputType.TYPE_CLASS_NUMBER); + } //Content View dialog.setCancelable(true); dialog.setCanceledOnTouchOutside(false); dialog.setContentView(mBinding.getRoot()); dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - UtilityDialog.setTo90PercentWidth(mContext,dialog); + UtilityDialog.setTo90PercentWidth(mContext, dialog); return dialog; } - public static Dialog makeInputDialog(Context mContext, String title, RunnableArgs onPositiveClick, Runnable onNegativeClick){ + public static Dialog makeInputDialog(Context mContext, String title, RunnableArgs onPositiveClick, Runnable onNegativeClick) { return makeBase(mContext, title, null, null, onPositiveClick, - onNegativeClick); + onNegativeClick, + null); } - public static Dialog makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick){ + public static Dialog makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick) { return makeBase(mContext, title, defaultTextValue, hintText, onPositiveClick, - onNegativeClick); + onNegativeClick, + null); + + } + + public static Dialog makeInputDialog(Context mContext, String title, RunnableArgs onPositiveClick, Runnable onNegativeClick, Integer inputType) { + + return makeBase(mContext, + title, + null, + null, + onPositiveClick, + onNegativeClick, + inputType); } + public static Dialog makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick, Integer inputType) { + + return makeBase(mContext, + title, + defaultTextValue, + hintText, + onPositiveClick, + onNegativeClick, + inputType); + + } + } diff --git a/app/src/main/res/layout/dialog_print_order_sscc_list.xml b/app/src/main/res/layout/dialog_print_order_sscc_list.xml index 072982a3..775bc03c 100644 --- a/app/src/main/res/layout/dialog_print_order_sscc_list.xml +++ b/app/src/main/res/layout/dialog_print_order_sscc_list.xml @@ -67,7 +67,7 @@ android:id="@+id/radioGroup" android:layout_width="match_parent" android:layout_height="wrap_content" - android:onCheckedChanged="@{view.onCheckChange}" + android:onCheckedChanged="@{view::onCheckChange}" android:layout_marginTop="8dp" app:layout_constraintTop_toBottomOf="@id/description_text"> diff --git a/app/src/main/res/layout/doc_interni_list_model.xml b/app/src/main/res/layout/doc_interni_list_model.xml index ec1ec865..d1d26706 100644 --- a/app/src/main/res/layout/doc_interni_list_model.xml +++ b/app/src/main/res/layout/doc_interni_list_model.xml @@ -1,12 +1,12 @@ - + + - + tools:text="13 Apr" /> + tools:text="0 Articoli" /> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d1ea02c3..bfbeb35a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -8,6 +8,7 @@ Attendere Caricamento Completato + Successo %s del %s]]> %s del %s]]> %s del %s]]> @@ -390,4 +391,17 @@ Nuovo articolo in griglia Seleziona la riga da modificare Colli in arrivo + Linee di produzione + Nessuna linea disponibile + In lavorazione + In pausa + Ferma + Risorse allocate + Ordini in lavorazione + Ridistribuisci risorse + Avvia nuova produzione + Arresta produzione + Inizio produzione + Ultima produzione + Nessuna linea disponibile \ No newline at end of file diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml index 116c8646..189b3627 100644 --- a/app/src/main/res/values/config.xml +++ b/app/src/main/res/values/config.xml @@ -26,8 +26,9 @@ - - + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3ed64bb0..76328c7f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -45,6 +45,7 @@ Waiting Loading Completed + Success Search… Login Permissions are required for app to work properly @@ -396,4 +397,17 @@ Newly added product Select document row to edit Incoming packages + Production lines + No line available + in progress + Stand by + Stopped + Resources set + Orders in progress + Redistribute resources + Start production + Stop production + Production start + Last production + No production line available