Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish v1.14.3(180)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2021-01-21 19:07:12 +01:00
commit 65c0e520c5
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 179 def appVersionCode = 180
def appVersionName = '1.14.2' def appVersionName = '1.14.3'
signingConfigs { signingConfigs {
release { release {

5
app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskCliente.java
View File

@ -21,6 +21,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDialog;
import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.databinding.DialogAskClienteBinding; import it.integry.integrywmsnative.databinding.DialogAskClienteBinding;
import it.integry.integrywmsnative.view.dialogs.DialogConsts; import it.integry.integrywmsnative.view.dialogs.DialogConsts;
import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteDestinatarioDTO;
import it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel.DialogAskCliente_Page1ViewModel; import it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel.DialogAskCliente_Page1ViewModel;
import it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel.DialogAskCliente_Page2ViewModel; import it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel.DialogAskCliente_Page2ViewModel;
@ -91,7 +92,9 @@ public class DialogAskCliente {
}); });
viewModel2.setOnConfirmClickListener(() -> { viewModel2.setOnConfirmClickListener(() -> {
onComplete.run(DialogConsts.Results.YES, viewModel2.getCurrentDestinatario().toVtbDestModel(), viewModel1.getCurrentCommessa()); DialogAskClienteDestinatarioDTO cliente = viewModel2.getCurrentDestinatario();
onComplete.run(DialogConsts.Results.YES, cliente != null ? cliente.toVtbDestModel() : null, viewModel1.getCurrentCommessa());
mDialog.dismiss(); mDialog.dismiss();
}); });

8
app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java
View File

@ -24,6 +24,8 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
private DialogAskClientePage2Binding mBinding; private DialogAskClientePage2Binding mBinding;
private Context mContext; private Context mContext;
private Runnable mOnConfirm;
private List<DialogAskClienteDestinatarioDTO> availableDestinatari; private List<DialogAskClienteDestinatarioDTO> availableDestinatari;
private String mCodAnag; private String mCodAnag;
@ -55,6 +57,11 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
public void onSuccess(ArrayList<DialogAskClienteDestinatarioDTO> value) { public void onSuccess(ArrayList<DialogAskClienteDestinatarioDTO> value) {
availableDestinatari = value; availableDestinatari = value;
initializeAdapter(value); initializeAdapter(value);
if(value == null || value.size() == 0) {
mOnConfirm.run();
return;
}
} }
@Override @Override
@ -66,6 +73,7 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
@Override @Override
public void setOnConfirmClickListener(Runnable onConfirm) { public void setOnConfirmClickListener(Runnable onConfirm) {
this.mOnConfirm = onConfirm;
this.mBinding.buttonYes.setOnClickListener(v -> { this.mBinding.buttonYes.setOnClickListener(v -> {
if (validateDestinatario()) { if (validateDestinatario()) {
this.resetClienteError(); this.resetClienteError();