November 2023 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 14 commits: update pom
by Tony CHEMIT (＠tchemit) 30 Nov '23

30 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 43df8143 by Tony Chemit at 2023-11-30T12:59:58+01:00 update pom - - - - - 4e4fab22 by Tony Chemit at 2023-11-30T14:33:12+01:00 on Report action, let's select all data for local data source - See #281x ? - - - - - ad1a88c8 by Tony Chemit at 2023-11-30T14:33:14+01:00 add AutoNext mechanism on admin tab when tab state change to success, add it on consolidate tab :) - See #281x ? - - - - - bf5d8d8a by Tony Chemit at 2023-11-30T14:33:25+01:00 use TopiaPersistenceContext instead of TopiaDaoSupplier in DefaultReportRequestExecutor to be able to use findById method and use ReportDefinition instead of Report parameter in method TopiaPersistenceContext.newReportRequestExecutor - - - - - df4266dd by Tony Chemit at 2023-11-30T14:33:25+01:00 add method ReportRequestExecutor.getReferentialLabel method and implements it. - - - - - 7248bb0d by Tony Chemit at 2023-11-30T14:33:25+01:00 introduce ColumnRendererDefinition and add some in ReportDefinition - - - - - b2021fca by Tony Chemit at 2023-11-30T15:12:09+01:00 introduce ColumnRendererConsumer and ColumnRendererParameters API - - - - - 8515cd4f by Tony Chemit at 2023-11-30T15:12:39+01:00 implements first ColumnRendererConsumers - - - - - b9ec8221 by Tony Chemit at 2023-11-30T15:12:39+01:00 add method ReportService.initColumnRendererParameters - - - - - 8fc495ce by Tony Chemit at 2023-11-30T15:12:39+01:00 test new API in fixtures - - - - - 6d61b859 by Tony Chemit at 2023-11-30T15:12:39+01:00 add first cell renderers in report definitions :) - - - - - ae59a5f8 by Tony Chemit at 2023-11-30T15:12:39+01:00 adapt Report ui action API to load column renderers of selected report and offers them to HtmlExportModel. - - - - - 498756f4 by Tony Chemit at 2023-11-30T15:45:34+01:00 adapt Report html template at last - - - - - 1b79ed66 by Tony Chemit at 2023-11-30T15:46:12+01:00 Merge branch 'feature/issue-2811' into develop Définir les règles de mise en forme conditionnelle sur les tableaux de synthèse - See #2811 - - - - - 30 changed files: - client/datasource/actions/src/main/i18n/templates/reportHtmlExport_en_GB.ftl - client/datasource/actions/src/main/i18n/templates/reportHtmlExport_es_ES.ftl - client/datasource/actions/src/main/i18n/templates/reportHtmlExport_fr_FR.ftl - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/HtmlExportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - core/persistence/report/src/main/resources/observe-reports.properties - core/services/local/src/main/java/fr/ird/observe/services/local/service/ReportServiceLocalSupport.java - core/services/test/src/main/java/fr/ird/observe/services/service/ReportServiceFixtures.java - pom.xml - server/core/src/main/filtered-resources/META-INF/mapping-api-client.wm - toolkit/api-report/pom.xml - + toolkit/api-report/src/main/java/fr/ird/observe/report/ColumnRendererConsumer.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/ColumnRendererConsumers.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/ColumnRendererParameters.java - toolkit/api-report/src/main/java/fr/ird/observe/report/Report.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/ReportColumnRenderersParameters.java - toolkit/api-report/src/main/java/fr/ird/observe/report/ReportRequestExecutor.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ColumnRendererDefinition.java - toolkit/api-report/src/main/java/fr/ird/observe/report/definition/DefaultReportDefinitionsBuilder.java - toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ReportDefinition.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/renderers/HighlightIfAbsoluteDeltaIsPositive.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/renderers/HighlightIfNotI18nReferentialValue.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/renderers/HighlightIfNumericalValueIsPositive.java - + toolkit/api-report/src/main/resources/fr/ird/observe/report/renderers/HighlightIfAbsoluteDeltaIsPositive.js - + toolkit/api-report/src/main/resources/fr/ird/observe/report/renderers/HighlightIfNotI18nReferentialValue.js The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cfc0c2f35d3357480e23925d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cfc0c2f35d3357480e23925d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2811
by Tony CHEMIT (＠tchemit) 30 Nov '23

