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

[Git][ultreiaio/ird-observe][master] 49 commits: [jgitflow-maven-plugin]updating poms for 9.0.2-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 06 Jun '22

06 Jun '22

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: aebf37ea by Tony Chemit at 2022-05-19T02:11:26+02:00 [jgitflow-maven-plugin]updating poms for 9.0.2-SNAPSHOT development[skip ci] - - - - - 873927ae by Tony Chemit at 2022-05-19T02:42:16+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 9bd20c81 by Tony Chemit at 2022-05-19T02:42:16+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - d2f84834 by Tony Chemit at 2022-05-19T02:42:17+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 95bc43d1 by Tony Chemit at 2022-05-20T09:30:29+02:00 En anglais, afficher les unités sur Set / Characteristics - Closes #2377 - - - - - cba01c10 by Tony Chemit at 2022-05-20T09:35:45+02:00 En anglais, afficher les unités dans les libellés sur les écrans global composition - Closes #2372 - - - - - 6165b746 by Tony Chemit at 2022-05-20T09:38:41+02:00 En anglais, afficher les unités sur LL / Logbook / Activity (+ libellé) - Closes #2375 - - - - - 1a5d6170 by Tony Chemit at 2022-05-20T09:58:17+02:00 Erreur sur form LL Logbook / sample SpeciesDto.getMinLength() et InvalidAuthenticationTokenException - Closes #2369 - - - - - 60da6ae2 by Tony Chemit at 2022-05-20T12:11:54+02:00 Clic sur 'Save' avant clic sur 'Insert' - Closes #2379 - - - - - 2d0fdf9a by Tony Chemit at 2022-05-20T15:37:34+02:00 Sur certains forms à double bouton 'Save' le bouton 'Save' en base est disponible alors que le tableau n'est pas encore enregistrer, ce qui fait planter - Closes #2376 - - - - - cbf6de52 by Tony Chemit at 2022-05-26T11:25:31+02:00 Petits renommages sur le form LL / Logbook / - Closes #2383 - - - - - 28d47865 by Tony Chemit at 2022-05-26T12:19:04+02:00 Petit renommage sur le form LL / Logbook / Landing - Closes #2382 - - - - - 4156232c by Tony Chemit at 2022-05-26T13:23:58+02:00 update pom - - - - - dcc20c0e by Tony Chemit at 2022-05-26T13:29:17+02:00 missing landingSize on ps.common.Trip - - - - - 60913c43 by Tony Chemit at 2022-05-27T09:41:12+02:00 Amélioration des déplacements de données - See #2276 - - - - - 42082984 by Tony Chemit at 2022-05-27T09:41:12+02:00 Ajouter le bouton 'Coller la coordonnée d'origine' - Closes #2387 - - - - - 01741aa2 by Tony Chemit at 2022-05-27T09:41:12+02:00 tidy pom - - - - - e6d0753f by Tony Chemit at 2022-05-28T14:17:48+02:00 Ajouter des stats permettant de mieux repérer les samples attachés aux activités - Closes #2344 - - - - - eadfb253 by Tony Chemit at 2022-05-28T14:17:51+02:00 fix ShowTechnicalInformations when multiple - - - - - db69a79e by Tony Chemit at 2022-05-28T14:17:51+02:00 fix ActivitySample table toolbar visibility - - - - - 32459c2f by Tony Chemit at 2022-05-28T14:17:51+02:00 fix ActivitySample move decoration - - - - - fdf9af30 by Tony Chemit at 2022-05-28T14:17:51+02:00 Amélioration des déplacements de données - See ultreiaio/ird-observe#2276 - - - - - b95485ba by Tony Chemit at 2022-05-28T14:17:51+02:00 update pom - - - - - 9cdb4b12 by Tony Chemit at 2022-05-28T14:17:51+02:00 Le message d'erreur de proportion sur les Baits n'apparaît pas - Closes #2371 - - - - - 88f7c9e8 by Tony Chemit at 2022-05-28T14:17:51+02:00 Review usage of decorator in list widgets (can't change any state in incoming data) - See ultreiaio/jaxx#829 - - - - - 311fb573 by Tony Chemit at 2022-05-28T14:17:51+02:00 toolkit in snapshot - - - - - 961dcfaf by Tony Chemit at 2022-05-28T14:17:51+02:00 PS / Logbooks / Capture, le champ poids ne doit pas être exigé si le nombre est saisi - Closes #2385 - - - - - a6e04e63 by Tony Chemit at 2022-05-28T14:18:07+02:00 Make i18n xxx.validation.required override happens! - - - - - f2349fb3 by Tony Chemit at 2022-05-28T14:18:24+02:00 Erreurs de validation retournées par le service web, dont on ne trouve pas la cause dans le content - Closes #2285 - - - - - 90089f0d by Tony Chemit at 2022-05-28T14:18:26+02:00 Landing.Vessel i18n ovveride - - - - - a88db477 by Tony Chemit at 2022-05-28T15:50:42+02:00 Petit souci de mise en page sur le form FOB matériaux - Closes #2241 - - - - - 612c0a0a by Tony Chemit at 2022-05-28T18:13:52+02:00 improve RelationCountCache API - - - - - 9858b93e by Tony Chemit at 2022-05-28T18:15:37+02:00 update pom - - - - - 2fef1e74 by Tony Chemit at 2022-05-29T09:35:37+02:00 Fix replicate test (replicate with the very same parent id, since we delete it before applying the replication). Before we had some errors due to the fact that new parent id had already some data... - - - - - a5f2a3e8 by Tony Chemit at 2022-05-29T09:38:03+02:00 Ajouter des stats permettant de mieux repérer les samples attachés aux activités - See #2344 - - - - - 5a9e80b7 by Tony Chemit at 2022-06-01T17:45:17+02:00 fix Sample I18n - - - - - 2b4a6e5e by Tony Chemit at 2022-06-05T19:07:07+02:00 Introduce new statistics API - - - - - f08b6517 by Tony Chemit at 2022-06-05T19:07:07+02:00 Trois rafinements sur l'expresion régulière par défaut de cuves des bateaux - See ultreiaio/ird-observe#2388 - - - - - 70b98b69 by Tony Chemit at 2022-06-05T19:07:07+02:00 PS / Logbooks / Capture, le champ poids ne doit pas être exigé si le nombre est saisi - Closes #2385 - - - - - 2d85dada by Tony Chemit at 2022-06-05T19:07:07+02:00 Amélioration de la mise en correspondance des zones FPA lors d'un import AVDTH - See ultreiaio/ird-observe#2325 - - - - - 9a74c3ea by Tony Chemit at 2022-06-05T19:07:07+02:00 Sur les global composition du logbook, rendre les proportions optionnelles - See ultreiaio/ird-observe#2373 - - - - - 99ed11ff by Tony Chemit at 2022-06-05T19:07:07+02:00 Amélioration de la mise en correspondance des zones FPA lors d'un import AVDTH - See ultreiaio/ird-observe#2325 - - - - - 5e5a84e2 by Tony Chemit at 2022-06-06T17:49:46+02:00 Lors de création d'une marée PS, les forms de saisie ne sont pas rendus accessibles même si les status de saisie ont été correctement initialisés - See ultreiaio/ird-observe#2384 - - - - - 96e8c452 by Tony Chemit at 2022-06-06T18:08:24+02:00 Update changelog for v.9.0.2 [skip CI] - - - - - 1963836b by Tony Chemit at 2022-06-06T18:09:33+02:00 Sur les global composition du logbook, rendre les proportions optionnelles - See ultreiaio/ird-observe#2373 - - - - - 8c75b07d by Tony Chemit at 2022-06-06T18:20:55+02:00 update toolkit - - - - - e36b625a by Tony Chemit at 2022-06-06T18:21:21+02:00 [jgitflow-maven-plugin]updating poms for 9.0.2 branch with snapshot versions[skip ci] - - - - - a5060691 by Tony Chemit at 2022-06-06T18:22:34+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.2' with non-snapshot versions[skip ci] - - - - - 58e17643 by Tony Chemit at 2022-06-06T18:53:14+02:00 [jgitflow-maven-plugin]merging 'release/9.0.2' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ContentUIActionSupport.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/CopyCoordinate.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilderStepBuild.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilderStepConfigure.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRootApplyNavigationConfiguration.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRootRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilder.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilderStepBuild.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilderStepConfigure.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/651ab97d59076a2618372041… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/651ab97d59076a2618372041… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 9.0.2 branch with snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 06 Jun '22

06 Jun '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e36b625a by Tony Chemit at 2022-06-06T18:21:21+02:00 [jgitflow-maven-plugin]updating poms for 9.0.2 branch with snapshot versions[skip ci] - - - - - a5060691 by Tony Chemit at 2022-06-06T18:22:34+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.2' with non-snapshot versions[skip ci] - - - - - 58e17643 by Tony Chemit at 2022-06-06T18:53:14+02:00 [jgitflow-maven-plugin]merging 'release/9.0.2' into 'master' - - - - - bc72d955 by Tony Chemit at 2022-06-06T18:53:18+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 3061d142 by Tony Chemit at 2022-06-06T18:53:19+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 06e92e5b by Tony Chemit at 2022-06-06T18:53:20+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/33533ca6d6c57e3550cc25dc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/33533ca6d6c57e3550cc25dc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.2
by Tony CHEMIT (＠tchemit) 06 Jun '22

06 Jun '22

Tony CHEMIT pushed new branch release/9.0.2 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/9.0.2 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.3-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 06 Jun '22

06 Jun '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 33533ca6 by Tony Chemit at 2022-06-06T18:21:23+02:00 [jgitflow-maven-plugin]updating poms for 9.0.3-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/33533ca6d6c57e3550cc25dcc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/33533ca6d6c57e3550cc25dcc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Update changelog for v.9.0.2 [skip CI]
by Tony CHEMIT (＠tchemit) 06 Jun '22

06 Jun '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 96e8c452 by Tony Chemit at 2022-06-06T18:08:24+02:00 Update changelog for v.9.0.2 [skip CI] - - - - - 1963836b by Tony Chemit at 2022-06-06T18:09:33+02:00 Sur les global composition du logbook, rendre les proportions optionnelles - See ultreiaio/ird-observe#2373 - - - - - 8c75b07d by Tony Chemit at 2022-06-06T18:20:55+02:00 update toolkit - - - - - 30 changed files: - CHANGELOG.md - pom.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/BaitsComposition/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/BaitsComposition/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/BaitsComposition/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/BaitsComposition/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/BranchlinesComposition/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/BranchlinesComposition/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/BranchlinesComposition/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/BranchlinesComposition/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/FloatlinesComposition/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/FloatlinesComposition/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/FloatlinesComposition/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/FloatlinesComposition/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/HooksComposition/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/HooksComposition/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/HooksComposition/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/HooksComposition/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/BaitsComposition/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/observation/BaitsComposition/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/BaitsComposition/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/observation/BaitsComposition/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/BranchlinesComposition/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/observation/BranchlinesComposition/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/BranchlinesComposition/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/observation/BranchlinesComposition/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/FloatlinesComposition/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/observation/FloatlinesComposition/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/FloatlinesComposition/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/observation/FloatlinesComposition/validation-update.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5e5a84e217cd123ea2223012… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5e5a84e217cd123ea2223012… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Lors de création d'une marée PS, les forms de saisie ne sont pas rendus...
by Tony CHEMIT (＠tchemit) 06 Jun '22

06 Jun '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5e5a84e2 by Tony Chemit at 2022-06-06T17:49:46+02:00 Lors de création d'une marée PS, les forms de saisie ne sont pas rendus accessibles même si les status de saisie ont été correctement initialisés - See ultreiaio/ird-observe#2384 - - - - - 6 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationNode.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SampleSampleSpeciesSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SurveySpi.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUINavigationNode.java ===================================== @@ -24,11 +24,8 @@ package fr.ird.observe.client.datasource.editor.api.content.data.ropen; import fr.ird.observe.client.datasource.editor.api.content.data.rlist.ContentRootListUINavigationNode; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; -import fr.ird.observe.client.datasource.editor.api.navigation.tree.capability.ReferenceContainerCapability; import fr.ird.observe.dto.data.DataGroupByDto; import fr.ird.observe.dto.reference.DataDtoReference; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.awt.Font; import java.util.function.Supplier; @@ -40,7 +37,6 @@ import java.util.function.Supplier; * @since 8.0.1 */ public abstract class ContentRootOpenableUINavigationNode extends NavigationNode { - private static final Logger log = LogManager.getLogger(ContentRootOpenableUINavigationNode.class); public static <N extends ContentRootOpenableUINavigationNode> N init(N node, Supplier<? extends DataGroupByDto<?>> parentReference, DataDtoReference reference) { ContentRootOpenableUINavigationInitializer initializer = new ContentRootOpenableUINavigationInitializer(node.getScope(), parentReference, reference); @@ -81,37 +77,6 @@ public abstract class ContentRootOpenableUINavigationNode extends NavigationNode return getInitializer().getParentReference(); } - public void updateReference(String id) { - boolean notPersisted = getInitializer().isNotPersisted(); - NavigationNode parent = getParent(); - int oldPosition = parent.getIndex(this); - DataDtoReference reference = getInitializer().updateReference(getContext(), id); - if (notPersisted) { - getInitializer().updateEditNodeId(id); - getInitializer().updateSelectNodeId(id); - } - // reload node data - reloadNodeData(); - - if (notPersisted) { - dirty(); - populateChildrenIfNotLoaded(); - } - - ReferenceContainerCapability<?> capability = (ReferenceContainerCapability<?>) parent.getCapability(); - int newPosition = capability.getNodePosition(reference); - if (oldPosition != newPosition) { - log.info(String.format("Move node from: %d to %d", oldPosition, newPosition)); - parent.moveNode(this, newPosition); - } - - // repaint selected node and his children - nodeChangedDeep(); - - // reload from parent to root - parent.reloadNodeDataToRoot(); - } - @Override public Font getNodeFont(Font defaultFont) { if (getInitializer().isOpen()) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java ===================================== @@ -29,7 +29,12 @@ import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRoo import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUINavigationNode; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationUIHandler; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.capability.ReferenceContainerCapability; import fr.ird.observe.dto.data.RootOpenableDto; +import fr.ird.observe.dto.reference.DataDtoReference; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * Created on 16/10/2020. @@ -39,6 +44,8 @@ import fr.ird.observe.dto.data.RootOpenableDto; */ public class SaveContentRootOpenableUIAdapter<D extends RootOpenableDto, U extends ContentRootOpenableUI<D, U>> implements SaveUIAdapter<D, U> { + private static final Logger log = LogManager.getLogger(SaveContentRootOpenableUIAdapter.class); + @Override public final void adaptUi(DataSourceEditor dataSourceEditor, U ui, boolean notPersisted, D bean) { @@ -48,7 +55,7 @@ public class SaveContentRootOpenableUIAdapter<D extends RootOpenableDto, U exten ContentRootOpenableUINavigationNode node = model.getSource(); // We need to inject ot node the new reference (it could does not know the id if not persisted) // As I prefer to use a unique code (for persisted or not, keep it like this) - node.updateReference(bean.getId()); + updateReference(node, bean.getId()); NavigationTree tree = dataSourceEditor.getNavigationUI().getTree(); tree.reSelectSafeNode(node); @@ -63,4 +70,36 @@ public class SaveContentRootOpenableUIAdapter<D extends RootOpenableDto, U exten } NavigationUIHandler.updateStatistics(dataSourceEditor.getNavigationUI(), 0, 1); } + + + public void updateReference(ContentRootOpenableUINavigationNode node , String id) { + boolean notPersisted = node.getInitializer().isNotPersisted(); + NavigationNode parent = node.getParent(); + int oldPosition = parent.getIndex(node); + DataDtoReference reference = node.getInitializer().updateReference(node.getContext(), id); + if (notPersisted) { + node.getInitializer().updateEditNodeId(id); + node.getInitializer().updateSelectNodeId(id); + } + // reload node data + node.reloadNodeDataAndChildren(); + + if (notPersisted) { + node.dirty(); + node.populateChildrenIfNotLoaded(); + } + + ReferenceContainerCapability<?> capability = (ReferenceContainerCapability<?>) parent.getCapability(); + int newPosition = capability.getNodePosition(reference); + if (oldPosition != newPosition) { + log.info(String.format("Move node from: %d to %d", oldPosition, newPosition)); + parent.moveNode(node, newPosition); + } + + // repaint selected node and his children + node.nodeChangedDeep(); + + // reload from parent to root + parent.reloadNodeDataToRoot(); + } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationNode.java ===================================== @@ -358,6 +358,23 @@ public abstract class NavigationNode extends DefaultMutableTreeNode implements W } } + public void reloadNodeDataAndChildren() { + dirty(); + Object userObject = getContext().reload(); + setUserObject(userObject); + loaded(); + Enumeration<?> children = children(); + while (children.hasMoreElements()) { + NavigationNode childNode = (NavigationNode) children.nextElement(); + if (childNode.isLoaded()) { + childNode.updateNode(); + } else { + Object childrenUserObject = childNode.getContext().reload(); + childNode.setUserObject(childrenUserObject); + } + } + } + public void updateSelectNodeId() { if (getScope().isSelectNode()) { ReferenceCapability<?> capability = (ReferenceCapability<?>) getCapability(); ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java ===================================== @@ -229,9 +229,6 @@ public class TripUIModelStates extends GeneratedTripUIModelStates { } private void onLandingHarbourChanged(PropertyChangeEvent event) { - if (!isOpened() || isReadingMode()) { - return; - } HarbourReference newValue = (HarbourReference) event.getNewValue(); boolean localMarketPossible = newValue != null && harbourWithPackaging.contains(newValue); setLocalmarketPossible(localMarketPossible); ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SampleSampleSpeciesSpi.java ===================================== @@ -0,0 +1,33 @@ +package fr.ird.observe.entities.data.ps.localmarket; + +/*- + * #%L + * ObServe Core :: Persistence :: Java + * %% + * Copyright (C) 2008 - 2022 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.spi.result.AddEntityToUpdateStep; + +public class SampleSampleSpeciesSpi extends GeneratedSampleSampleSpeciesSpi { + @Override + public void saveCallback(AddEntityToUpdateStep saveHelper, Sample entity) { + super.saveCallback(saveHelper, entity); + entity.getSampleSpecies().forEach(c -> saveHelper.updateCollection(SampleSpeciesMeasure.SPI, c.getSampleSpeciesMeasure(), false)); + } +} ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SurveySpi.java ===================================== @@ -28,6 +28,7 @@ import fr.ird.observe.dto.data.ps.localmarket.SurveyDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.data.ps.common.Trip; +import fr.ird.observe.spi.result.AddEntityToUpdateStep; import fr.ird.observe.spi.service.ServiceContext; import java.util.Collection; @@ -92,6 +93,12 @@ public class SurveySpi extends GeneratedSurveySpi { // //FIXME Copy missing meta-data to new parent? // } + + @Override + public void saveCallback(AddEntityToUpdateStep saveHelper, Survey entity) { + saveHelper.updateCollection(SurveyPart.SPI, entity.getSurveyPart()); + } + public void fillFormObject(ReferentialLocale referentialLocale, Trip trip, Survey survey, Form<SurveyDto> form) { Collection<Batch> availableBatches = new LinkedList<>(); Collection<Batch> selectedBatches = new LinkedList<>(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5e5a84e217cd123ea2223012b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5e5a84e217cd123ea2223012b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 25 commits: Ajouter des stats permettant de mieux repérer les samples attachés aux activités - Closes #2344
by Tony CHEMIT (＠tchemit) 05 Jun '22

