Merge branch 'develop' into feature/OrdiniAcquisto_PV

# Conflicts:
#	.idea/assetWizardSettings.xml
#	.idea/misc.xml

.gitignore

@@ -1,9 +1,151 @@
+### Android ###
+# Built application files
+*.apk
+*.ap_
+*.aab
+# Files for the ART/Dalvik VM
+*.dex
+# Java class files
+*.class
+# Generated files
+bin/
+gen/
+out/
+release/
+# Gradle files
+.gradle/
+build/
+# Local configuration file (sdk path, etc)
+local.properties
+# Proguard folder generated by Eclipse
+proguard/
+# Log Files
+*.log
+# Android Studio Navigation editor temp files
+.navigation/
+# Android Studio captures folder
+captures/
+# IntelliJ
 *.iml
-.gradle
+.idea/workspace.xml
-/local.properties
+.idea/tasks.xml
-/.idea/workspace.xml
+.idea/gradle.xml
-/.idea/libraries
+.idea/assetWizardSettings.xml
-.DS_Store
+.idea/dictionaries
-/build
+.idea/libraries
-/captures
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+# External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+# Version control
+vcs.xml
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+### Android Patch ###
+gen-external-apklibs
+output.json
+# Replacement of .externalNativeBuild directories introduced
+# with Android Studio 3.5.
+.cxx/
+### AndroidStudio ###
+# Covers files to be ignored for android development using Android Studio.
+# Built application files
+# Files for the ART/Dalvik VM
+# Java class files
+# Generated files
+# Gradle files
+.gradle
+# Signing files
+.signing/
+# Local configuration file (sdk path, etc)
+# Proguard folder generated by Eclipse
+# Log Files
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+*.ipr
+*~
+*.swp
+# Android Patch
+# External native build folder generated in Android Studio 2.2 and later
+# NDK
+obj/
+# IntelliJ IDEA
+*.iws
+/out/
+# User-specific configurations
+.idea/caches/
+.idea/libraries/
+.idea/shelf/
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/scopes/scope_settings.xml
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+# Package Files #
+*.war
+*.ear
+# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
+hs_err_pid*
+## Plugin-specific files:
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+# JIRA plugin
+atlassian-ide-plugin.xml
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+### AndroidStudio Patch ###
+!/gradle/wrapper/gradle-wrapper.jar

.idea/assetWizardSettings.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WizardSettings">
-    <option name="children">
-      <map>
-        <entry key="vectorWizard">
-          <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="vectorAssetStep">
-                    <value>
-                      <PersistentState>
-                        <option name="children">
-                          <map>
-                            <entry key="clipartAsset">
-                              <value>
-                                <PersistentState>
-                                  <option name="values">
-                                    <map>
-                                      <entry key="url" value="jar:file:/C:/Program%20Files/Android/Android%20Studio/plugins/android/lib/android.jar!/images/material_design_icons/content/ic_save_black_24dp.xml" />
-                                    </map>
-                                  </option>
-                                </PersistentState>
-                              </value>
-                            </entry>
-                          </map>
-                        </option>
-                        <option name="values">
-                          <map>
-                            <entry key="outputName" value="ic_save_24" />
-                            <entry key="sourceFile" value="C:\Users\ValerioC" />
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

.idea/gradle.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/barcode_base_android_library" />
-            <option value="$PROJECT_DIR$/dynamic__base" />
-            <option value="$PROJECT_DIR$/dynamic_frudis" />
-            <option value="$PROJECT_DIR$/dynamic_ime" />
-            <option value="$PROJECT_DIR$/dynamic_saporiveri_pv" />
-            <option value="$PROJECT_DIR$/dynamic_vgalimenti" />
-            <option value="$PROJECT_DIR$/honeywellscannerlibrary" />
-            <option value="$PROJECT_DIR$/keyobardemulatorscannerlibrary" />
-            <option value="$PROJECT_DIR$/pointmobilescannerlibrary" />
-            <option value="$PROJECT_DIR$/zebrascannerlibrary" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