30 Nov '23

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

1 0

[Git][ultreiaio/ird-observe][feature/issue-2811] 13 commits: update pom
by Tony CHEMIT (＠tchemit) 30 Nov '23

30 Nov '23

Tony CHEMIT pushed to branch feature/issue-2811 at ultreiaio / ird-observe Commits: 43df8143 by Tony Chemit at 2023-11-30T12:59:58+01:00 update pom - - - - - 4e4fab22 by Tony Chemit at 2023-11-30T14:33:12+01:00 on Report action, let's select all data for local data source - See #281x ? - - - - - ad1a88c8 by Tony Chemit at 2023-11-30T14:33:14+01:00 add AutoNext mechanism on admin tab when tab state change to success, add it on consolidate tab :) - See #281x ? - - - - - bf5d8d8a by Tony Chemit at 2023-11-30T14:33:25+01:00 use TopiaPersistenceContext instead of TopiaDaoSupplier in DefaultReportRequestExecutor to be able to use findById method and use ReportDefinition instead of Report parameter in method TopiaPersistenceContext.newReportRequestExecutor - - - - - df4266dd by Tony Chemit at 2023-11-30T14:33:25+01:00 add method ReportRequestExecutor.getReferentialLabel method and implements it. - - - - - 7248bb0d by Tony Chemit at 2023-11-30T14:33:25+01:00 introduce ColumnRendererDefinition and add some in ReportDefinition - - - - - b2021fca by Tony Chemit at 2023-11-30T15:12:09+01:00 introduce ColumnRendererConsumer and ColumnRendererParameters API - - - - - 8515cd4f by Tony Chemit at 2023-11-30T15:12:39+01:00 implements first ColumnRendererConsumers - - - - - b9ec8221 by Tony Chemit at 2023-11-30T15:12:39+01:00 add method ReportService.initColumnRendererParameters - - - - - 8fc495ce by Tony Chemit at 2023-11-30T15:12:39+01:00 test new API in fixtures - - - - - 6d61b859 by Tony Chemit at 2023-11-30T15:12:39+01:00 add first cell renderers in report definitions :) - - - - - ae59a5f8 by Tony Chemit at 2023-11-30T15:12:39+01:00 adapt Report ui action API to load column renderers of selected report and offers them to HtmlExportModel. - - - - - 498756f4 by Tony Chemit at 2023-11-30T15:45:34+01:00 adapt Report html template at last - - - - - 30 changed files: - client/datasource/actions/src/main/i18n/templates/reportHtmlExport_en_GB.ftl - client/datasource/actions/src/main/i18n/templates/reportHtmlExport_es_ES.ftl - client/datasource/actions/src/main/i18n/templates/reportHtmlExport_fr_FR.ftl - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/HtmlExportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - core/persistence/report/src/main/resources/observe-reports.properties - core/services/local/src/main/java/fr/ird/observe/services/local/service/ReportServiceLocalSupport.java - core/services/test/src/main/java/fr/ird/observe/services/service/ReportServiceFixtures.java - pom.xml - server/core/src/main/filtered-resources/META-INF/mapping-api-client.wm - toolkit/api-report/pom.xml - + toolkit/api-report/src/main/java/fr/ird/observe/report/ColumnRendererConsumer.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/ColumnRendererConsumers.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/ColumnRendererParameters.java - toolkit/api-report/src/main/java/fr/ird/observe/report/Report.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/ReportColumnRenderersParameters.java - toolkit/api-report/src/main/java/fr/ird/observe/report/ReportRequestExecutor.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ColumnRendererDefinition.java - toolkit/api-report/src/main/java/fr/ird/observe/report/definition/DefaultReportDefinitionsBuilder.java - toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ReportDefinition.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/renderers/HighlightIfAbsoluteDeltaIsPositive.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/renderers/HighlightIfNotI18nReferentialValue.java - + toolkit/api-report/src/main/java/fr/ird/observe/report/renderers/HighlightIfNumericalValueIsPositive.java - + toolkit/api-report/src/main/resources/fr/ird/observe/report/renderers/HighlightIfAbsoluteDeltaIsPositive.js - + toolkit/api-report/src/main/resources/fr/ird/observe/report/renderers/HighlightIfNotI18nReferentialValue.js The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2d4064419bd565c489602d9a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2d4064419bd565c489602d9a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue-2811
by Tony CHEMIT (＠tchemit) 29 Nov '23

