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 @@ + + + + + +