05 Jun '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e6d0753f by Tony Chemit at 2022-05-28T14:17:48+02:00 Ajouter des stats permettant de mieux repérer les samples attachés aux activités - Closes #2344 - - - - - eadfb253 by Tony Chemit at 2022-05-28T14:17:51+02:00 fix ShowTechnicalInformations when multiple - - - - - db69a79e by Tony Chemit at 2022-05-28T14:17:51+02:00 fix ActivitySample table toolbar visibility - - - - - 32459c2f by Tony Chemit at 2022-05-28T14:17:51+02:00 fix ActivitySample move decoration - - - - - fdf9af30 by Tony Chemit at 2022-05-28T14:17:51+02:00 Amélioration des déplacements de données - See ultreiaio/ird-observe#2276 - - - - - b95485ba by Tony Chemit at 2022-05-28T14:17:51+02:00 update pom - - - - - 9cdb4b12 by Tony Chemit at 2022-05-28T14:17:51+02:00 Le message d'erreur de proportion sur les Baits n'apparaît pas - Closes #2371 - - - - - 88f7c9e8 by Tony Chemit at 2022-05-28T14:17:51+02:00 Review usage of decorator in list widgets (can't change any state in incoming data) - See ultreiaio/jaxx#829 - - - - - 311fb573 by Tony Chemit at 2022-05-28T14:17:51+02:00 toolkit in snapshot - - - - - 961dcfaf by Tony Chemit at 2022-05-28T14:17:51+02:00 PS / Logbooks / Capture, le champ poids ne doit pas être exigé si le nombre est saisi - Closes #2385 - - - - - a6e04e63 by Tony Chemit at 2022-05-28T14:18:07+02:00 Make i18n xxx.validation.required override happens! - - - - - f2349fb3 by Tony Chemit at 2022-05-28T14:18:24+02:00 Erreurs de validation retournées par le service web, dont on ne trouve pas la cause dans le content - Closes #2285 - - - - - 90089f0d by Tony Chemit at 2022-05-28T14:18:26+02:00 Landing.Vessel i18n ovveride - - - - - a88db477 by Tony Chemit at 2022-05-28T15:50:42+02:00 Petit souci de mise en page sur le form FOB matériaux - Closes #2241 - - - - - 612c0a0a by Tony Chemit at 2022-05-28T18:13:52+02:00 improve RelationCountCache API - - - - - 9858b93e by Tony Chemit at 2022-05-28T18:15:37+02:00 update pom - - - - - 2fef1e74 by Tony Chemit at 2022-05-29T09:35:37+02:00 Fix replicate test (replicate with the very same parent id, since we delete it before applying the replication). Before we had some errors due to the fact that new parent id had already some data... - - - - - a5f2a3e8 by Tony Chemit at 2022-05-29T09:38:03+02:00 Ajouter des stats permettant de mieux repérer les samples attachés aux activités - See #2344 - - - - - 5a9e80b7 by Tony Chemit at 2022-06-01T17:45:17+02:00 fix Sample I18n - - - - - 2b4a6e5e by Tony Chemit at 2022-06-05T19:07:07+02:00 Introduce new statistics API - - - - - f08b6517 by Tony Chemit at 2022-06-05T19:07:07+02:00 Trois rafinements sur l'expresion régulière par défaut de cuves des bateaux - See ultreiaio/ird-observe#2388 - - - - - 70b98b69 by Tony Chemit at 2022-06-05T19:07:07+02:00 PS / Logbooks / Capture, le champ poids ne doit pas être exigé si le nombre est saisi - Closes #2385 - - - - - 2d85dada by Tony Chemit at 2022-06-05T19:07:07+02:00 Amélioration de la mise en correspondance des zones FPA lors d'un import AVDTH - See ultreiaio/ird-observe#2325 - - - - - 9a74c3ea by Tony Chemit at 2022-06-05T19:07:07+02:00 Sur les global composition du logbook, rendre les proportions optionnelles - See ultreiaio/ird-observe#2373 - - - - - 99ed11ff by Tony Chemit at 2022-06-05T19:07:07+02:00 Amélioration de la mise en correspondance des zones FPA lors d'un import AVDTH - See ultreiaio/ird-observe#2325 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRootRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelStatesSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUINavigationInitializer.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cd32390940b264733918b762… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cd32390940b264733918b762… You're receiving this email because of your account on gitlab.com.

1 0