29 Nov '23

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

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: avoid re-entrant code in listener
by Tony CHEMIT (＠tchemit) 28 Nov '23

28 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ee03d54b by Tony Chemit at 2023-11-28T17:19:37+01:00 avoid re-entrant code in listener - - - - - b5b89df8 by Tony Chemit at 2023-11-28T17:20:29+01:00 Do not enable change mode action if not one selected data - - - - - b3f7a158 by Tony Chemit at 2023-11-28T17:33:20+01:00 On list ui, always select first item at end open - - - - - c4dec149 by Tony Chemit at 2023-11-28T17:34:08+01:00 On list ui, show configuration actions in navigation context menu even if model is not editable (may have the goto editing child action enabled here) - - - - - cfc0c2f3 by Tony Chemit at 2023-11-28T17:34:26+01:00 Merge branch 'feature/issue-2810' into develop LL observations, en sélection multiple d'activités, la fonction 'Rouvrir la donnée de type activité' ne devrait pas être disponible - Closes #2810 - - - - - 3 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeProducer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeShowPopupHandler.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeProducer.java ===================================== @@ -45,6 +45,8 @@ public class ChangeModeProducer<U extends ContentUI> { private final U ui; private final PropertyChangeListener listener; + private boolean adjusting; + public ChangeModeProducer(U ui, ChangeModeRequest request, String... properties) { this.ui = Objects.requireNonNull(ui); this.request = Objects.requireNonNull(request); @@ -57,7 +59,16 @@ public class ChangeModeProducer<U extends ContentUI> { listener = (PropertyChangeEvent evt) -> { if (modelStates.contains(evt.getPropertyName())) { - doRebuildChangeMode(); + if (adjusting) { + return; + } + try { + adjusting = true; + doRebuildChangeMode(); + } finally { + adjusting = false; + } + } }; ui.getModel().getStates().addPropertyChangeListener(ContentUIModelStates.PROPERTY_OPENED, evt -> { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java ===================================== @@ -46,6 +46,7 @@ import org.apache.logging.log4j.Logger; import javax.swing.JComponent; import javax.swing.JMenuItem; +import javax.swing.SwingUtilities; import java.awt.BorderLayout; import java.awt.Container; import java.awt.event.MouseEvent; @@ -126,6 +127,16 @@ public abstract class ContentListUIHandler<D extends OpenableDto, R extends Data ShowTechnicalInformations.installAction(ui); } + @Override + public void onEndOpenUI() { + super.onEndOpenUI(); + SwingUtilities.invokeLater(()-> { + if (!ui.getModel().getStates().isEmpty() && ui.getList().isSelectionEmpty()) { + ui.getList().setSelectedIndex(0); + } + }); + } + @Override public void installChangeModeAction() { ChangeModeRequest request = ui.getModel().toChangeModeRequest(); @@ -194,6 +205,26 @@ public abstract class ContentListUIHandler<D extends OpenableDto, R extends Data ui.getActions().setVisible(false); super.rebuildNotEditableZone(ui); } + + @Override + protected void rebuildAction(U ui, ContentMode newValue) { + ContentListUIModelStates<R> states = ui.getModel().getStates(); + boolean editable = states.isEditable(); + if (editable && ContentMode.READ.equals(newValue)) { + boolean disableAction = false; + if (!states.isOneSelectedData()) { + disableAction = true; + states.setEditable(false); + } + super.rebuildAction(ui, newValue); + if(disableAction) { + states.setEditable(true); + setEnabled(false); + } + } else { + super.rebuildAction(ui, newValue); + } + } }; ChangeMode.installAction(ui, action); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeShowPopupHandler.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.datasource.editor.api.navigation; import fr.ird.observe.client.datasource.editor.api.DataSourceEditorModel; import fr.ird.observe.client.datasource.editor.api.content.ContentUI; import fr.ird.observe.client.datasource.editor.api.content.ContentUIHandler; +import fr.ird.observe.client.datasource.editor.api.content.data.list.ContentListUI; import fr.ird.observe.client.datasource.editor.api.content.referential.ReferentialHomeUI; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import org.apache.logging.log4j.LogManager; @@ -92,7 +93,7 @@ public class NavigationTreeShowPopupHandler implements KeyListener, MouseListene actions.forEach(a -> ContentUIMenuAction.createWithKeyStroke(popup, a).init()); length = popup.getSubElements().length; } else { - if (selectedContentUI.getMode().isEnabled()) { + if (selectedContentUI.getMode().isEnabled() || selectedContentUI instanceof ContentListUI) { ContentUIMenuAction.createWithKeyStroke(popup, selectedContentUI.getMode()).init(); actions.forEach(a -> ContentUIMenuAction.createWithKeyStroke(popup, a).init()); popup.addSeparator(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9686faf40d5b01922d30adc5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9686faf40d5b01922d30adc5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 9 commits: update pom
by Tony CHEMIT (＠tchemit) 28 Nov '23

