diff --git a/app/build.gradle b/app/build.gradle index 0295e055..3a9f7b4a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 94 - def appVersionName = '1.9.0' + def appVersionCode = 95 + def appVersionName = '1.9.1' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java index 012006d7..fa25ecb9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java @@ -22,8 +22,8 @@ public class UltimeConsegneClienteRESTConsumer { public static void getUltimeConsegneClienti(String codMdep, String codAnag, String codMart, RunnableArgs> onComplete, RunnableArgs onFailed) { - int numberOfConsegnePerCli = 10; - int numberOfDayToAnalyze = 90; + int numberOfConsegnePerCli = 100; + int numberOfDayToAnalyze = 365; String sql = "SELECT consegne.*, " + " rag_soc," + diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java index efc6bf1a..0abbf8be 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/rest/UltimiArriviFornitoreRESTConsumer.java @@ -15,8 +15,8 @@ public class UltimiArriviFornitoreRESTConsumer { public static void getUltimeConsegneFornitori(String codMdep, String codAnag, String codMart, RunnableArgs> onComplete, RunnableArgs onFailed) { - int numberOfConsegnePerForn = 20; - int numberOfDayToAnalyze = 90; + int numberOfConsegnePerForn = 100; + int numberOfDayToAnalyze = 365; String sql = "SELECT consegne.*, " + " rag_soc " + diff --git a/app/src/main/res/layout/dialog_ultime_consegne_filtro_avanzato.xml b/app/src/main/res/layout/dialog_ultime_consegne_filtro_avanzato.xml index e11c1cf5..ec9e309a 100644 --- a/app/src/main/res/layout/dialog_ultime_consegne_filtro_avanzato.xml +++ b/app/src/main/res/layout/dialog_ultime_consegne_filtro_avanzato.xml @@ -68,7 +68,7 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/ship_date"> + android:hint="@string/document_date"> + android:hint="@string/document_date"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="2dp" + android:layout_marginEnd="2dp" + android:layout_marginTop="12dp" + android:layout_marginBottom="8dp" + app:cardElevation="0dp" + app:cardCornerRadius="4dp"> - - + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:background="@color/gray_200"> - - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore__list_header.xml b/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore__list_header.xml index 52551ab1..20449ee6 100644 --- a/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore__list_header.xml +++ b/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore__list_header.xml @@ -3,28 +3,38 @@ - + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="2dp" + android:layout_marginEnd="2dp" + android:layout_marginTop="12dp" + android:layout_marginBottom="8dp" + app:cardElevation="0dp" + app:cardCornerRadius="4dp"> - - - - + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:background="@color/gray_200"> + + + \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index facad139..c4803b3c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -181,6 +181,7 @@ Cliente Destinatario Data consegna + Data documento Termini di consegna Automezzo Deposito diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f62bfd82..d3956a31 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -184,6 +184,7 @@ Customer Recipient Ship date + Document date Terms of delivery Vehicle Deposit