From 66f117186ca10927fb545f750fa7cd722aedb5e1 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 28 Jan 2022 10:23:46 +0100 Subject: [PATCH] Piccoli fix su doc interni --- .../dialog/DialogSelectDocInfoViewModel.java | 11 +- .../edit_form/DocInterniEditFormActivity.java | 24 +-- .../DocInterniEditFormViewModel.java | 2 +- .../dialogs/base/DialogSimpleInputHelper.java | 20 +- .../main/res/layout/dialog_input_general.xml | 184 ++++++++---------- .../dialog_versamento_automatico_ul_done.xml | 75 ------- .../main/res/layout/fragment_doc_interni.xml | 2 +- 7 files changed, 113 insertions(+), 205 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java index ed158cf7..8ac7bfe0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java @@ -6,14 +6,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt; import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener; import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniViewModel; -import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO; -import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GrigliaAcquistiDTO; -import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GruppiArticoloDTO; import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO; +import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO; +import it.integry.integrywmsnative.gest.contab_doc_interni.dto.GruppiArticoloDTO; import it.integry.integrywmsnative.gest.contab_doc_interni.dto.TipiDocDTO; @@ -94,11 +91,11 @@ public class DialogSelectDocInfoViewModel { } public List getAvailableCodDtips() { - return Stream.of(mDocInterniSetupDTO.getTipiDoc()).map(TipiDocDTO::getLabel).toList(); + return mDocInterniSetupDTO.getTipiDoc() != null ? Stream.of(mDocInterniSetupDTO.getTipiDoc()).map(TipiDocDTO::getLabel).toList() : new ArrayList<>(); } public List getAvailableCodMgrps() { - return Stream.of(mDocInterniSetupDTO.getGruppiArt()).map(GruppiArticoloDTO::getLabel).toList(); + return mDocInterniSetupDTO.getGruppiArt() != null ? Stream.of(mDocInterniSetupDTO.getGruppiArt()).map(GruppiArticoloDTO::getLabel).toList() : new ArrayList<>(); } public List getAvailableFornitori() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java index 603ad11f..67ca2042 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java @@ -101,22 +101,22 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter SqlMtbColt document = this.viewModel.getDocument(); this.codDtip.set(document.getCodDtipProvv()); this.note.set(document.getAnnotazioni()); - if(document.getCodMgrp() != null){ + if (document.getCodMgrp() != null) { this.codMgrp.set(document.getCodMgrp()); - }else{ + } else { binding.mtbGrupContainer.setVisibility(View.GONE); } - if (document.getCodAnag() != null){ - this.codAnag.set(document.getCodAnag() + (document.getCodVdes()!=null?" - "+document.getCodVdes():"")); - }else{ + if (document.getCodAnag() != null) { + this.codAnag.set(document.getCodAnag() + (document.getCodVdes() != null ? " - " + document.getCodVdes() : "")); + } else { this.binding.supplierLayout.setVisibility(View.GONE); } this.documentHeader.set(String.format(this.getString(R.string.doc_interni_doc_header), document.getId(), document.getCodDtipProvv())); - if (document.getNumDoc() != null && document.getDataDoc() != null){ + if (document.getNumDoc() != null && document.getDataDoc() != null) { this.documentRifHeader.set(String.format(this.getString(R.string.doc_testata), document.getNumDoc().toString(), document.getDataDoc())); - }else{ + } else { this.binding.docRifLayout.setVisibility(View.GONE); } } @@ -138,6 +138,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter this.viewModel.setProductsList(productList); } + private void initRecyclerView() { this.viewModel.docRows.observe(this, this::refreshList); DocumentRowsListAdapter listAdapter = new DocumentRowsListAdapter(this, documentRowsObservableList); @@ -156,14 +157,13 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter } - public void closeEdit() { this.onBackPressed(); } public void manualSearch() { BarcodeManager.disable(); - DialogSimpleInputHelper.makeInputDialog(this, "Inserisci il codice a barre/codice articolo da cercare", null, this.viewModel::onSearch, BarcodeManager::enable).show(); + DialogSimpleInputHelper.makeInputDialog(this, "Ricerca articolo", null, "Cod articolo / Barcode", this.viewModel::onSearch, BarcodeManager::enable).show(); } @@ -217,7 +217,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter mtbAart.setQtaCnf(BigDecimal.valueOf(row.getQtaCnf())); mtbAart.setDescrizione(row.getDescrizione()); mtbAart.setDescrizioneEstesa(row.getDescrizione()); - mtbAart.setFlagTracciabilita(flagTracciabilita? "S" : "N"); + mtbAart.setFlagTracciabilita(flagTracciabilita ? "S" : "N"); mtbAart.setUntMis(row.getUntMis()); DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO() @@ -236,7 +236,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter .setSuggestPartitaMag(data -> { Date dataScad = data.getDataScad(); String partitaMag = null; - if (dataScad != null){ + if (dataScad != null) { partitaMag = new SimpleDateFormat("yyyymmdd").format(dataScad); } return partitaMag; @@ -271,7 +271,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter @Override public void onMtbColrEdit(MtbColr mtbColr) { GrigliaAcquistiChildDTO articolo = viewModel.getArticoloByCodMart(mtbColr.getCodMart()); - this.viewModel.editRow(entityToSql(mtbColr),articolo.getFlagTracciabilita().equalsIgnoreCase("S")); + this.viewModel.editRow(entityToSql(mtbColr), articolo.getFlagTracciabilita().equalsIgnoreCase("S")); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java index 3cc8ae14..566368aa 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java @@ -147,7 +147,7 @@ public void deleteDocument() { } private GrigliaAcquistiChildDTO searchArticolo(String filter) { - return Stream.of(this.productsList).filter(dto -> dto.getCodMart().equalsIgnoreCase(filter) || dto.getBarcode().equalsIgnoreCase(filter)).findFirstOrElse(null); + return Stream.of(this.productsList).filter(dto -> filter.equalsIgnoreCase(dto.getCodMart()) || filter.equalsIgnoreCase(dto.getBarcode())).findFirstOrElse(null); } private SaveDTO getSaveDto() { 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 351619a1..1ad3cfae 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 @@ -2,7 +2,6 @@ package it.integry.integrywmsnative.view.dialogs.base; import android.app.Dialog; import android.content.Context; -import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.view.LayoutInflater; @@ -12,6 +11,7 @@ import androidx.databinding.DataBindingUtil; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityDialog; +import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogInputGeneralBinding; /** @@ -21,7 +21,7 @@ import it.integry.integrywmsnative.databinding.DialogInputGeneralBinding; public class DialogSimpleInputHelper { - private static Dialog makeBase(Context mContext, String titleText, String valueText, RunnableArgs onPositiveClick, Runnable onNegativeClick){ + private static Dialog makeBase(Context mContext, String titleText, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick){ Dialog dialog = new Dialog(mContext); DialogSimpleInputViewModel viewModel = new DialogSimpleInputViewModel(dialog); @@ -39,10 +39,14 @@ public class DialogSimpleInputHelper { //Title VIEW mBinding.titleText.setText(titleText); - if (valueText != null){ - mBinding.generalInput.setText(valueText); + + if (!UtilityString.isNullOrEmpty(hintText)){ + mBinding.generalInput.setHint(hintText); + } + + if (!UtilityString.isNullOrEmpty(defaultTextValue)){ + mBinding.generalInput.setText(defaultTextValue); } - ColorStateList colorStateList = ColorStateList.valueOf(Color.WHITE); //Content View dialog.setCancelable(true); @@ -60,17 +64,19 @@ public class DialogSimpleInputHelper { return makeBase(mContext, title, null, + null, onPositiveClick, onNegativeClick); } - public static Dialog makeInputDialog(Context mContext, String title,String value, RunnableArgs onPositiveClick, Runnable onNegativeClick){ + public static Dialog makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs onPositiveClick, Runnable onNegativeClick){ return makeBase(mContext, title, - value, + defaultTextValue, + hintText, onPositiveClick, onNegativeClick); diff --git a/app/src/main/res/layout/dialog_input_general.xml b/app/src/main/res/layout/dialog_input_general.xml index 14456ed0..d155b2a7 100644 --- a/app/src/main/res/layout/dialog_input_general.xml +++ b/app/src/main/res/layout/dialog_input_general.xml @@ -1,142 +1,122 @@ - + + - - + android:layout_gravity="center_horizontal" + android:orientation="vertical" + app:cardBackgroundColor="@color/light_blue_300" + app:cardCornerRadius="24dp" + app:cardElevation="0dp"> - - - - - + android:layout_margin="4dp" + android:background="@drawable/dialog_card_child_bg" + android:padding="24dp"> - - - - - - - + android:gravity="center_horizontal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="Insert here" /> - + + + android:layout_height="wrap_content" + tools:hint="input here" /> - - - - - - - - - + - + - + - - - - - - + - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_versamento_automatico_ul_done.xml b/app/src/main/res/layout/dialog_versamento_automatico_ul_done.xml index fc03339d..b46625db 100644 --- a/app/src/main/res/layout/dialog_versamento_automatico_ul_done.xml +++ b/app/src/main/res/layout/dialog_versamento_automatico_ul_done.xml @@ -63,81 +63,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title_text" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -