From a506f151208553ce2216446ce2fabaa5cd832828 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 12 Sep 2019 12:44:38 +0200
Subject: [PATCH] Creata customization FRUDIS

---
 .idea/caches/build_file_checksums.ser         | Bin 964 -> 1020 bytes
 .idea/gradle.xml                              |   2 +
 .idea/modules.xml                             |   1 +
 .idea/runConfigurations/app.xml               |   2 +-
 app/build.gradle                              |   4 +-
 app/src/main/res/values/strings.xml           |  79 +++++++++---------
 build_all.bat                                 |   3 +-
 .../extensions/CustomConfiguration.java       |   1 -
 dynamic_frudis/.gitignore                     |   1 +
 dynamic_frudis/build.gradle                   |  26 ++++++
 dynamic_frudis/src/main/AndroidManifest.xml   |  14 ++++
 .../dynamic_customization/DynamicContext.java |  29 +++++++
 .../extensions/CustomConfiguration.java       |  12 +++
 .../extensions/FiltroOrdiniVendita.java       |  21 +++++
 .../extensions/MenuConfigurationFRUDIS.java   |  38 +++++++++
 .../extensions/OrdiniVendita.java             |  26 ++++++
 settings.gradle                               |   2 +-
 17 files changed, 217 insertions(+), 44 deletions(-)
 create mode 100644 dynamic_frudis/.gitignore
 create mode 100644 dynamic_frudis/build.gradle
 create mode 100644 dynamic_frudis/src/main/AndroidManifest.xml
 create mode 100644 dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java
 create mode 100644 dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
 create mode 100644 dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java
 create mode 100644 dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java
 create mode 100644 dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 3149b37b9ae67e3cc8f02a3b094d3d70bb8c6dc2..1ea3b70d27936f2fff1fd1684f0a52a00fb8c1d6 100644
