Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 610449f6 by Tony Chemit at 2022-10-18T17:51:03+02:00 L'enregistrement du schéma détaillé de palangre plante après modification si des captures (ou des TDR) lui sont associés - Closes #2476 - - - - - 3 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/branchline/DeleteSelectedBranchline.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/section/DeleteSelectedSection.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetDetailCompositionSpi.java Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/branchline/DeleteSelectedBranchline.java ===================================== @@ -61,7 +61,7 @@ public class DeleteSelectedBranchline extends SetDetailCompositionUIActionSuppor if (!accept) { return; } - log.info(getLog(String.format("DeleteMultiple branchline: %s", selectedBranchline))); + log.info(getLog(String.format("Delete branchline: %s", selectedBranchline))); model.getStates().getBasketsTableModel().removeBranchline(selectedBranchline); } } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/section/DeleteSelectedSection.java ===================================== @@ -53,7 +53,7 @@ public class DeleteSelectedSection extends SetDetailCompositionUIActionSupport { SectionTableModel tableModel = model.getStates().getSectionsTableModel(); SectionDto selectedSection = tableModel.getSelectedRow(); if (selectedSection != null) { - if (!Objects.requireNonNull(selectedSection).canDelete()) { + if (!selectedSection.canDelete()) { // there is some references, can't delete displayWarning(t("observe.data.ll.observation.SetDetailComposition.section.cant.delete.title"), t("observe.data.ll.observation.SetDetailComposition.section.cant.delete.message")); return; @@ -62,7 +62,7 @@ public class DeleteSelectedSection extends SetDetailCompositionUIActionSupport { if (!accept) { return; } - log.info(getLog(String.format("DeleteMultiple section: %s", selectedSection))); + log.info(getLog(String.format("Delete section: %s", selectedSection))); model.getStates().removeSection(selectedSection); } } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetDetailCompositionSpi.java ===================================== @@ -22,6 +22,9 @@ package fr.ird.observe.entities.data.ll.observation; * #L% */ +import fr.ird.observe.dto.data.ll.observation.BasketDto; +import fr.ird.observe.dto.data.ll.observation.BranchlineDto; +import fr.ird.observe.dto.data.ll.observation.SectionDto; import fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.result.SaveResultDto; @@ -44,21 +47,30 @@ public class SetDetailCompositionSpi extends GeneratedSetDetailCompositionSpi { java.util.Set<String> sectionUsed = dao.getSectionUsed(entity.getTopiaId()); java.util.Set<String> basketUsed = dao.getBasketUsed(entity.getTopiaId()); java.util.Set<String> branchlineUsed = dao.getBranchlineUsed(entity.getTopiaId()); - dto.getSection().forEach(section -> { + for (SectionDto section : dto.getSection()) { section.setParentId(dto.getId()); String sectionId = section.getTopiaId(); - section.setNotUsed(!sectionUsed.contains(sectionId)); - section.getBasket().forEach(basket -> { + boolean sectionIsUsed = sectionUsed.contains(sectionId); + for (BasketDto basket : section.getBasket()) { basket.setParentId(sectionId); String basketId = basket.getTopiaId(); - basket.setNotUsed(!basketUsed.contains(basketId)); - basket.getBranchline().forEach(branchline -> { + boolean basketIsUsed = basketUsed.contains(basketId); + for (BranchlineDto branchline : basket.getBranchline()) { String branchlineId = branchline.getId(); branchline.setParentId(basketId); - branchline.setNotUsed(!branchlineUsed.contains(branchlineId)); - }); - }); - }); + boolean branchlineIsUsed = branchlineUsed.contains(branchlineId); + branchline.setNotUsed(!branchlineIsUsed); + if (branchlineIsUsed) { + basketIsUsed = true; + } + } + if (basketIsUsed) { + sectionIsUsed = true; + } + basket.setNotUsed(!basketIsUsed); + } + section.setNotUsed(!sectionIsUsed); + } return form; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/610449f67633fdd695ff0ae497... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/610449f67633fdd695ff0ae497... You're receiving this email because of your account on gitlab.com.