28 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 09239859 by Tony Chemit at 2023-11-28T12:38:48+01:00 update pom - - - - - d60f1b41 by Tony Chemit at 2023-11-28T12:42:29+01:00 Mettre tous les traits en fin (width=1)- Closes #2756 - - - - - c7a40264 by Tony Chemit at 2023-11-28T16:39:21+01:00 Remove report legacy API and migration. - - - - - 5fc26ffc by Tony Chemit at 2023-11-28T16:39:50+01:00 update pom - - - - - 156a852f by Tony Chemit at 2023-11-28T16:39:51+01:00 add method I18nDecoratorHelper.newTimeFormat - - - - - 6d909796 by Tony Chemit at 2023-11-28T16:39:51+01:00 add cellValueFormatter on ReportRequestExecutor to format date and time (pass it to the DataMatrix) - - - - - e77b6111 by Tony Chemit at 2023-11-28T16:39:51+01:00 update reports to remove any date and time transformations in requests (this will be done after) - - - - - 7d39513a by Tony Chemit at 2023-11-28T16:39:51+01:00 update reports fixtures - - - - - 9686faf4 by Tony Chemit at 2023-11-28T16:45:27+01:00 Merge branch 'feature/issue-2812' into develop Normalisation des dates et heures dans les rapports - Closes #2812 - - - - - 10 changed files: - client/datasource/editor/ll/src/main/resources/map/ll-style.xml - client/datasource/editor/ps/src/main/resources/map/ps-style.xml - core/persistence/report/src/main/resources/observe-reports.properties - − core/persistence/report/src/test/java/fr/ird/observe/report/definition/tool/MigrateReportsDefinitionsTest.java - core/services/local/src/test/java/fr/ird/observe/services/local/service/ReportServiceLocalReadTest.java - core/services/test/src/main/java/fr/ird/observe/services/service/ReportServiceFixtures.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-llLanding.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-llLogbookActivities.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-llLogbookCatches.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-llLogbookSamplesOnActivity.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e3c8ed67630a9fb7237a9536… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e3c8ed67630a9fb7237a9536… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: Supprimer le module server-configuration-tool (il ne sert pas) - Closes #2807
by Tony CHEMIT (＠tchemit) 27 Nov '23