.idea/misc.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/WMS.iml" filepath="$PROJECT_DIR$/WMS.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/barcode_base_android_library/barcode_base_android_library.iml" filepath="$PROJECT_DIR$/barcode_base_android_library/barcode_base_android_library.iml" />
-      <module fileurl="file://$PROJECT_DIR$/dynamic__base/dynamic__base.iml" filepath="$PROJECT_DIR$/dynamic__base/dynamic__base.iml" />
-      <module fileurl="file://$PROJECT_DIR$/dynamic_frudis/dynamic_frudis.iml" filepath="$PROJECT_DIR$/dynamic_frudis/dynamic_frudis.iml" />
-      <module fileurl="file://$PROJECT_DIR$/dynamic_ime/dynamic_ime.iml" filepath="$PROJECT_DIR$/dynamic_ime/dynamic_ime.iml" />
-      <module fileurl="file://$PROJECT_DIR$/dynamic_saporiveri_pv/dynamic_saporiveri_pv.iml" filepath="$PROJECT_DIR$/dynamic_saporiveri_pv/dynamic_saporiveri_pv.iml" />
-      <module fileurl="file://$PROJECT_DIR$/dynamic_vgalimenti/dynamic_vgalimenti.iml" filepath="$PROJECT_DIR$/dynamic_vgalimenti/dynamic_vgalimenti.iml" />
-      <module fileurl="file://$PROJECT_DIR$/honeywellscannerlibrary/honeywellscannerlibrary.iml" filepath="$PROJECT_DIR$/honeywellscannerlibrary/honeywellscannerlibrary.iml" />
-      <module fileurl="file://$PROJECT_DIR$/keyobardemulatorscannerlibrary/keyobardemulatorscannerlibrary.iml" filepath="$PROJECT_DIR$/keyobardemulatorscannerlibrary/keyobardemulatorscannerlibrary.iml" />
-      <module fileurl="file://$PROJECT_DIR$/pointmobilescannerlibrary/pointmobilescannerlibrary.iml" filepath="$PROJECT_DIR$/pointmobilescannerlibrary/pointmobilescannerlibrary.iml" />
-      <module fileurl="file://$PROJECT_DIR$/zebrascannerlibrary/zebrascannerlibrary.iml" filepath="$PROJECT_DIR$/zebrascannerlibrary/zebrascannerlibrary.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

app/build.gradle

@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 92
+    def appVersionCode = 93
-    def appVersionName = '1.8.5'
+    def appVersionName = '1.8.6'
 
     signingConfigs {
         release {

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);
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java

@@ -478,7 +478,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
     }
 
     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<MtbColr>
 
                 mtbColrToEditClone
                         .setQtaCol(value.qtaTot.getBigDecimal())
+                        .setMtbAart(mtbColrToEdit.getMtbAart())
                         .setOperation(CommonModelConsts.OPERATION.NO_OP);
 
                 mtbColt.get().getMtbColr().add(index, mtbColrToEditClone);

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();
 

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">
 
                     <androidx.appcompat.widget.AppCompatAutoCompleteTextView
@@ -55,6 +57,8 @@
                         android:layout_height="wrap_content"
                         android:singleLine="true"
                         android:ellipsize="end"
+                        android:imeOptions="actionNext"
+                        android:nextFocusDown="@id/input_id_viaggio"
                         app:binding="@{viewmodel.deposito}" />
 
                 </com.google.android.material.textfield.TextInputLayout>
@@ -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}" />
 
                 </com.google.android.material.textfield.TextInputLayout>
@@ -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}"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
@@ -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}"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
@@ -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}"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
@@ -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}"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
@@ -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}"/>
 
                 </com.google.android.material.textfield.TextInputLayout>
@@ -207,6 +223,7 @@
                         android:inputType="textNoSuggestions"
                         android:singleLine="true"
                         android:ellipsize="end"
+                        android:imeOptions="actionDone"
                     app:binding="@{viewmodel.terminiConsegna}"/>
 
                 </com.google.android.material.textfield.TextInputLayout>

app/src/main/res/layout/fragment_main.xml

@@ -54,7 +54,6 @@
                 android:layout_height="wrap_content">
 
                 <LinearLayout
-                    android:id="@+id/menu_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
@@ -193,6 +192,22 @@
                     </androidx.cardview.widget.CardView>
 
 
+
+                    <LinearLayout
+                        android:id="@+id/menu_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+                    </LinearLayout>
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/current_app_version_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:textAlignment="center"
+                        tools:text="v1.0.0" />
+
                 </LinearLayout>
             </androidx.core.widget.NestedScrollView>