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

Finish v1_6_2(63)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-06-21 13:07:44 +02:00
commit a3bb0298a6
26 changed files with 346 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

1
.idea/gradle.xml generated
View File

@ -11,6 +11,7 @@
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/barcode_base_library" /> <option value="$PROJECT_DIR$/barcode_base_library" />
<option value="$PROJECT_DIR$/dynamic__base" /> <option value="$PROJECT_DIR$/dynamic__base" />
<option value="$PROJECT_DIR$/dynamic_ime" />
<option value="$PROJECT_DIR$/dynamic_vgalimenti" /> <option value="$PROJECT_DIR$/dynamic_vgalimenti" />
<option value="$PROJECT_DIR$/honeywellscannerlibrary" /> <option value="$PROJECT_DIR$/honeywellscannerlibrary" />
<option value="$PROJECT_DIR$/pointmobilescannerlibrary" /> <option value="$PROJECT_DIR$/pointmobilescannerlibrary" />

1
.idea/modules.xml generated
View File

@ -6,6 +6,7 @@
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <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$/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__base/dynamic__base.iml" filepath="$PROJECT_DIR$/dynamic__base/dynamic__base.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$/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$/honeywellscannerlibrary/honeywellscannerlibrary.iml" filepath="$PROJECT_DIR$/honeywellscannerlibrary/honeywellscannerlibrary.iml" />
<module fileurl="file://$PROJECT_DIR$/pointmobilescannerlibrary/pointmobilescannerlibrary.iml" filepath="$PROJECT_DIR$/pointmobilescannerlibrary/pointmobilescannerlibrary.iml" /> <module fileurl="file://$PROJECT_DIR$/pointmobilescannerlibrary/pointmobilescannerlibrary.iml" filepath="$PROJECT_DIR$/pointmobilescannerlibrary/pointmobilescannerlibrary.iml" />

2
.idea/runConfigurations/app.xml generated
View File

@ -6,7 +6,7 @@
<option name="DEPLOY_AS_INSTANT" value="false" /> <option name="DEPLOY_AS_INSTANT" value="false" />
<option name="ARTIFACT_NAME" value="" /> <option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" /> <option name="PM_INSTALL_OPTIONS" value="" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" /> <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_vgalimenti" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" /> <option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" /> <option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="true" /> <option name="CLEAR_LOGCAT" value="true" />

24
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 62 def appVersionCode = 63
def appVersionName = '1.6.1' def appVersionName = '1.6.2'
signingConfigs { signingConfigs {
release { release {
@ -83,7 +83,9 @@ android {
abortOnError false abortOnError false
} }
dynamicFeatures = [":dynamic_vgalimenti"] dynamicFeatures = [":dynamic__base",":dynamic_vgalimenti",":dynamic_ime"]
} }
@ -95,17 +97,17 @@ dependencies {
}) })
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.orhanobut:logger:2.2.0' implementation 'com.orhanobut:logger:2.2.0'
implementation 'com.google.firebase:firebase-core:16.0.9' implementation 'com.google.firebase:firebase-core:17.0.0'
implementation 'com.google.firebase:firebase-crash:16.2.1' implementation 'com.google.firebase:firebase-crash:16.2.1'
implementation 'com.google.firebase:firebase-perf:17.0.0' implementation 'com.google.firebase:firebase-perf:18.0.0'
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.0' implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
implementation 'androidx.appcompat:appcompat:1.1.0-alpha04' implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.1.0-alpha06' implementation 'com.google.android.material:material:1.1.0-alpha07'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04' implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha06'
implementation 'androidx.preference:preference:1.1.0-alpha04' implementation 'androidx.preference:preference:1.1.0-beta01'
implementation 'com.squareup.okhttp3:okhttp:3.12.1' implementation 'com.squareup.okhttp3:okhttp:3.12.1'
implementation 'com.squareup.retrofit2:retrofit:2.5.0' implementation 'com.squareup.retrofit2:retrofit:2.5.0'
implementation 'com.squareup.retrofit2:converter-gson:2.5.0' implementation 'com.squareup.retrofit2:converter-gson:2.5.0'

26
app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java Normal file
View File