27 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 16bd168a by Tony Chemit at 2023-11-25T14:57:31+01:00 Supprimer le module server-configuration-tool (il ne sert pas) - Closes #2807 - - - - - 5c5514d0 by Tony Chemit at 2023-11-27T17:14:48+01:00 Add a new hook when loading a dto for from and validation (we will use it in Validation interceptor to load on dto some properties used for validation) - - - - - 9fba01ae by Tony Chemit at 2023-11-27T17:14:48+01:00 Add new entity method Activity.isCoordinateRequired to compute this value - - - - - 98639a6a by Tony Chemit at 2023-11-27T17:14:48+01:00 Add new dto method Activity.isCoordinateRequired to get value computed on entity - - - - - 251c5d0b by Tony Chemit at 2023-11-27T17:16:08+01:00 load Activity.coordinateRequired property to dto (when validation is required) - - - - - f58e962c by Tony Chemit at 2023-11-27T17:16:20+01:00 Add validation rule on ActivityDto coordinates (not null except if !coordinateRequired) - - - - - 15719d0c by Tony Chemit at 2023-11-27T17:16:20+01:00 Use new hook loadDtoFroValidation in EntityInterceptor (so now we can have exact same behaviour than in application forms (but need to double check any overrides)) - - - - - e3c8ed67 by Tony Chemit at 2023-11-27T17:17:58+01:00 Merge branch 'feature/issue-2663' into develop Contrôle de validation position si opération sur objet != perte/fin transmission/fin balise - Closes #2663 - - - - - 30 changed files: - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityDto.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SurveySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/spi/validation/ValidationHelper.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json - model/src/main/models/Observe/dto/21-data-ps-logbook.model - model/src/main/models/Observe/dto/attribute/notNullIf.properties - model/src/main/models/Observe/persistence/21-data-ps-logbook.model - − server/configuration-tools/.mvn/pom.gitflow.develop - − server/configuration-tools/.mvn/pom.gitflow.master - − server/configuration-tools/.mvn/pom.organizationId - − server/configuration-tools/.mvn/pom.projectId - − server/configuration-tools/.mvn/pom.stageId - − server/configuration-tools/LICENSE.txt - − server/configuration-tools/README.md The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bdc2aff02c3f40dfe1a19070… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bdc2aff02c3f40dfe1a19070… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Deleted 9 commits: Supprimer le module server-configuration-tool (il ne sert pas) - Closes #2807
by Tony CHEMIT (＠tchemit) 27 Nov '23

27 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: 16bd168a by Tony Chemit at 2023-11-25T14:57:31+01:00 Supprimer le module server-configuration-tool (il ne sert pas) - Closes #2807 - - - - - d891446e by Tony Chemit at 2023-11-26T14:21:39+01:00 Add a new hook when loading a dto for from and validation (we will use it in Validation interceptor to load on dto some properties used for validation) - - - - - 72f5ad23 by Tony Chemit at 2023-11-26T14:25:53+01:00 Add new entity method Activity.isCoordinateRequired to compute this value - - - - - 7a3f463d by Tony Chemit at 2023-11-26T14:25:53+01:00 Add new dto method Activity.isCoordinateRequired to get value computed on entity - - - - - 11207afb by Tony Chemit at 2023-11-26T14:25:53+01:00 use new spi method loadDtoFtoValidation on Activity to load route date and coordinateRequired - - - - - 6814846e by Tony Chemit at 2023-11-26T14:25:53+01:00 Add validation rule on ActivityDto coordinates (not null except if !coordinateRequired) - - - - - 1c40214e by Tony Chemit at 2023-11-26T14:29:45+01:00 Merge branch 'feature/issue-2663' into develop Contrôle de validation position si opération sur objet != perte/fin transmission/fin balise - Closes #2663 - - - - - 0a984bc1 by Tony Chemit at 2023-11-26T14:46:34+01:00 Add a new hook when loading a dto for from and validation (we will use it in Validation interceptor to load on dto some properties used for validation) - - - - - 8e9ef36f by Tony Chemit at 2023-11-26T14:46:35+01:00 Use new hook loadDtoFroValidation in EntityInterceptor (so now we can have exact same behaviour than in application forms (but need to double check any overrides)) - - - - - 30 changed files: - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityDto.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SurveySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/spi/validation/ValidationHelper.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json - model/src/main/models/Observe/dto/21-data-ps-logbook.model - model/src/main/models/Observe/dto/attribute/notNullIf.properties - model/src/main/models/Observe/persistence/21-data-ps-logbook.model - − server/configuration-tools/.mvn/pom.gitflow.develop - − server/configuration-tools/.mvn/pom.gitflow.master - − server/configuration-tools/.mvn/pom.organizationId - − server/configuration-tools/.mvn/pom.projectId - − server/configuration-tools/.mvn/pom.stageId - − server/configuration-tools/LICENSE.txt - − server/configuration-tools/README.md The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bdc2aff02c3f40dfe1a19070… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bdc2aff02c3f40dfe1a19070… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Add a new hook when loading a dto for from and validation (we will use it in...
by Tony CHEMIT (＠tchemit) 26 Nov '23

