From a4f866842a7e2195110c2d190e2ba98f086fd0b0 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 31 Oct 2019 11:48:31 +0100 Subject: [PATCH 1/3] Sistemato next focus nel filtro degli ordini di vendita --- .../dialogs/DialogVenditaFiltroAvanzato.java | 4 ++ .../layout/dialog_vendita_filtro_avanzato.xml | 43 +++++++++++++------ 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java index 6f05b426..85a80e9a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java @@ -133,6 +133,10 @@ public class DialogVenditaFiltroAvanzato { private void initView(DialogVenditaFiltroAvanzatoBinding bindings, DialogVenditaFiltroAvanzatoViewModel viewModel) { IFiltroOrdiniVendita filtroOrdiniVendita = ClassRouter.getIstance(ClassRouter.PATH.FILTRO_ORDINI_VENDITA); +// bindings.filledExposedDropdownDataCons.setOnFocusChangeListener((v, hasFocus) -> { +// bindings.filledExposedDropdownDataCons.callOnClick(); +// }); + bindings.filledExposedDropdownDataCons.setOnClickListener(view -> { Calendar c = UtilityDate.getCalendarInstance(); diff --git a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml b/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml index 2e3cfb83..5a35575b 100644 --- a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml +++ b/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml @@ -47,6 +47,8 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu" android:layout_width="match_parent" android:layout_height="wrap_content" + android:imeOptions="actionNext" + android:nextFocusDown="@id/input_id_viaggio" android:hint="@string/deposit"> @@ -73,6 +77,8 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="end" + android:imeOptions="actionNext" + android:nextFocusForward="@id/filled_exposed_dropdown_num_ords" app:binding="@{viewmodel.idViaggio}" /> @@ -93,6 +99,8 @@ android:inputType="number|text" android:singleLine="true" android:ellipsize="end" + android:imeOptions="actionNext" + android:nextFocusForward="@id/filled_exposed_dropdown_cliente" app:binding="@{viewmodel.numOrds}"/> @@ -112,6 +120,8 @@ android:inputType="textNoSuggestions" android:singleLine="true" android:ellipsize="end" + android:imeOptions="actionNext" + android:nextFocusForward="@id/filled_exposed_dropdown_vettore" app:binding="@{viewmodel.cliente}"/> @@ -131,6 +141,8 @@ android:inputType="textNoSuggestions" android:singleLine="true" android:ellipsize="end" + android:imeOptions="actionNext" + android:nextFocusForward="@id/filled_exposed_dropdown_automezzo" app:binding="@{viewmodel.vettore}"/> @@ -150,6 +162,8 @@ android:inputType="textNoSuggestions" android:singleLine="true" android:ellipsize="end" + android:imeOptions="actionNext" + android:nextFocusForward="@id/filled_exposed_dropdown_agente" app:binding="@{viewmodel.automezzo}"/> @@ -169,6 +183,8 @@ android:inputType="textNoSuggestions" android:singleLine="true" android:ellipsize="end" + android:imeOptions="actionNext" + android:nextFocusForward="@id/filled_exposed_dropdown_term_cons" app:binding="@{viewmodel.agente}"/> @@ -182,13 +198,13 @@ + android:id="@+id/filled_exposed_dropdown_data_cons" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textNoSuggestions" + android:focusable="false" + android:singleLine="true" + app:binding="@{viewmodel.dataConsegna}"/> @@ -201,12 +217,13 @@ android:hint="@string/terms_of_delivery"> From 2f207e2f11179de31eadc9e0363fe6fbc51332c9 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 31 Oct 2019 17:11:12 +0100 Subject: [PATCH 2/3] Fix in rettifica giacenze. Aggiunto version name in main. --- .../gest/main/MainFragment.java | 7 +++++++ .../viewmodel/RettificaGiacenzeViewModel.java | 3 ++- app/src/main/res/layout/fragment_main.xml | 17 ++++++++++++++++- 3 files changed, 25 insertions(+), 2 deletions(-) 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 5f346755..c8f80e5b 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 @@ -34,6 +34,7 @@ import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.core.utility.UtilityResources; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.FragmentMainBinding; import it.integry.integrywmsnative.databinding.FragmentMainMenuGroupLayoutBinding; @@ -80,6 +81,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab init(); initGestMenu(); + initVersion(); return mBindings.getRoot(); } @@ -241,4 +243,9 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab private void onMenuClick(MenuConfiguration.MenuItem menuItem) { ((MainActivity) getActivity()).setMenuItem(menuItem.getID()); } + + private void initVersion() { + String appVersion = UtilityResources.getAppVersion(); + mBindings.currentAppVersionName.setText("v" + appVersion); + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index ec933196..988f9734 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -478,7 +478,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked } public void openLU() { - DialogScanOrCreateLU.make(mContext, mtbColt -> { + DialogScanOrCreateLU.make(mContext, false, false, mtbColt -> { if(mtbColt == null) { ((IPoppableActivity)mContext).pop(); } else { @@ -635,6 +635,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked mtbColrToEditClone .setQtaCol(value.qtaTot.getBigDecimal()) + .setMtbAart(mtbColrToEdit.getMtbAart()) .setOperation(CommonModelConsts.OPERATION.NO_OP); mtbColt.get().getMtbColr().add(index, mtbColrToEditClone); diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 042748b4..352485ac 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -54,7 +54,6 @@ android:layout_height="wrap_content"> @@ -193,6 +192,22 @@ + + + + + + From 3cc8855a249b9627dab3cf945be7fa6d091ee882 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 31 Oct 2019 18:01:52 +0100 Subject: [PATCH 3/3] -> v1.8.6(93) --- .idea/caches/build_file_checksums.ser | Bin 1020 -> 1020 bytes app/build.gradle | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d94955de857e69762b2f8c6a73245e81bc477987..4be17c62b475245ab69cd09ab42a14672cd28a25 100644 GIT binary patch delta 65 zcmV-H0KWhH2mA++m;@r0TM)6FZUK`=0zn2KdSzmAVUtk;C6hG*5(E%oaB!1f0v8Y; X>bj_%D8+cu^OAxR_xZN7vjRy03JMu- delta 54 zcmV-60LlOS2mA++m;@7oBz&=)ZUK`^0zH!o0zm{2VQ_GhUji2prulXV#ho;(0T(-A M3z`HMv$Fz80T5*p6#xJL diff --git a/app/build.gradle b/app/build.gradle index 3f4947ff..c81850be 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 92 - def appVersionName = '1.8.5' + def appVersionCode = 93 + def appVersionName = '1.8.6' signingConfigs { release {