From fb213cbdbb61a807f113216328185f21845bdcf8 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Fri, 3 May 2024 11:33:12 +0200 Subject: [PATCH 1/5] Aggiunta data delle righe dei colli nella generazione dei documenti interni --- .../edit_form/DocInterniEditFormViewModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java index 6e3cb997..3ceab727 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java @@ -6,6 +6,7 @@ import com.annimon.stream.Stream; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Objects; @@ -355,6 +356,7 @@ public class DocInterniEditFormViewModel { row.setQtaCnf(resultDTO.getQtaCnf().floatValue()); row.setNumCnf(resultDTO.getNumCnf().floatValue()); row.setQtaCol(resultDTO.getQtaTot().floatValue()); + row.setDatetimeRow(new Date()); row.setNote(resultDTO.getNote()); row.setDataScad(resultDTO.getDataScad()); row.setPartitaMag(resultDTO.getPartitaMag()); From f009726cf08c83b857c195f4cbbdc098bf4d3bd9 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Fri, 3 May 2024 15:05:37 +0200 Subject: [PATCH 2/5] -> v1.40.16 (433) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 79a1b402..3d9d3a2b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 432 - def appVersionName = '1.40.15' + def appVersionCode = 433 + def appVersionName = '1.40.16' signingConfigs { release { From 5c5216e20747612fdece026565eb37730436c1ff Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 6 May 2024 12:49:18 +0200 Subject: [PATCH 3/5] Aggiornato gradle plugin 8.4.0 --- .idea/deploymentTargetSelector.xml | 13 +++++++++++++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 .idea/deploymentTargetSelector.xml diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 00000000..cf9149f6 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index a814d42b..d0fd349c 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '1.9.20' - agp_version = '8.3.2' + agp_version = '8.4.0' } repositories { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 383bd37e..0b456dee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Feb 13 15:14:43 CET 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 027d0e891bf8b3785b15fd74272c1459cc044432 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 7 May 2024 18:21:40 +0200 Subject: [PATCH 4/5] Fix stream in spedizione --- .../integrywmsnative/gest/spedizione/SpedizioneViewModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index 7a5cdf3d..2b3594e2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -1870,7 +1870,8 @@ public class SpedizioneViewModel { .setNumOrd(ord.getNumOrd()) .setGestione(ord.getGestione()) .setCodAnag(ord.getCodAnagOrd()) - ).toList(); + ) + .collect(Collectors.toList()); dto.setPrintList(closedOrders); printClosedOrders(dto, this::onOrderClosedPrintingDone, ex -> this.sendLUPrintError(ex, this::sendOnLoadingEnded)); From 6cded1d2d1bbc9d03a3f19ca5c9e42febfc19b6a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 7 May 2024 18:22:23 +0200 Subject: [PATCH 5/5] -> v1.40.17 (434) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3d9d3a2b..a00464e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 433 - def appVersionName = '1.40.16' + def appVersionCode = 434 + def appVersionName = '1.40.17' signingConfigs { release {