From 62dc62aa99c4da2634ed09e940d535892d969810 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 13 Mar 2023 19:23:52 +0100 Subject: [PATCH 1/2] Fix sull'eliminazione di un documento interno --- .../edit_form/DocInterniEditFormActivity.java | 6 ++++++ .../edit_form/DocInterniEditFormViewModel.java | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java index 7cb88efe..950dcf03 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java @@ -280,6 +280,12 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter this.closeEdit(); } + @Override + public void onDocDeleted() { + this.binding.closeActivityFab.close(true); + this.closeEdit(); + } + @Override public void onDocExported() { runOnUiThread(() -> { 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 3277c8a1..9fb28742 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 @@ -115,14 +115,11 @@ public class DocInterniEditFormViewModel { public void deleteDocument() { this.sendOnLoadingStarted(); - docInterniRESTConsumer.saveDoc(this.getSaveDto(), () -> { SqlMtbColt document = this.getDocument(); - document.setCodDtip(document.getCodDtipProvv()); - mtbColtRepository.update(document, doc -> { + mtbColtRepository.delete(document, () -> { this.sendOnLoadingEnded(); - this.listener.onDocExported(); + this.listener.onDocDeleted(); }, this::sendError); - }, this::sendError); } public void holdDocument() { @@ -341,6 +338,8 @@ public class DocInterniEditFormViewModel { void onDocumentHoldRequest(); + void onDocDeleted(); + void onDocExported(); } From 0c54a32e39d71dacb0ad68607dfaaae0ee9a43a9 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 13 Mar 2023 19:25:00 +0100 Subject: [PATCH 2/2] -> v1.32.07 (347) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index af3f8ce2..7be81426 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 346 - def appVersionName = '1.32.06' + def appVersionCode = 347 + def appVersionName = '1.32.07' signingConfigs { release {