GIT binary patch
delta 104
zcmV-u0GI#72mA++mj!Jk>EoD@oJ;`@k?Ecgv3`**Ja*EA`-Zz{dm0v*vzGx30T9gk
zO0>gP^e2hWeB{SvSzeQ~0-+BZWO;63ZE0g)W^#38X>*fb0v8afqFoaRxo?l1(op3u
K7f(c!QUh|+{w>M?

delta 67
zcmV-J0KEVF2gC=Emj!J22Uu*8oJ;`?k?EcgxUOhjwMwb^Vr;wHwK!@JvzGx30T7S8
ZFR-ugCM#vuXN;$WVrY}I0-=+P18@+l9*+P3

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b7a9adff..b2777067 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,7 @@
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/barcode_base_library" />
             <option value="$PROJECT_DIR$/dynamic__base" />
+            <option value="$PROJECT_DIR$/dynamic_frudis" />
             <option value="$PROJECT_DIR$/dynamic_ime" />
             <option value="$PROJECT_DIR$/dynamic_vgalimenti" />
             <option value="$PROJECT_DIR$/honeywellscannerlibrary" />
@@ -19,6 +20,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9e0d1ee8..e6b355dc 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -6,6 +6,7 @@
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/barcode_base_library/barcode_base_library.iml" filepath="$PROJECT_DIR$/barcode_base_library/barcode_base_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_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" />
diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index 2845a8ea..fc9d4646 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -6,7 +6,7 @@
     <option name="DEPLOY_AS_INSTANT" value="false" />
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_vgalimenti" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_ime,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
diff --git a/app/build.gradle b/app/build.gradle
index b53f97a8..ecc143eb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,7 +83,9 @@ android {
         abortOnError false
     }
 
-    dynamicFeatures = [":dynamic__base",":dynamic_vgalimenti",":dynamic_ime"]
+    dynamicFeatures = [":dynamic__base",":dynamic_vgalimenti",":dynamic_ime",":dynamic_frudis"]
+
+
 }
 
 dependencies {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bae7232c..2b4f8d71 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,23 +1,51 @@
 <resources>
+    <plurals name="references">
+        <item quantity="one">reference</item>
+        <item quantity="other">references</item>
+    </plurals>
+    <plurals name="articles">
+        <item quantity="one">item</item>
+        <item quantity="other">items</item>
+    </plurals>
+
+    <plurals name="available_articles">
+        <item quantity="one">ordered item</item>
+        <item quantity="other">ordered items</item>
+    </plurals>
+    <plurals name="already_registered_lu">
+        <item quantity="one">already registered LU</item>
+        <item quantity="other">already registered LUs</item>
+    </plurals>
+
+    <plurals name="loaded_orders_message">
+        <item quantity="one"><![CDATA[<b>%d</b> order selected]]></item>
+        <item quantity="other"><![CDATA[<b>%d</b> orders selected]]></item>
+    </plurals>
+    <plurals name="pieces">
+        <item quantity="one">@string/piece</item>
+        <item quantity="other">pieces</item>
+    </plurals>
+
+    <!-- Generic strings -->
+    <plurals name="item_package">
+        <item quantity="one">package</item>
+        <item quantity="other">packages</item>
+    </plurals>
     <string name="app_name" translatable="false">Integry WMS</string>
     <string name="integry" translatable="false">Integry</string>
-
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
     <string name="action_settings">Settings</string>
-    <string name="action_customize_server_settings">Custom company settings</string>
 
-    <!-- Generic strings -->
+
+    <string name="action_customize_server_settings">Custom company settings</string>
     <string name="waiting">Waiting</string>
     <string name="loading">Loading</string>
     <string name="completed">Completed</string>
     <string name="search">Search...</string>
     <string name="login">Login</string>
-
     <string name="permission_request_message">Permissions are required for app to work properly</string>
-
-
     <string name="ord_acq_testata"><![CDATA[#<b>%s</b> of <b>%s</b>]]></string>
     <string name="ord_ven_testata"><![CDATA[#<b>%s</b> of <b>%s</b>]]></string>
     <string name="ord_ven_testata_data_cons"><![CDATA[Ship <b>%s</b>]]></string>
@@ -43,47 +71,19 @@
     <string name="action_create_ul">Create new LU</string>
     <string name="action_insert_quantity">Insert quantity</string>
     <string name="action_show_created_ul">Show already created LU</string>
+
+
+    <!-- SETTINGS -->
     <string name="action_recover_ul">Recover LU</string>
+
+
     <string name="action_print_ul">Print LU</string>
     <string name="action_print">Print</string>
     <string name="confirm">Confirm</string>
     <string name="hint_additional_notes">Additional notes</string>
     <string name="dialog_message_additional_notes">Enter any additional notes in your logistics unit</string>
     <string name="logistic_unit">LU</string>
-
-
-    <!-- SETTINGS -->
     <string name="general_settings">General settings</string>
-
-
-    <plurals name="references">
-        <item quantity="one">reference</item>
-        <item quantity="other">references</item>
-    </plurals>
-    <plurals name="articles">
-        <item quantity="one">item</item>
-        <item quantity="other">items</item>
-    </plurals>
-    <plurals name="available_articles">
-        <item quantity="one">ordered item</item>
-        <item quantity="other">ordered items</item>
-    </plurals>
-    <plurals name="already_registered_lu">
-        <item quantity="one">already registered LU</item>
-        <item quantity="other">already registered LUs</item>
-    </plurals>
-    <plurals name="loaded_orders_message">
-        <item quantity="one"><![CDATA[<b>%d</b> order selected]]></item>
-        <item quantity="other"><![CDATA[<b>%d</b> orders selected]]></item>
-    </plurals>
-    <plurals name="pieces">
-        <item quantity="one">@string/piece</item>
-        <item quantity="other">pieces</item>
-    </plurals>
-    <plurals name="item_package">
-        <item quantity="one">package</item>
-        <item quantity="other">packages</item>
-    </plurals>
     <string name="action_close_ul">Close LU</string>
     <string name="already_read_articles">Submitted items</string>
     <string name="orders">Orders</string>
@@ -253,5 +253,6 @@
 
     <string name="shipped_on">Shipped %s</string>
     <string name="delivered_on">Delivered on %s</string>
+    <string name="title_dynamic_frudis">Frudis customizations</string>
 
 </resources>
diff --git a/build_all.bat b/build_all.bat
index 16e1981a..121f6fee 100644
--- a/build_all.bat
+++ b/build_all.bat
@@ -1,3 +1,4 @@
 call build_azienda.bat _base
 call build_azienda.bat vgalimenti
-call build_azienda.bat ime
\ No newline at end of file
+call build_azienda.bat ime
+call build_azienda.bat frudis
\ No newline at end of file
diff --git a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
index 8d2add83..5c3ab3cd 100644
--- a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
+++ b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
@@ -6,7 +6,6 @@ import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfigura
 public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration {
 
     public CustomConfiguration() {
-
     }
 
 }
diff --git a/dynamic_frudis/.gitignore b/dynamic_frudis/.gitignore
new file mode 100644
index 00000000..796b96d1
--- /dev/null
+++ b/dynamic_frudis/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/dynamic_frudis/build.gradle b/dynamic_frudis/build.gradle
new file mode 100644
index 00000000..8d14a8b1
--- /dev/null
+++ b/dynamic_frudis/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.dynamic-feature'
+
+android {
+    compileSdkVersion 28
+    
+
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+    }
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':app')
+}
diff --git a/dynamic_frudis/src/main/AndroidManifest.xml b/dynamic_frudis/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..a4fad88a
--- /dev/null
+++ b/dynamic_frudis/src/main/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:dist="http://schemas.android.com/apk/distribution"
+    package="it.integry.wms.dynamic_customization">
+
+    <dist:module
+        dist:instant="false"
+        dist:title="@string/title_dynamic_frudis">
+        <dist:delivery>
+            <dist:install-time />
+        </dist:delivery>
+        <dist:fusing dist:include="true" />
+    </dist:module>
+</manifest>
+
diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java
new file mode 100644
index 00000000..2a98ae74
--- /dev/null
+++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java
@@ -0,0 +1,29 @@
+package it.integry.wms.dynamic_customization;
+
+import android.content.Context;
+import android.util.Log;
+
+import it.integry.integrywmsnative.core.class_router.ClassRouter;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.wms.dynamic_customization.extensions.CustomConfiguration;
+import it.integry.wms.dynamic_customization.extensions.FiltroOrdiniVendita;
+import it.integry.wms.dynamic_customization.extensions.OrdiniVendita;
+
+public class DynamicContext {
+
+    public void init(Context context) {
+        Log.d("DynamicContext", "Caricamento personalizzazioni per Frudis");
+
+        try {
+            ClassRouter.registerPath(ClassRouter.PATH.FILTRO_ORDINI_VENDITA, FiltroOrdiniVendita.class);
+            ClassRouter.registerPath(ClassRouter.PATH.ORDINI_VENDITA, OrdiniVendita.class);
+            ClassRouter.registerPath(ClassRouter.PATH.CUSTOM_CONFIGURATION, CustomConfiguration.class);
+        } catch (Exception ex) {
+            UtilityExceptions.defaultException(context, ex);
+        }
+
+        Log.d("DynamicContext", "Caricamento personalizzazioni per Frudis COMPLETATO");
+
+    }
+
+}
diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
new file mode 100644
index 00000000..f01ceee4
--- /dev/null
+++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
@@ -0,0 +1,12 @@
+package it.integry.wms.dynamic_customization.extensions;
+
+import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration;
+import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
+
+public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration {
+
+    public CustomConfiguration() {
+        configurations.put(Keys.MENU_CONFIGURATION, new MenuConfigurationFRUDIS());
+    }
+
+}
diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java
new file mode 100644
index 00000000..77adb537
--- /dev/null
+++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java
@@ -0,0 +1,21 @@
+package it.integry.wms.dynamic_customization.extensions;
+
+import it.integry.integrywmsnative.core.class_router.interfaces.IFiltroOrdiniVendita;
+
+public class FiltroOrdiniVendita implements IFiltroOrdiniVendita {
+
+    @Override
+    public boolean shoudShowCodMdepFilter() {
+        return false;
+    }
+
+    @Override
+    public boolean shoudShowIdViaggioFilter() {
+        return false;
+    }
+
+    @Override
+    public boolean shoudShowAgenteFilter() {
+        return false;
+    }
+}
diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java
new file mode 100644
index 00000000..34d0f0f6
--- /dev/null
+++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java
@@ -0,0 +1,38 @@
+package it.integry.wms.dynamic_customization.extensions;
+
+import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration;
+
+public class MenuConfigurationFRUDIS extends BaseMenuConfiguration {
+
+    public MenuConfigurationFRUDIS() {
+
+
+        this.addGroup(new MenuGroup()
+                .setGroupText(it.integry.integrywmsnative.R.string.manufacture)
+
+                .addItem(new MenuItem()
+                        .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_produzione)
+                        .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_produzione_title_fragment)
+                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione))
+
+                .addItem(new MenuItem()
+                        .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_lavorazione)
+                        .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment)
+                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione))
+
+                .addItem(new MenuItem()
+                        .setID(it.integry.integrywmsnative.R.id.nav_prod_versamento_materiale)
+                        .setTitleText(it.integry.integrywmsnative.R.string.prod_versamento_materiale_title_fragment)
+                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_versamento_materiale))
+
+                .addItem(new MenuItem()
+                        .setID(it.integry.integrywmsnative.R.id.nav_prod_recupero_materiale)
+                        .setTitleText(it.integry.integrywmsnative.R.string.prod_recupero_materiale_title_fragment)
+                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_recupero_materiale))
+        );
+
+
+
+    }
+
+}
diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
new file mode 100644
index 00000000..11892df9
--- /dev/null
+++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
@@ -0,0 +1,26 @@
+package it.integry.wms.dynamic_customization.extensions;
+
+import android.app.ProgressDialog;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityToast;
+import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
+
+public class OrdiniVendita implements IOrdiniVendita {
+
+
+    @Override
+    public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List<OrdineVenditaInevasoDTO> testateOrdini, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+        UtilityToast.showToast("Avviato metodo in Frudis");
+
+        ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(),
+                onComplete,
+                onFailed);
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index 6cd55106..97695f9b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':pointmobilescannerlibrary', ':barcode_base_library', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary', ':dynamic_ime'
+include ':app', ':pointmobilescannerlibrary', ':barcode_base_library', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary', ':dynamic_ime', ':dynamic_frudis'