26 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0a984bc1 by Tony Chemit at 2023-11-26T14:46:34+01:00 Add a new hook when loading a dto for from and validation (we will use it in Validation interceptor to load on dto some properties used for validation) - - - - - 8e9ef36f by Tony Chemit at 2023-11-26T14:46:35+01:00 Use new hook loadDtoFroValidation in EntityInterceptor (so now we can have exact same behaviour than in application forms (but need to double check any overrides)) - - - - - 7 changed files: - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/spi/validation/ValidationHelper.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/EditableDtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/validation/EntityInterceptor.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/validation/ValidationMessageDetector.java Changes: ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/SetSpi.java ===================================== @@ -79,7 +79,7 @@ public class SetSpi extends GeneratedSetSpi { @Override public void loadDtoForValidation(ServiceContext context, Activity parent, Set entity, SetDto dto) { - super.loadDtoForValidation(context, entity, dto); + super.loadDtoForValidation(context, parent, entity, dto); dto.setOtherSets(getBrothers(context, parent)); } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetSpi.java ===================================== @@ -116,7 +116,7 @@ public class SetSpi extends GeneratedSetSpi { @Override public void loadDtoForValidation(ServiceContext context, Activity parent, Set entity, SetDto dto) { - super.loadDtoForValidation(context, entity, dto); + super.loadDtoForValidation(context, parent, entity, dto); dto.setOtherSets(getBrothers(context, parent)); } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java ===================================== @@ -69,7 +69,7 @@ public class SetSpi extends GeneratedSetSpi { @Override public void loadDtoForValidation(ServiceContext context, Activity parent, Set entity, SetDto dto) { - super.loadDtoForValidation(context, entity, dto); + super.loadDtoForValidation(context, parent, entity, dto); Route route = Activity.SPI.getParent(context, parent.getTopiaId()); Date routeDate = route.getDate(); dto.setStartSetDate(routeDate); ===================================== core/persistence/java/src/main/java/fr/ird/observe/spi/validation/ValidationHelper.java ===================================== @@ -77,7 +77,7 @@ public class ValidationHelper { try (ValidationResultBuilder resultBuilder = ValidationResultBuilder.create()) { // We need to inject species dto (required by some validators) Set<SpeciesDto> species = Species.loadEntitiesToDto(context); - ValidationMessageDetector detector = ValidationMessageDetector.forData(toValidatorsMap(request), validationContext, validationContext.getSelectModel(), referentialLocale, resultBuilder); + ValidationMessageDetector detector = ValidationMessageDetector.forData(context, toValidatorsMap(request), validationContext, validationContext.getSelectModel(), referentialLocale, resultBuilder); long t0 = TimeLog.getTime(); try { validateData(detector, validationContext, entity, species); @@ -99,7 +99,7 @@ public class ValidationHelper { try (ValidationResultBuilder resultBuilder = ValidationResultBuilder.create()) { // We need to inject species dto (required by some validators) Set<SpeciesDto> species = Species.loadEntitiesToDto(context); - ValidationMessageDetector detector = ValidationMessageDetector.forData(toValidatorsMap(request), validationContext, validationContext.getSelectModel(), referentialLocale, resultBuilder); + ValidationMessageDetector detector = ValidationMessageDetector.forData(context, toValidatorsMap(request), validationContext, validationContext.getSelectModel(), referentialLocale, resultBuilder); for (String dataId : request.getDataIds()) { DataDtoEntityContext<?, ?, ?, ?> spi; if (TripAware.isSeineId(dataId)) { @@ -122,7 +122,7 @@ public class ValidationHelper { ReferentialLocale referentialLocale = context.getReferentialLocale(); try (ValidationResultBuilder resultBuilder = ValidationResultBuilder.create()) { - ValidationMessageDetector detector = ValidationMessageDetector.forReferential(toValidatorsMap(request), validationContext, referentialLocale, resultBuilder); + ValidationMessageDetector detector = ValidationMessageDetector.forReferential(context, toValidatorsMap(request), validationContext, referentialLocale, resultBuilder); boolean notPersisted = entity.isNotPersisted(); if (notPersisted) { entity.setTopiaId("__create"); @@ -150,7 +150,7 @@ public class ValidationHelper { try (ServiceValidationContext validationContext = (ServiceValidationContext) context.createServiceValidationContext(configuration, request)) { ReferentialLocale referentialLocale = context.getReferentialLocale(); try (ValidationResultBuilder resultBuilder = ValidationResultBuilder.create()) { - ValidationMessageDetector detector = ValidationMessageDetector.forReferential(toValidatorsMap(request), validationContext, referentialLocale, resultBuilder); + ValidationMessageDetector detector = ValidationMessageDetector.forReferential(context, toValidatorsMap(request), validationContext, referentialLocale, resultBuilder); for (Class<? extends ReferentialDto> type : request.getReferentialTypes()) { ReferentialDtoEntityContext<?, ?, ?, ?> spi = context.fromReferentialDto(type); validateReferential(context, spi, detector, validationContext); ===================================== toolkit/persistence/src/main/java/fr/ird/observe/spi/context/EditableDtoEntityContext.java ===================================== @@ -104,6 +104,12 @@ public abstract class EditableDtoEntityContext< super.loadDtoForValidation(context, entity, dto); } + @Override + public void loadDtoForValidation(ServiceContext context, E entity, D dto) { + PE parent = getParent(context, entity.getTopiaId()); + loadDtoForValidation(context, parent, entity, dto); + } + public final Form<D> preCreate(ServiceContext context, String parentId) { PE parent = parentSpi().loadEntity(context, parentId); E preCreated = newEntity(context.now()); ===================================== toolkit/persistence/src/main/java/fr/ird/observe/spi/validation/EntityInterceptor.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.Entity; import fr.ird.observe.spi.context.DtoEntityContext; +import fr.ird.observe.spi.service.ServiceContext; import fr.ird.observe.validation.ValidationContextSupport; import fr.ird.observe.validation.api.result.ValidationResultDtoMessage; import io.ultreia.java4all.decoration.Decorator; @@ -62,10 +63,14 @@ public class EntityInterceptor<D extends BusinessDto, E extends Entity> { this.cache = new TreeMap<>(); } - LinkedList<ValidationResultDtoMessage> intercept(MessagesCollector messagesCollector, ValidationContextSupport validationDataContext, E e) { + LinkedList<ValidationResultDtoMessage> intercept(ServiceContext context, MessagesCollector messagesCollector, ValidationContextSupport validationDataContext, E e) { e.registerDecorator(decorator); if (validator != null) { - D dto = cache.computeIfAbsent(e.getTopiaId(), id -> spi.toDto(referentialLocale, e)); + D dto = cache.computeIfAbsent(e.getTopiaId(), id -> { + D result = spi.toDto(referentialLocale, e); + spi.loadDtoForValidation(context, e, result); + return result; + }); if (dataContextConsumer != null) { dataContextConsumer.accept(dto.getId()); validationDataContext.add(dto); ===================================== toolkit/persistence/src/main/java/fr/ird/observe/spi/validation/ValidationMessageDetector.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.Entity; import fr.ird.observe.navigation.id.IdProject; +import fr.ird.observe.spi.service.ServiceContext; import fr.ird.observe.validation.ValidationContextSupport; import fr.ird.observe.validation.ValidatorsMap; import fr.ird.observe.validation.api.result.ValidationResultBuilder; @@ -59,6 +60,7 @@ public class ValidationMessageDetector { private static class ValidationEntityVisitor implements TopiaEntityVisitor { + private final ServiceContext context; private final ValidationContextSupport validationDataContext; private final Map<Class<?>, EntityInterceptor<?, ?>> interceptors; private final Deque<Entity> path; @@ -68,10 +70,12 @@ public class ValidationMessageDetector { private final boolean canWalkInSubclasses; - ValidationEntityVisitor(ValidationContextSupport validationDataContext, + ValidationEntityVisitor(ServiceContext context, + ValidationContextSupport validationDataContext, Map<Class<?>, EntityInterceptor<?, ?>> interceptors, ValidationResultBuilder resultBuilder, MessagesCollector messagesCollector, boolean canWalkInSubclasses) { + this.context = context; this.validationDataContext = validationDataContext; this.interceptors = interceptors; this.resultBuilder = resultBuilder; @@ -140,7 +144,7 @@ public class ValidationMessageDetector { if (interceptor == null) { return; } - LinkedList<ValidationResultDtoMessage> messages = interceptor.intercept(messagesCollector, validationDataContext, e); + LinkedList<ValidationResultDtoMessage> messages = interceptor.intercept(context,messagesCollector, validationDataContext, e); resultBuilder.addMessages(getPath(), messages); } @@ -178,7 +182,8 @@ public class ValidationMessageDetector { } } - public static ValidationMessageDetector forData(ValidatorsMap validators, + public static ValidationMessageDetector forData(ServiceContext context, + ValidatorsMap validators, ValidationContextSupport validationDataContext, IdProject selectModel, ReferentialLocale referentialLocale, @@ -187,33 +192,38 @@ public class ValidationMessageDetector { validationDataContext, selectModel, referentialLocale); - return new ValidationMessageDetector(referentialLocale, + return new ValidationMessageDetector(context, + referentialLocale, validationDataContext, resultBuilder, interceptors, true); } - public static ValidationMessageDetector forReferential(ValidatorsMap validators, + public static ValidationMessageDetector forReferential(ServiceContext context, + ValidatorsMap validators, ValidationContextSupport validationDataContext, ReferentialLocale referentialLocale, ValidationResultBuilder resultBuilder) { Map<Class<?>, EntityInterceptor<?, ?>> interceptors = EntityInterceptors.forReferential(validators, validationDataContext, referentialLocale); - return new ValidationMessageDetector(referentialLocale, + return new ValidationMessageDetector(context, + referentialLocale, validationDataContext, resultBuilder, interceptors, false); } - private ValidationMessageDetector(ReferentialLocale referentialLocale, + private ValidationMessageDetector(ServiceContext context, + ReferentialLocale referentialLocale, ValidationContextSupport validationDataContext, ValidationResultBuilder resultBuilder, Map<Class<?>, EntityInterceptor<?, ?>> interceptors, boolean canWalkInSubclasses) { - this.entityVisitor = new ValidationEntityVisitor(validationDataContext, + this.entityVisitor = new ValidationEntityVisitor(context, + validationDataContext, interceptors, resultBuilder, new MessagesCollector(referentialLocale.getLocale()), View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1c40214edd7c59c09569e4ae… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1c40214edd7c59c09569e4ae… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Add a new hook when loading a dto for from and validation (we will use it in...
by Tony CHEMIT (＠tchemit) 26 Nov '23

26 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d891446e by Tony Chemit at 2023-11-26T14:21:39+01:00 Add a new hook when loading a dto for from and validation (we will use it in Validation interceptor to load on dto some properties used for validation) - - - - - 72f5ad23 by Tony Chemit at 2023-11-26T14:25:53+01:00 Add new entity method Activity.isCoordinateRequired to compute this value - - - - - 7a3f463d by Tony Chemit at 2023-11-26T14:25:53+01:00 Add new dto method Activity.isCoordinateRequired to get value computed on entity - - - - - 11207afb by Tony Chemit at 2023-11-26T14:25:53+01:00 use new spi method loadDtoFtoValidation on Activity to load route date and coordinateRequired - - - - - 6814846e by Tony Chemit at 2023-11-26T14:25:53+01:00 Add validation rule on ActivityDto coordinates (not null except if !coordinateRequired) - - - - - 1c40214e by Tony Chemit at 2023-11-26T14:29:45+01:00 Merge branch 'feature/issue-2663' into develop Contrôle de validation position si opération sur objet != perte/fin transmission/fin balise - Closes #2663 - - - - - 30 changed files: - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityDto.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/localmarket/SurveySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json - model/src/main/models/Observe/dto/21-data-ps-logbook.model - model/src/main/models/Observe/dto/attribute/notNullIf.properties - model/src/main/models/Observe/persistence/21-data-ps-logbook.model - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update.json - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/ContainerDtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/EditableDtoEntityContext.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/16bd168ad28e5510fbab7598… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/16bd168ad28e5510fbab7598… You're receiving this email because of your account on gitlab.com.

1 0