From 62dc62aa99c4da2634ed09e940d535892d969810 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 13 Mar 2023 19:23:52 +0100 Subject: [PATCH 1/4] 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/4] -> 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 { From 10f888b5d52cf6fcbdd76d4a57f962c3ae1fdf42 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 14 Mar 2023 11:32:11 +0100 Subject: [PATCH 3/4] [ESSEGRANDE] Miglioramenti alla sync degli inventari --- .../data_store/db/entity/InventarioRoomDTO.java | 2 +- .../db/respository_new/InventarioRepository.java | 3 ++- .../picking/PickingInventarioActivity.java | 13 ++++++++----- .../picking/PickingInventarioViewModel.java | 5 +++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRoomDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRoomDTO.java index cb8c25bc..74011456 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRoomDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRoomDTO.java @@ -97,7 +97,7 @@ public class InventarioRoomDTO extends BaseSyncDTO implements EntityModelInterfa private String zona; @ColumnInfo(name = Columns.IS_NEW) - private Boolean isNew; + private Boolean isNew = Boolean.TRUE; @Ignore private List inventarioRowList; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java index 416b99b3..98973c42 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java @@ -69,7 +69,8 @@ public class InventarioRepository extends _BaseRepository Objects.equals(remoteItem.getIdInventario(), localItem.getIdInventario()), (remoteItem, localItem) -> { - remoteItem.setNew(true); + remoteItem.setRemoteSyncDate(localItem.getRemoteSyncDate()); + remoteItem.setNew(false); }, onComplete, onError); } catch (Exception e) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java index acb161e5..d3e73335 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java @@ -75,6 +75,7 @@ public class PickingInventarioActivity extends BaseActivity implements PickingIn getMenuInflater().inflate(R.menu.picking_inventario_menu, menu); return true; } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -91,18 +92,19 @@ public class PickingInventarioActivity extends BaseActivity implements PickingIn mViewModel.setListener(this); mBindings.setViewmodel(mViewModel); + mViewModel.init( + DataCache.retrieveItem(getIntent().getStringExtra(KEY_INVENTARIO)), + DataCache.retrieveItem(getIntent().getStringExtra(KEY_INVENTARIO_ARTS))); + initToolbar(); initBarcodeReader(); } + @Override protected void onStart() { super.onStart(); - mViewModel.init( - DataCache.retrieveItem(getIntent().getStringExtra(KEY_INVENTARIO)), - DataCache.retrieveItem(getIntent().getStringExtra(KEY_INVENTARIO_ARTS))); - initRecyclerView(); } @@ -189,7 +191,8 @@ public class PickingInventarioActivity extends BaseActivity implements PickingIn public void requestExportConfirm() { DialogYesNoView.newInstance("Esporta", "Vuoi confermare e chiudere l'inventario?", result -> { - mViewModel.exportAll(this::onBackPressed); + if (result == DialogConsts.Results.YES) + mViewModel.exportAll(this::onBackPressed); }) .show(getSupportFragmentManager(), "tag"); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java index be6685cd..d4caad28 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java @@ -111,6 +111,11 @@ public class PickingInventarioViewModel extends ViewModel { public void exportAll(Runnable onComplete) { + if(this.currentInventarioRows.getValue().isEmpty()) { + this.sendError(new Exception("Impossibile esportare un inventario senza righe")); + return; + } + this.sendOnLoadingStarted(); currentInventario.getValue().setInventarioRowList(this.currentInventarioRows.getValue()); From b0a7a93f850db7a709fd8ca94e2b89ce5ffd7ee6 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 14 Mar 2023 11:33:04 +0100 Subject: [PATCH 4/4] -> v1.32.08 (348) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7be81426..f9d42142 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 347 - def appVersionName = '1.32.07' + def appVersionCode = 348 + def appVersionName = '1.32.08' signingConfigs { release {