October 2022 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][master] 8 commits: [jgitflow-maven-plugin]updating poms for 9.0.15-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Oct. 18, 2022

Oct. 18, 2022

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: b5fbc547 by Tony Chemit at 2022-10-18T14:02:39+02:00 [jgitflow-maven-plugin]updating poms for 9.0.15-SNAPSHOT development[skip ci] - - - - - 5c3c5179 by Tony Chemit at 2022-10-18T14:24:22+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 910301ee by Tony Chemit at 2022-10-18T14:24:24+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 92c33c9e by Tony Chemit at 2022-10-18T14:24:25+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 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 - - - - - 5f7715e8 by Tony Chemit at 2022-10-18T21:15:22+02:00 Update changelog for v.9.0.15 [skip CI] - - - - - 0353d263 by Tony Chemit at 2022-10-18T21:16:30+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.15' with non-snapshot versions[skip ci] - - - - - f7e458d7 by Tony Chemit at 2022-10-18T21:37:07+02:00 [jgitflow-maven-plugin]merging 'release/9.0.15' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - 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 - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetDetailCompositionSpi.java - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a029cbbc2196dd57624319e5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a029cbbc2196dd57624319e5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.15' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) Oct. 18, 2022

Oct. 18, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0353d263 by Tony Chemit at 2022-10-18T21:16:30+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.15' with non-snapshot versions[skip ci] - - - - - f7e458d7 by Tony Chemit at 2022-10-18T21:37:07+02:00 [jgitflow-maven-plugin]merging 'release/9.0.15' into 'master' - - - - - b9b55703 by Tony Chemit at 2022-10-18T21:37:13+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 9ca76777 by Tony Chemit at 2022-10-18T21:37:14+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - f3b9e061 by Tony Chemit at 2022-10-18T21:37:15+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/df76f14c29655b2229d08abe… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/df76f14c29655b2229d08abe… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.0.16-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Oct. 18, 2022

Oct. 18, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: df76f14c by Tony Chemit at 2022-10-18T21:15:50+02:00 [jgitflow-maven-plugin]updating poms for 9.0.16-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/df76f14c29655b2229d08abe5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/df76f14c29655b2229d08abe5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.15
by Tony CHEMIT (＠tchemit) Oct. 18, 2022

Oct. 18, 2022

Tony CHEMIT pushed new branch release/9.0.15 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/9.0.15 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.15 [skip CI]
by Tony CHEMIT (＠tchemit) Oct. 18, 2022

Oct. 18, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5f7715e8 by Tony Chemit at 2022-10-18T21:15:22+02:00 Update changelog for v.9.0.15 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,19 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-10-18 14:00. + * Last generated at 2022-10-18 21:14. + +## Version [9.0.15](https://gitlab.com/ultreiaio/ird-observe/-/milestones/241) + +**Closed at 2022-10-18.** + +### Download +* [Client (observe-9.0.15-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.15.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.15-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2476]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2476) **L'enregistrement du schéma détaillé de palangre plante après modification si des captures (ou des TDR) lui sont associés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.0.14](https://gitlab.com/ultreiaio/ird-observe/-/milestones/240) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5f7715e85cc211ce746f10a12… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5f7715e85cc211ce746f10a12… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] L'enregistrement du schéma détaillé de palangre plante après modification si...
by Tony CHEMIT (＠tchemit) Oct. 18, 2022

Oct. 18, 2022

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/610449f67633fdd695ff0ae49… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/610449f67633fdd695ff0ae49… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.14)
by Tony CHEMIT (＠tchemit) Oct. 18, 2022

Oct. 18, 2022

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 43e6ca55 by Tony Chemit at 2022-10-18T14:26:56+02:00 Site checkin for project ObServe (version 9.0.14) - - - - - 8 changed files: - + 9.0.14/CHANGELOG.html - + 9.0.14/architecture-logicielle.html - + 9.0.14/avdth/common.html - + 9.0.14/avdth/index.html - + 9.0.14/avdth/landing.html - + 9.0.14/avdth/local_market.html - + 9.0.14/avdth/logbook.html - + 9.0.14/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/43e6ca5544302fc76385c6562… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/43e6ca5544302fc76385c6562… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.14
by Tony CHEMIT (＠tchemit) Oct. 18, 2022

Oct. 18, 2022

Tony CHEMIT deleted branch release/9.0.14 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.0.14
by Tony CHEMIT (＠tchemit) Oct. 18, 2022

Oct. 18, 2022

Tony CHEMIT pushed new tag v9.0.14 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v9.0.14 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/9.0.14] [jgitflow-maven-plugin]updating poms for branch'release/9.0.14' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) Oct. 18, 2022

Oct. 18, 2022

Tony CHEMIT pushed to branch release/9.0.14 at ultreiaio / ird-observe Commits: 8d9c9f23 by Tony Chemit at 2022-10-18T14:03:03+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.14' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8d9c9f23dc8d4d2e42844ebca… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8d9c9f23dc8d4d2e42844ebca… You're receiving this email because of your account on gitlab.com.

1 0