@ -0,0 +1,26 @@
package it.integry.integrywmsnative.core.class_router;
import java.util.HashMap;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
import it.integry.integrywmsnative.core.utility.UtilityHashMap;
public class BaseCustomConfiguration implements ICustomConfiguration {
public static class Keys {
public static int FLAG_SHOW_COD_FORN_IN_SPEDIZIONE = 0;
}
protected HashMap<Integer, Object> configurations = new HashMap<Integer, Object>() {{
put(Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE, true);
}};
@Override
public <T> T getConfig(int key) {
return UtilityHashMap.getValue(configurations, key);
}
}

2
app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/ICustomConfiguration.java
View File

@ -2,6 +2,6 @@ package it.integry.integrywmsnative.core.class_router.interfaces;
public interface ICustomConfiguration { public interface ICustomConfiguration {
boolean shoudShowCodFornInVendita(); <T>T getConfig(int key);
} }

19
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityHashMap.java Normal file
View File

@ -0,0 +1,19 @@
package it.integry.integrywmsnative.core.utility;
import java.util.HashMap;
public class UtilityHashMap {
public static<T> T getValueIfExists(HashMap map, Object key){
T value = null;
if(map != null && map.containsKey(key)) value = (T) map.get(key);
return value;
}
public static<T> T getValue(HashMap map, Object key){
return (T) map.get(key);
}
}

18
app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
View File

