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(); }