@ -224,15 +224,15 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
@OnClick(R.id.fast_button_prod_versamento_materiale) // @OnClick(R.id.fast_button_prod_versamento_materiale)
public void onClickProdVersamentoMateriale(View view) { // public void onClickProdVersamentoMateriale(View view) {
((MainActivity) getActivity()).setItem(R.id.nav_prod_versamento_materiale); // ((MainActivity) getActivity()).setItem(R.id.nav_prod_versamento_materiale);
} // }
//
@OnClick(R.id.fast_button_prod_recupero_materiale) // @OnClick(R.id.fast_button_prod_recupero_materiale)
public void onClickProdRecuperoMateriale(View view) { // public void onClickProdRecuperoMateriale(View view) {
((MainActivity) getActivity()).setItem(R.id.nav_prod_recupero_materiale); // ((MainActivity) getActivity()).setItem(R.id.nav_prod_recupero_materiale);
} // }
@Override @Override
public void setScrollToolbar(ElevatedToolbar toolbar) { public void setScrollToolbar(ElevatedToolbar toolbar) {

2
app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java
View File

@ -94,7 +94,7 @@ public class VenditaHelper {
String joinedBarcodes = TextUtils.join(",", barcodeOrdini); String joinedBarcodes = TextUtils.join(",", barcodeOrdini);
OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class, 60); OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class, 90);
Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_pick_v"); Trace perfTrace = UtilityFirebase.getNewPerformanceTrace("db_load_pick_v");
perfTrace.start(); perfTrace.start();

4
app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java
View File

@ -106,7 +106,7 @@ public class VenditaViewModel {
if(mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) { if(mtbColt != null && mtbColt.getMtbColr() != null && mtbColt.getMtbColr().size() > 0) {
if(mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO) { if(mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) {
//GET BY COMMESSA COLLO //GET BY COMMESSA COLLO
mHelper.getOrdiniInCommessaCollo(mtbColt, orderList -> { mHelper.getOrdiniInCommessaCollo(mtbColt, orderList -> {
@ -176,7 +176,7 @@ public class VenditaViewModel {
private void showWrongGestioneUL() { private void showWrongGestioneUL() {
DialogSimpleMessageHelper.makeWarningDialog(mContext, DialogSimpleMessageHelper.makeWarningDialog(mContext,
new SpannableString(Html.fromHtml(mContext.getResources().getText(R.string.gestione_V_not_accepted_message).toString())), new SpannableString(Html.fromHtml(mContext.getResources().getText(R.string.gestione_A_L_only_accepted_message).toString())),
null, null).show(); null, null).show();
} }

13
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java
View File

@ -11,6 +11,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration;
import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.class_router.ClassRouter;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColr;
@ -44,9 +45,13 @@ public class VenditaOrdineInevasoHelper {
for(int i = 0; i < mPickingList.size(); i++) { for(int i = 0; i < mPickingList.size(); i++) {
mPickingList.get(i).setDeactivated(mPickingList.get(i).getQtaCollo().floatValue() == 0); if(mPickingList.get(i).isHidden() == null || forceHiddenCheck) {
mPickingList.get(i).setHidden(false); PickingObjectDTO tmpItem = mPickingList.get(i);
mPickingList.get(i).setTempHidden(false);
tmpItem.setDeactivated(tmpItem.getQtaCollo().floatValue() == 0);
tmpItem.setHidden(false);
tmpItem.setTempHidden(false);
}
} }
List<String> listOfKnownPositions = Stream.of(mPickingList) List<String> listOfKnownPositions = Stream.of(mPickingList)
@ -122,7 +127,7 @@ public class VenditaOrdineInevasoHelper {
String badge1 = ""; String badge1 = "";
if(customConfiguration.shoudShowCodFornInVendita()) { if(customConfiguration.getConfig(BaseCustomConfiguration.Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE)) {
badge1 += !UtilityString.isNullOrEmpty(currentItem.getCodAlis()) ? (currentItem.getCodAlis() + " - ") : ""; badge1 += !UtilityString.isNullOrEmpty(currentItem.getCodAlis()) ? (currentItem.getCodAlis() + " - ") : "";
badge1 += (!UtilityString.isNullOrEmpty(currentItem.getCodArtFor()) ? currentItem.getCodArtFor() : currentItem.getCodMart()); badge1 += (!UtilityString.isNullOrEmpty(currentItem.getCodArtFor()) ? currentItem.getCodArtFor() : currentItem.getCodMart());
} else { } else {

258
app/src/main/res/layout/fragment_main.xml
View File

@ -429,172 +429,172 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <!--<RelativeLayout-->
android:id="@+id/fast_button_resi_clienti" <!--android:id="@+id/fast_button_resi_clienti"-->
android:layout_width="0dp" <!--android:layout_width="0dp"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
app:layout_constraintTop_toBottomOf="@id/fast_button_versamento" <!--app:layout_constraintTop_toBottomOf="@id/fast_button_versamento"-->
app:layout_constraintStart_toEndOf="@id/guide_1" <!--app:layout_constraintStart_toEndOf="@id/guide_1"-->
app:layout_constraintEnd_toEndOf="parent"> <!--app:layout_constraintEnd_toEndOf="parent">-->
<com.google.android.material.card.MaterialCardView <!--<com.google.android.material.card.MaterialCardView-->
style="@style/Widget.MaterialComponents.CardView" <!--style="@style/Widget.MaterialComponents.CardView"-->
android:layout_width="match_parent" <!--android:layout_width="match_parent"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:layout_margin="8dp" <!--android:layout_margin="8dp"-->
app:cardBackgroundColor="@android:color/white" <!--app:cardBackgroundColor="@android:color/white"-->
app:cardCornerRadius="4dp"> <!--app:cardCornerRadius="4dp">-->
<LinearLayout <!--<LinearLayout-->
android:layout_width="match_parent" <!--android:layout_width="match_parent"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:gravity="center_horizontal" <!--android:gravity="center_horizontal"-->
android:orientation="vertical" <!--android:orientation="vertical"-->
android:padding="8dp"> <!--android:padding="8dp">-->
<ImageView <!--<ImageView-->
android:layout_width="64sp" <!--android:layout_width="64sp"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:adjustViewBounds="true" <!--android:adjustViewBounds="true"-->
android:src="@drawable/ic_latest_delivery" /> <!--android:src="@drawable/ic_latest_delivery" />-->
<androidx.appcompat.widget.AppCompatTextView <!--<androidx.appcompat.widget.AppCompatTextView-->
android:layout_width="wrap_content" <!--android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:layout_marginTop="16dp" <!--android:layout_marginTop="16dp"-->
android:gravity="center_horizontal" <!--android:gravity="center_horizontal"-->
android:text="@string/fragment_ultime_consegne_cliente_title" <!--android:text="@string/fragment_ultime_consegne_cliente_title"-->
android:textAllCaps="true" <!--android:textAllCaps="true"-->
android:textColor="@color/gray_700" <!--android:textColor="@color/gray_700"-->
android:textStyle="bold" /> <!--android:textStyle="bold" />-->
</LinearLayout> <!--</LinearLayout>-->
</com.google.android.material.card.MaterialCardView> <!--</com.google.android.material.card.MaterialCardView>-->
</RelativeLayout> <!--</RelativeLayout>-->
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <!--<androidx.constraintlayout.widget.ConstraintLayout-->
android:layout_width="match_parent" <!--android:layout_width="match_parent"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:padding="8dp"> <!--android:padding="8dp">-->
<androidx.constraintlayout.widget.Guideline <!--<androidx.constraintlayout.widget.Guideline-->
android:id="@+id/guide_2" <!--android:id="@+id/guide_2"-->
android:layout_width="wrap_content" <!--android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:orientation="vertical" <!--android:orientation="vertical"-->
app:layout_constraintGuide_percent="0.5"/> <!--app:layout_constraintGuide_percent="0.5"/>-->
<TextView <!--<TextView-->
android:id="@+id/prod_dashboard_group_title" <!--android:id="@+id/prod_dashboard_group_title"-->
style="@style/AppTheme.NewMaterial.Text.TextBoxGroupTitleDashboard" <!--style="@style/AppTheme.NewMaterial.Text.TextBoxGroupTitleDashboard"-->
android:layout_width="match_parent" <!--android:layout_width="match_parent"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
app:layout_constraintTop_toTopOf="parent" <!--app:layout_constraintTop_toTopOf="parent"-->
android:text="@string/production" /> <!--android:text="@string/production" />-->
<RelativeLayout <!--<RelativeLayout-->
android:id="@+id/fast_button_prod_versamento_materiale" <!--android:id="@+id/fast_button_prod_versamento_materiale"-->
android:layout_width="0dp" <!--android:layout_width="0dp"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
app:layout_constraintTop_toBottomOf="@id/prod_dashboard_group_title" <!--app:layout_constraintTop_toBottomOf="@id/prod_dashboard_group_title"-->
app:layout_constraintStart_toStartOf="parent" <!--app:layout_constraintStart_toStartOf="parent"-->
app:layout_constraintEnd_toStartOf="@id/guide_2"> <!--app:layout_constraintEnd_toStartOf="@id/guide_2">-->
<com.google.android.material.card.MaterialCardView <!--<com.google.android.material.card.MaterialCardView-->
style="@style/Widget.MaterialComponents.CardView" <!--style="@style/Widget.MaterialComponents.CardView"-->
android:layout_width="match_parent" <!--android:layout_width="match_parent"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:layout_margin="8dp" <!--android:layout_margin="8dp"-->
app:cardBackgroundColor="@android:color/white" <!--app:cardBackgroundColor="@android:color/white"-->
app:cardCornerRadius="4dp"> <!--app:cardCornerRadius="4dp">-->
<LinearLayout <!--<LinearLayout-->
android:layout_width="match_parent" <!--android:layout_width="match_parent"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:gravity="center_horizontal" <!--android:gravity="center_horizontal"-->
android:orientation="vertical" <!--android:orientation="vertical"-->
android:padding="8dp"> <!--android:padding="8dp">-->
<ImageView <!--<ImageView-->
android:layout_width="64sp" <!--android:layout_width="64sp"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:adjustViewBounds="true" <!--android:adjustViewBounds="true"-->
android:src="@drawable/ic_dashboard_prod_versamento_materiale" /> <!--android:src="@drawable/ic_dashboard_prod_versamento_materiale" />-->
<androidx.appcompat.widget.AppCompatTextView <!--<androidx.appcompat.widget.AppCompatTextView-->
android:layout_width="wrap_content" <!--android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:layout_marginTop="16dp" <!--android:layout_marginTop="16dp"-->
android:gravity="center_horizontal" <!--android:gravity="center_horizontal"-->
android:text="@string/prod_versamento_materiale_title_fragment" <!--android:text="@string/prod_versamento_materiale_title_fragment"-->
android:textAllCaps="true" <!--android:textAllCaps="true"-->
android:textColor="@color/gray_700" <!--android:textColor="@color/gray_700"-->
android:textStyle="bold" /> <!--android:textStyle="bold" />-->
</LinearLayout> <!--</LinearLayout>-->
</com.google.android.material.card.MaterialCardView> <!--</com.google.android.material.card.MaterialCardView>-->
</RelativeLayout> <!--</RelativeLayout>-->
<RelativeLayout <!--<RelativeLayout-->
android:id="@+id/fast_button_prod_recupero_materiale" <!--android:id="@+id/fast_button_prod_recupero_materiale"-->
android:layout_width="0dp" <!--android:layout_width="0dp"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
app:layout_constraintTop_toBottomOf="@id/prod_dashboard_group_title" <!--app:layout_constraintTop_toBottomOf="@id/prod_dashboard_group_title"-->
app:layout_constraintStart_toEndOf="@id/guide_2" <!--app:layout_constraintStart_toEndOf="@id/guide_2"-->
app:layout_constraintEnd_toEndOf="parent"> <!--app:layout_constraintEnd_toEndOf="parent">-->
<com.google.android.material.card.MaterialCardView <!--<com.google.android.material.card.MaterialCardView-->
style="@style/Widget.MaterialComponents.CardView" <!--style="@style/Widget.MaterialComponents.CardView"-->
android:layout_width="match_parent" <!--android:layout_width="match_parent"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:layout_margin="8dp" <!--android:layout_margin="8dp"-->
app:cardBackgroundColor="@android:color/white" <!--app:cardBackgroundColor="@android:color/white"-->
app:cardCornerRadius="4dp"> <!--app:cardCornerRadius="4dp">-->
<LinearLayout <!--<LinearLayout-->
android:layout_width="match_parent" <!--android:layout_width="match_parent"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:gravity="center_horizontal" <!--android:gravity="center_horizontal"-->
android:orientation="vertical" <!--android:orientation="vertical"-->
android:padding="8dp"> <!--android:padding="8dp">-->
<ImageView <!--<ImageView-->
android:layout_width="64sp" <!--android:layout_width="64sp"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:adjustViewBounds="true" <!--android:adjustViewBounds="true"-->
android:src="@drawable/ic_dashboard_prod_recupero_materiale" /> <!--android:src="@drawable/ic_dashboard_prod_recupero_materiale" />-->
<androidx.appcompat.widget.AppCompatTextView <!--<androidx.appcompat.widget.AppCompatTextView-->
android:layout_width="wrap_content" <!--android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!--android:layout_height="wrap_content"-->
android:layout_marginTop="16dp" <!--android:layout_marginTop="16dp"-->
android:gravity="center_horizontal" <!--android:gravity="center_horizontal"-->
android:text="@string/prod_recupero_materiale_title_fragment" <!--android:text="@string/prod_recupero_materiale_title_fragment"-->
android:textAllCaps="true" <!--android:textAllCaps="true"-->
android:textColor="@color/gray_700" <!--android:textColor="@color/gray_700"-->
android:textStyle="bold" /> <!--android:textStyle="bold" />-->
</LinearLayout> <!--</LinearLayout>-->
</com.google.android.material.card.MaterialCardView> <!--</com.google.android.material.card.MaterialCardView>-->
</RelativeLayout> <!--</RelativeLayout>-->
</androidx.constraintlayout.widget.ConstraintLayout> <!--</androidx.constraintlayout.widget.ConstraintLayout>-->

1
app/src/main/res/values-it/strings.xml
View File

@ -172,6 +172,7 @@
<string name="no_items_found_message">Nessun articolo trovato</string> <string name="no_items_found_message">Nessun articolo trovato</string>
<string name="no_lu_found_message">Nessuna UL trovata</string> <string name="no_lu_found_message">Nessuna UL trovata</string>
<string name="no_orders_found_message">Non sono stati trovati ordini</string> <string name="no_orders_found_message">Non sono stati trovati ordini</string>
<string name="gestione_A_L_only_accepted_message">Sono ammesse solo UL di <b>Acquisto</b> o <b>Lavorazione</b> qui</string>
<string name="gestione_A_V_not_accepted_message"><![CDATA[Le UL di tipo <b>Acquisto</b> o <b>Vendita</b> non sono ammesse qui]]></string> <string name="gestione_A_V_not_accepted_message"><![CDATA[Le UL di tipo <b>Acquisto</b> o <b>Vendita</b> non sono ammesse qui]]></string>
<string name="gestione_V_not_accepted_message"><![CDATA[Le UL di tipo <b>Vendita</b> non sono ammesse qui]]></string> <string name="gestione_V_not_accepted_message"><![CDATA[Le UL di tipo <b>Vendita</b> non sono ammesse qui]]></string>
<string name="too_much_lu_found_message">E\' stata trovata più di una UL</string> <string name="too_much_lu_found_message">E\' stata trovata più di una UL</string>

2
app/src/main/res/values/strings.xml
View File

@ -178,6 +178,7 @@
<string name="no_items_found_message">No items found</string> <string name="no_items_found_message">No items found</string>
<string name="no_lu_found_message">No LU found</string> <string name="no_lu_found_message">No LU found</string>
<string name="no_orders_found_message">No orders found</string> <string name="no_orders_found_message">No orders found</string>
<string name="gestione_A_L_only_accepted_message">Only <b>Purchase</b> or <b>Production\'s</b> LU are accepted here</string>
<string name="gestione_A_V_not_accepted_message">The LU of type Purchase or Sale is not accepted here</string> <string name="gestione_A_V_not_accepted_message">The LU of type Purchase or Sale is not accepted here</string>
<string name="gestione_V_not_accepted_message">The LU of type Sale is not accepted here</string> <string name="gestione_V_not_accepted_message">The LU of type Sale is not accepted here</string>
<string name="too_much_lu_found_message">Multiple LU found</string> <string name="too_much_lu_found_message">Multiple LU found</string>
@ -225,6 +226,7 @@
<string name="select_a_recipient_message">Please, select a <b>recipient</b> before proceeding</string> <string name="select_a_recipient_message">Please, select a <b>recipient</b> before proceeding</string>
<string name="not_valid_customer_error">Invalid customer</string> <string name="not_valid_customer_error">Invalid customer</string>
<string name="not_valid_recipient_error">Invalid recipient</string> <string name="not_valid_recipient_error">Invalid recipient</string>
<string name="title_dynamic_ime">Module Title</string>
</resources> </resources>

1
build_all.bat
View File

@ -1,2 +1,3 @@
call build_azienda.bat _base call build_azienda.bat _base
call build_azienda.bat vgalimenti call build_azienda.bat vgalimenti
call build_azienda.bat ime

9
dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
View File

@ -1,11 +1,12 @@
package it.integry.wms.dynamic_customization.extensions; package it.integry.wms.dynamic_customization.extensions;
import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
public class CustomConfiguration implements ICustomConfiguration { public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration {
public CustomConfiguration() {
@Override
public boolean shoudShowCodFornInVendita() {
return true;
} }
} }

1
dynamic_ime/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/build

25
dynamic_ime/build.gradle Normal file
View File

@ -0,0 +1,25 @@
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')
}

12
dynamic_ime/src/main/AndroidManifest.xml Normal file
View File

@ -0,0 +1,12 @@
<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:onDemand="false"
dist:title="@string/title_dynamic_ime">
<dist:fusing dist:include="true" />
</dist:module>
</manifest>

29
dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/DynamicContext.java Normal file
View File

@ -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 Azienda IME");
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 Azienda IME COMPLETATO");
}
}

12
dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java Normal file
View File

@ -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() {
}
}

11
dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/FiltroOrdiniVendita.java Normal file
View File

@ -0,0 +1,11 @@
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;
}
}

26
dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java Normal file
View File

@ -0,0 +1,26 @@
package it.integry.wms.dynamic_customization.extensions;
import android.app.ProgressDialog;
import java.util.List;
import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer;
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.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityToast;
import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO;
public class OrdiniVendita implements IOrdiniVendita {
@Override
public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List<OrdineVenditaGroupedInevasoDTO> testateOrdini, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
UtilityToast.showToast("Avviato metodo in BaseFeature");
ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(),
onComplete,
onFailed);
}
}

10
dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java
View File

@ -1,10 +1,12 @@
package it.integry.wms.dynamic_customization.extensions; package it.integry.wms.dynamic_customization.extensions;
import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
public class CustomConfiguration implements ICustomConfiguration { public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration {
@Override
public boolean shoudShowCodFornInVendita() { public CustomConfiguration() {
return false; configurations.put(Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE, false);
} }
} }

2
settings.gradle
View File

@ -1 +1 @@
include ':app', ':pointmobilescannerlibrary', ':barcode_base_library', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary' include ':app', ':pointmobilescannerlibrary', ':barcode_base_library', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary', ':honeywellscannerlibrary', ':dynamic_ime'