February 2024 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Deleted branch release/9.2.3
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

Tony CHEMIT deleted branch release/9.2.3 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.2.3
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

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

1 0

[Git][ultreiaio/ird-observe][develop-9.2.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.2.3' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

Tony CHEMIT pushed to branch develop-9.2.x at ultreiaio / ird-observe Commits: a73bcf6e by Tony Chemit at 2024-02-15T10:39:10+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.2.3' with non-snapshot versions[skip ci] - - - - - 1778cd1b by Tony Chemit at 2024-02-15T10:55:14+01:00 [jgitflow-maven-plugin]merging 'release/9.2.3' into 'master-9.2.x' - - - - - efd73fe0 by Tony Chemit at 2024-02-15T10:55:19+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - afd81d4d by Tony Chemit at 2024-02-15T10:55:20+01:00 [jgitflow-maven-plugin]merging 'master-9.2.x' into 'develop-9.2.x' - - - - - 03abc6fb by Tony Chemit at 2024-02-15T10:55:21+01: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/588cb1b53bc0e44e57b8c3c1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/588cb1b53bc0e44e57b8c3c1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/9.2.3] [jgitflow-maven-plugin]updating poms for branch'release/9.2.3' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

Tony CHEMIT pushed to branch release/9.2.3 at ultreiaio / ird-observe Commits: a73bcf6e by Tony Chemit at 2024-02-15T10:39:10+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.2.3' 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-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/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/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a73bcf6ebf80990bd6555ab24… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a73bcf6ebf80990bd6555ab24… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-9.2.x] 11 commits: [jgitflow-maven-plugin]updating poms for 9.2.3-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

Tony CHEMIT pushed to branch master-9.2.x at ultreiaio / ird-observe Commits: cceae42a by Tony Chemit at 2024-01-22T12:29:43+01:00 [jgitflow-maven-plugin]updating poms for 9.2.3-SNAPSHOT development[skip ci] - - - - - bd4f4797 by Tony Chemit at 2024-01-22T12:47:06+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 9237f66a by Tony Chemit at 2024-01-22T12:47:07+01:00 [jgitflow-maven-plugin]merging 'master-9.2.x' into 'develop-9.2.x' - - - - - 679af7bc by Tony Chemit at 2024-01-22T12:47:08+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 1699ebf1 by Tony Chemit at 2024-02-15T09:49:16+01:00 En 9.2.2, impossible de créer une marée en mode serveur - Closes #2838 - - - - - a695c5d2 by Tony Chemit at 2024-02-15T09:49:18+01:00 Fix DtoFormValidatorTransformer on timeStampAfter validation - See #2837 - - - - - b3d547ff by Tony Chemit at 2024-02-15T10:11:50+01:00 Sur PS / Observations / Calée, les contrôles sur les dates/heures ne fonctionnent plus correctement - Closes #2837 - - - - - 5624a389 by Tony Chemit at 2024-02-15T10:33:22+01:00 Prepare release of 9.2.3 - - - - - 59488f67 by Tony Chemit at 2024-02-15T10:38:29+01:00 Update changelog for v.9.2.3 [skip CI] - - - - - a73bcf6e by Tony Chemit at 2024-02-15T10:39:10+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.2.3' with non-snapshot versions[skip ci] - - - - - 1778cd1b by Tony Chemit at 2024-02-15T10:55:14+01:00 [jgitflow-maven-plugin]merging 'release/9.2.3' into 'master-9.2.x' - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - CHANGELOG.md - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/configuration/pom.xml - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/core/pom.xml - client/datasource/.mvn/pom.gitflow.develop - client/datasource/.mvn/pom.gitflow.master - client/datasource/actions/.mvn/pom.gitflow.develop - client/datasource/actions/.mvn/pom.gitflow.master - client/datasource/actions/pom.xml - client/datasource/editor/.mvn/pom.gitflow.develop - client/datasource/editor/.mvn/pom.gitflow.master - client/datasource/editor/api-test/.mvn/pom.gitflow.develop - client/datasource/editor/api-test/.mvn/pom.gitflow.master - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/.mvn/pom.gitflow.develop - client/datasource/editor/api/.mvn/pom.gitflow.master - client/datasource/editor/api/pom.xml - client/datasource/editor/common/.mvn/pom.gitflow.develop - client/datasource/editor/common/.mvn/pom.gitflow.master - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/.mvn/pom.gitflow.develop - client/datasource/editor/ll/.mvn/pom.gitflow.master - client/datasource/editor/ll/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/818309170dd9554e804cac40… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/818309170dd9554e804cac40… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.2.x] [jgitflow-maven-plugin]updating poms for 9.2.4-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

Tony CHEMIT pushed to branch develop-9.2.x at ultreiaio / ird-observe Commits: 588cb1b5 by Tony Chemit at 2024-02-15T10:38:54+01:00 [jgitflow-maven-plugin]updating poms for 9.2.4-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-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/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/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/588cb1b53bc0e44e57b8c3c18… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/588cb1b53bc0e44e57b8c3c18… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.2.3
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

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

1 0

[Git][ultreiaio/ird-observe][develop-9.2.x] Update changelog for v.9.2.3 [skip CI]
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

Tony CHEMIT pushed to branch develop-9.2.x at ultreiaio / ird-observe Commits: 59488f67 by Tony Chemit at 2024-02-15T10:38:29+01:00 Update changelog for v.9.2.3 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,20 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2024-01-22 12:28. + * Last generated at 2024-02-15 10:37. + +## Version [9.2.3](https://gitlab.com/ultreiaio/ird-observe/-/milestones/276) + +**Closed at 2024-02-15.** + +### Download +* [Client (observe-9.2.3-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.2.3.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.2.3-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + +### Issues + * [[Type::Anomalie 2837]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2837) **Sur PS / Observations / Calée, les contrôles sur les dates/heures ne fonctionnent plus correctement** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2838]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2838) **En 9.2.2, impossible de créer une marée en mode serveur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.2.2](https://gitlab.com/ultreiaio/ird-observe/-/milestones/273) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/59488f671d0c5bab9a0a6e287… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/59488f671d0c5bab9a0a6e287… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.2.x] 4 commits: En 9.2.2, impossible de créer une marée en mode serveur - Closes #2838
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

Tony CHEMIT pushed to branch develop-9.2.x at ultreiaio / ird-observe Commits: 1699ebf1 by Tony Chemit at 2024-02-15T09:49:16+01:00 En 9.2.2, impossible de créer une marée en mode serveur - Closes #2838 - - - - - a695c5d2 by Tony Chemit at 2024-02-15T09:49:18+01:00 Fix DtoFormValidatorTransformer on timeStampAfter validation - See #2837 - - - - - b3d547ff by Tony Chemit at 2024-02-15T10:11:50+01:00 Sur PS / Observations / Calée, les contrôles sur les dates/heures ne fonctionnent plus correctement - Closes #2837 - - - - - 5624a389 by Tony Chemit at 2024-02-15T10:33:22+01:00 Prepare release of 9.2.3 - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/datasource/.mvn/pom.gitflow.develop - client/datasource/.mvn/pom.gitflow.master - client/datasource/actions/.mvn/pom.gitflow.develop - client/datasource/actions/.mvn/pom.gitflow.master - client/datasource/editor/.mvn/pom.gitflow.develop - client/datasource/editor/.mvn/pom.gitflow.master - client/datasource/editor/api-test/.mvn/pom.gitflow.develop - client/datasource/editor/api-test/.mvn/pom.gitflow.master - client/datasource/editor/api/.mvn/pom.gitflow.develop - client/datasource/editor/api/.mvn/pom.gitflow.master - client/datasource/editor/common/.mvn/pom.gitflow.develop - client/datasource/editor/common/.mvn/pom.gitflow.master - client/datasource/editor/ll/.mvn/pom.gitflow.develop - client/datasource/editor/ll/.mvn/pom.gitflow.master - client/datasource/editor/ps/.mvn/pom.gitflow.develop - client/datasource/editor/ps/.mvn/pom.gitflow.master - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIHandler.java - client/datasource/editor/spi/.mvn/pom.gitflow.develop - client/datasource/editor/spi/.mvn/pom.gitflow.master - client/runner/.mvn/pom.gitflow.develop - client/runner/.mvn/pom.gitflow.master - core/.mvn/pom.gitflow.develop The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/679af7bcf0a99f1edeed60c2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/679af7bcf0a99f1edeed60c2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: En 9.2.2, impossible de créer une marée en mode serveur - Closes #2838
by Tony CHEMIT (＠tchemit) 15 Feb '24

15 Feb '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 118a55d7 by Tony Chemit at 2024-02-15T07:04:08+01:00 En 9.2.2, impossible de créer une marée en mode serveur - Closes #2838 - - - - - 7073ca15 by Tony Chemit at 2024-02-15T09:09:20+01:00 Fix DtoFormValidatorTransformer on timeStampAfter validation - See #2837 - - - - - b41a9d7b by Tony Chemit at 2024-02-15T09:31:17+01:00 Sur PS / Observations / Calée, les contrôles sur les dates/heures ne fonctionnent plus correctement - Closes #2837 - - - - - 18 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIHandler.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-update-warning-validation.xml - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Set/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Set/validation-update.json - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - model/src/main/models/Observe/dto/attribute/timeAfter.properties - model/src/main/models/Observe/dto/attribute/timestampAfter.properties - model/src/main/models/Observe/dto/attribute/timeAfterWarning.properties → model/src/main/models/Observe/dto/attribute/timestampAfterWarning.properties - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/validation/DtoFormValidatorTransformer.java - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/validation/ValidationTagValues.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIHandler.java ===================================== @@ -38,7 +38,7 @@ class TripUIHandler extends GeneratedTripUIHandler { public void startEditUI() { TripDto bean = getModel().getStates().getBean(); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2729#note_1472547867 - if (bean.getActivitiesAcquisitionModeByTimeEnabled() == null) { + if (bean.isPersisted() && bean.getActivitiesAcquisitionModeByTimeEnabled() == null) { // compute it boolean activitiesAcquisitionModeByTimeEnabled = getPsCommonTripService().isActivitiesAcquisitionModeByTimeEnabled(bean.getId()); // set it to bean (will be used then by validation on field activitiesAcquisitionMode) ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -14657,10 +14657,10 @@ ] }, { - "name": "endTime", + "name": "endTimeStamp", "comments": [ - "endTime >= haulingEndTime and max delay is 45 minutes", - "endTime >= startTime" + "endTimeStamp >= haulingEndTimeStamp and min delay is 45 minutes", + "endTimeStamp >= startTime" ] }, { @@ -14670,9 +14670,9 @@ ] }, { - "name": "haulingEndTime", + "name": "haulingEndTimeStamp", "comments": [ - "haulingEndTime >= startTime" + "haulingEndTimeStamp >= startTime" ] }, { @@ -14754,9 +14754,9 @@ ] }, { - "name": "endTime", + "name": "endTimeStamp", "comments": [ - "endTime >= startTime and max delay is 300 minutes" + "endTimeStamp >= startTime and max delay is 300 minutes" ] }, { @@ -14813,10 +14813,10 @@ ] }, { - "name": "endTime", + "name": "endTimeStamp", "comments": [ - "endTime >= haulingEndTime and max delay is 45 minutes", - "endTime >= startTime" + "endTimeStamp >= haulingEndTimeStamp and min delay is 45 minutes", + "endTimeStamp >= startTime" ] }, { @@ -14826,9 +14826,9 @@ ] }, { - "name": "haulingEndTime", + "name": "haulingEndTimeStamp", "comments": [ - "haulingEndTime >= startTime" + "haulingEndTimeStamp >= startTime" ] }, { @@ -14910,9 +14910,9 @@ ] }, { - "name": "endTime", + "name": "endTimeStamp", "comments": [ - "endTime >= startTime and max delay is 300 minutes" + "endTimeStamp >= startTime and max delay is 300 minutes" ] }, { ===================================== core/api/validation/src/main/i18n/getters/eugene.getter ===================================== @@ -359,8 +359,10 @@ observe.data.ps.observation.SchoolEstimate.meanWeight observe.data.ps.observation.SchoolEstimate.species observe.data.ps.observation.SchoolEstimate.totalWeight observe.data.ps.observation.Set.currentMeasureDepth +observe.data.ps.observation.Set.endTimeStamp observe.data.ps.observation.Set.haulingEndDate observe.data.ps.observation.Set.haulingEndTime +observe.data.ps.observation.Set.haulingEndTimeStamp observe.data.ps.observation.Set.haulingStartTimeStamp observe.data.ps.observation.Set.maxGearDepth observe.data.ps.observation.Set.schoolMeanDepth ===================================== core/api/validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -111,12 +111,12 @@ observe.data.ps.observation.SampleMeasure.weight.validation.required observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required observe.data.ps.observation.SchoolEstimate.totalWeight.validation.required observe.data.ps.observation.Set.validation.endDate.after.haulingEndDate -observe.data.ps.observation.Set.validation.endTime.after.haulingEndTime -observe.data.ps.observation.Set.validation.endTime.after.startTime -observe.data.ps.observation.Set.validation.endTime.delay.too.long -observe.data.ps.observation.Set.validation.endTime.delay.too.short +observe.data.ps.observation.Set.validation.endTimeStamp.after.haulingEndTimeStamp +observe.data.ps.observation.Set.validation.endTimeStamp.after.startTime +observe.data.ps.observation.Set.validation.endTimeStamp.delay.too.long +observe.data.ps.observation.Set.validation.endTimeStamp.delay.too.short observe.data.ps.observation.Set.validation.haulingEndDate.after.currentPsObservationRoute.date -observe.data.ps.observation.Set.validation.haulingEndTime.after.startTime +observe.data.ps.observation.Set.validation.haulingEndTimeStamp.after.startTime observe.data.ps.observation.Set.validation.haulingStartTimeStamp.after.startTime observe.data.ps.observation.Set.validation.startTime.after.currentPsObservationActivity.time observe.referential.Referential.validation.disabled ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-create-error-validation.xml ===================================== @@ -86,18 +86,18 @@ </field-validator> </field> - <field name="endTime"> -  - <field-validator type="timeAfter"> + <field name="endTimeStamp"> +  + <field-validator type="timestampAfter"> <param name="otherDateProperty">startTime</param> - <message>observe.data.ps.observation.Set.validation.endTime.after.startTime##${startDate}##${endDate}</message> + <message>observe.data.ps.observation.Set.validation.endTimeStamp.after.startTime##${startDate}##${endDate}</message> </field-validator> -  - <field-validator type="timeAfter"> - <param name="otherDateProperty">haulingEndTime</param> +  + <field-validator type="timestampAfter"> + <param name="otherDateProperty">haulingEndTimeStamp</param> <param name="minDelayInMinutes">45</param> - <param name="delayErrorMessage">observe.data.ps.observation.Set.validation.endTime.delay.too.short##${delayInMinutes}##${minDelayInMinutes}</param> - <message>observe.data.ps.observation.Set.validation.endTime.after.haulingEndTime##${startDate}##${endDate}</message> + <param name="delayErrorMessage">observe.data.ps.observation.Set.validation.endTimeStamp.delay.too.short##${delayInMinutes}##${minDelayInMinutes}</param> + <message>observe.data.ps.observation.Set.validation.endTimeStamp.after.haulingEndTimeStamp##${startDate}##${endDate}</message> </field-validator> </field> @@ -109,11 +109,11 @@ </field-validator> </field> - <field name="haulingEndTime"> -  - <field-validator type="timeAfter"> + <field name="haulingEndTimeStamp"> +  + <field-validator type="timestampAfter"> <param name="otherDateProperty">startTime</param> - <message>observe.data.ps.observation.Set.validation.haulingEndTime.after.startTime##${startDate}##${endDate}</message> + <message>observe.data.ps.observation.Set.validation.haulingEndTimeStamp.after.startTime##${startDate}##${endDate}</message> </field-validator> </field> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-create-warning-validation.xml ===================================== @@ -31,13 +31,13 @@ </field-validator> </field> - <field name="endTime"> -  - <field-validator type="timeAfter"> + <field name="endTimeStamp"> +  + <field-validator type="timestampAfter"> <param name="otherDateProperty">startTime</param> <param name="maxDelayInMinutes">300</param> - <param name="delayErrorMessage">observe.data.ps.observation.Set.validation.endTime.delay.too.long##${delayInMinutes}##${maxDelayInMinutes}</param> - <message>observe.data.ps.observation.Set.validation.endTime.after.startTime##${startDate}##${endDate}</message> + <param name="delayErrorMessage">observe.data.ps.observation.Set.validation.endTimeStamp.delay.too.long##${delayInMinutes}##${maxDelayInMinutes}</param> + <message>observe.data.ps.observation.Set.validation.endTimeStamp.after.startTime##${startDate}##${endDate}</message> </field-validator> </field> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-update-error-validation.xml ===================================== @@ -86,18 +86,18 @@ </field-validator> </field> - <field name="endTime"> -  - <field-validator type="timeAfter"> + <field name="endTimeStamp"> +  + <field-validator type="timestampAfter"> <param name="otherDateProperty">startTime</param> - <message>observe.data.ps.observation.Set.validation.endTime.after.startTime##${startDate}##${endDate}</message> + <message>observe.data.ps.observation.Set.validation.endTimeStamp.after.startTime##${startDate}##${endDate}</message> </field-validator> -  - <field-validator type="timeAfter"> - <param name="otherDateProperty">haulingEndTime</param> +  + <field-validator type="timestampAfter"> + <param name="otherDateProperty">haulingEndTimeStamp</param> <param name="minDelayInMinutes">45</param> - <param name="delayErrorMessage">observe.data.ps.observation.Set.validation.endTime.delay.too.short##${delayInMinutes}##${minDelayInMinutes}</param> - <message>observe.data.ps.observation.Set.validation.endTime.after.haulingEndTime##${startDate}##${endDate}</message> + <param name="delayErrorMessage">observe.data.ps.observation.Set.validation.endTimeStamp.delay.too.short##${delayInMinutes}##${minDelayInMinutes}</param> + <message>observe.data.ps.observation.Set.validation.endTimeStamp.after.haulingEndTimeStamp##${startDate}##${endDate}</message> </field-validator> </field> @@ -109,11 +109,11 @@ </field-validator> </field> - <field name="haulingEndTime"> -  - <field-validator type="timeAfter"> + <field name="haulingEndTimeStamp"> +  + <field-validator type="timestampAfter"> <param name="otherDateProperty">startTime</param> - <message>observe.data.ps.observation.Set.validation.haulingEndTime.after.startTime##${startDate}##${endDate}</message> + <message>observe.data.ps.observation.Set.validation.haulingEndTimeStamp.after.startTime##${startDate}##${endDate}</message> </field-validator> </field> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-update-warning-validation.xml ===================================== @@ -31,13 +31,13 @@ </field-validator> </field> - <field name="endTime"> -  - <field-validator type="timeAfter"> + <field name="endTimeStamp"> +  + <field-validator type="timestampAfter"> <param name="otherDateProperty">startTime</param> <param name="maxDelayInMinutes">300</param> - <param name="delayErrorMessage">observe.data.ps.observation.Set.validation.endTime.delay.too.long##${delayInMinutes}##${maxDelayInMinutes}</param> - <message>observe.data.ps.observation.Set.validation.endTime.after.startTime##${startDate}##${endDate}</message> + <param name="delayErrorMessage">observe.data.ps.observation.Set.validation.endTimeStamp.delay.too.long##${delayInMinutes}##${maxDelayInMinutes}</param> + <message>observe.data.ps.observation.Set.validation.endTimeStamp.after.startTime##${startDate}##${endDate}</message> </field-validator> </field> ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Set/validation-create.json ===================================== @@ -31,13 +31,13 @@ "endDate >= haulingEndDate" ] }, - "endTime": { + "endTimeStamp": { "errors": [ - "endTime >= haulingEndTime and max delay is 45 minutes", - "endTime >= startTime" + "endTimeStamp >= haulingEndTimeStamp and min delay is 45 minutes", + "endTimeStamp >= startTime" ], "warnings": [ - "endTime >= startTime and max delay is 300 minutes" + "endTimeStamp >= startTime and max delay is 300 minutes" ] }, "haulingEndDate": { @@ -45,9 +45,9 @@ "haulingEndDate >= currentPsObservationRoute.date" ] }, - "haulingEndTime": { + "haulingEndTimeStamp": { "errors": [ - "haulingEndTime >= startTime" + "haulingEndTimeStamp >= startTime" ] }, "haulingStartTimeStamp": { ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Set/validation-update.json ===================================== @@ -31,13 +31,13 @@ "endDate >= haulingEndDate" ] }, - "endTime": { + "endTimeStamp": { "errors": [ - "endTime >= haulingEndTime and max delay is 45 minutes", - "endTime >= startTime" + "endTimeStamp >= haulingEndTimeStamp and min delay is 45 minutes", + "endTimeStamp >= startTime" ], "warnings": [ - "endTime >= startTime and max delay is 300 minutes" + "endTimeStamp >= startTime and max delay is 300 minutes" ] }, "haulingEndDate": { @@ -45,9 +45,9 @@ "haulingEndDate >= currentPsObservationRoute.date" ] }, - "haulingEndTime": { + "haulingEndTimeStamp": { "errors": [ - "haulingEndTime >= startTime" + "haulingEndTimeStamp >= startTime" ] }, "haulingStartTimeStamp": { ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1488,8 +1488,13 @@ observe.data.ps.observation.Set.validation.endTime.after.haulingEndTime=End time observe.data.ps.observation.Set.validation.endTime.after.startTime=End time (%2$s) must be after start time (%1$s). observe.data.ps.observation.Set.validation.endTime.delay.too.long=Delay of set (%1$s minutes) is too long (maximum of %2$s minutes). observe.data.ps.observation.Set.validation.endTime.delay.too.short=Delay between start of set and end of pursing time (%1$s minutes) is too short (minimum of %2$s minutes). +observe.data.ps.observation.Set.validation.endTimeStamp.after.haulingEndTimeStamp=End time (%2$s) must be after end pursing time (%1$s). +observe.data.ps.observation.Set.validation.endTimeStamp.after.startTime=End time (%2$s) must be after start time (%1$s). +observe.data.ps.observation.Set.validation.endTimeStamp.delay.too.long=Delay of set (%1$s minutes) is too long (maximum of %2$s minutes). +observe.data.ps.observation.Set.validation.endTimeStamp.delay.too.short=Delay between start of set and end of pursing time (%1$s minutes) is too short (minimum of %2$s minutes). observe.data.ps.observation.Set.validation.haulingEndDate.after.currentPsObservationRoute.date=End pursing date (%2$s) must be after observation date (%1$s). observe.data.ps.observation.Set.validation.haulingEndTime.after.startTime=Pursing time (%2$s) must be after starting time (%1$s). +observe.data.ps.observation.Set.validation.haulingEndTimeStamp.after.startTime=End time (%2$s) must be after start time (%1$s). observe.data.ps.observation.Set.validation.haulingStartTimeStamp.after.startTime=Hauling start time (%2$s) must be after starting time (%1). observe.data.ps.observation.Set.validation.startTime.after.currentPsObservationActivity.time=Start time (%2$s) must be before end time (%1$s). observe.data.ps.observation.SetCatch.catches=Catches ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1488,8 +1488,13 @@ observe.data.ps.observation.Set.validation.endTime.after.haulingEndTime=La hora observe.data.ps.observation.Set.validation.endTime.after.startTime=End time (%2$s) must be after start time (%1$s). \#TODO observe.data.ps.observation.Set.validation.endTime.delay.too.long=La duración del lance (%1$s minutes) es elevada (máximo %2$s minutos). \#TODO observe.data.ps.observation.Set.validation.endTime.delay.too.short=La duración entre la hora final del lance y la de fin de recogida de la jareta debe (%1$s minutos) ser al menos de %1$s minutos. \#TODO +observe.data.ps.observation.Set.validation.endTimeStamp.after.haulingEndTimeStamp=La hora de fin (%2$s) debe ser superior o igual a la hora de fin de recogida de la jareta (%1$s). +observe.data.ps.observation.Set.validation.endTimeStamp.after.startTime=End time (%2$s) must be after start time (%1$s). \#TODO +observe.data.ps.observation.Set.validation.endTimeStamp.delay.too.long=La duración del lance (%1$s minutes) es elevada (máximo %2$s minutos). \#TODO +observe.data.ps.observation.Set.validation.endTimeStamp.delay.too.short=La duración entre la hora final del lance y la de fin de recogida de la jareta debe (%1$s minutos) ser al menos de %1$s minutos. \#TODO observe.data.ps.observation.Set.validation.haulingEndDate.after.currentPsObservationRoute.date=El día de final de recogida de la jareta (%2$s) debe ser superior o igual a la día de observación (%1$s). observe.data.ps.observation.Set.validation.haulingEndTime.after.startTime=La hora final de recogida de la jareta (%2$s) debe ser superior o igual a la hora de comienzo (%1$s). +observe.data.ps.observation.Set.validation.haulingEndTimeStamp.after.startTime=La hora final de recogida de la jareta (%2$s) debe ser superior o igual a la hora de comienzo (%1$s). observe.data.ps.observation.Set.validation.haulingStartTimeStamp.after.startTime=Hauling start time (%2$s) must be after starting time (%1$s). \#TODO observe.data.ps.observation.Set.validation.startTime.after.currentPsObservationActivity.time=La hora de inicio (%2$s) debe ser superior o igual a la hora de observación de la actividad (%1$s). observe.data.ps.observation.SetCatch.catches=Captura ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1488,8 +1488,13 @@ observe.data.ps.observation.Set.validation.endTime.after.haulingEndTime=L'heure observe.data.ps.observation.Set.validation.endTime.after.startTime=L'heure de fin (%2$s) doit être supérieure ou égal à l'heure de de début (%1$s). observe.data.ps.observation.Set.validation.endTime.delay.too.long=La durée de la calée (%1$s minutes) est trop longue (maximum de %2$s minutes). observe.data.ps.observation.Set.validation.endTime.delay.too.short=La durée entre l'heure de fin de calée et l'heure de fin de coulissage (%1$s minutes) est trop courte (minimum de %2$s minutes). +observe.data.ps.observation.Set.validation.endTimeStamp.after.haulingEndTimeStamp=L'heure de fin (%2$s) doit être supérieure ou égal à l'heure de fin de coulissage (%1$s). +observe.data.ps.observation.Set.validation.endTimeStamp.after.startTime=L'heure de fin (%2$s) doit être supérieure ou égal à l'heure de de début (%1$s). +observe.data.ps.observation.Set.validation.endTimeStamp.delay.too.long=La durée de la calée (%1$s minutes) est trop longue (maximum de %2$s minutes). +observe.data.ps.observation.Set.validation.endTimeStamp.delay.too.short=La durée entre l'heure de fin de calée et l'heure de fin de coulissage (%1$s minutes) est trop courte (minimum de %2$s minutes). observe.data.ps.observation.Set.validation.haulingEndDate.after.currentPsObservationRoute.date=La date de fin de coulissage (%2$s) doit être supérieure ou égal à la date du jour d'observation (%1$s). observe.data.ps.observation.Set.validation.haulingEndTime.after.startTime=L'heure de fin de coulissage (%2$s) doit être supérieure ou égal à l'heure de début (%1$s). +observe.data.ps.observation.Set.validation.haulingEndTimeStamp.after.startTime=L'heure de fin de coulissage (%2$s) doit être supérieure ou égal à l'heure de début (%1$s). observe.data.ps.observation.Set.validation.haulingStartTimeStamp.after.startTime=L'heure de début de virage (%2$s) doit être supérieure ou égal à celle de début (%1$s). observe.data.ps.observation.Set.validation.startTime.after.currentPsObservationActivity.time=L'heure de début (%2$s) doit être supérieure ou égal à l'heure d'observation de l'activité (%1$s). observe.data.ps.observation.SetCatch.catches=Captures ===================================== model/src/main/models/Observe/dto/attribute/timeAfter.properties ===================================== @@ -21,6 +21,4 @@ ### data.ll.logbook.Activity.attribute.endTimeStamp=startTime data.ps.logbook.SampleSpecies.attribute.endTime=startTime -data.ps.observation.Set.attribute.endTimeStamp=startTime,haulingEndTimeStamp:-45 -data.ps.observation.Set.attribute.haulingEndTimeStamp=startTime data.ps.observation.Set.attribute.startTime=currentPsObservationActivity.time ===================================== model/src/main/models/Observe/dto/attribute/timestampAfter.properties ===================================== @@ -26,4 +26,6 @@ data.ll.observation.Set.attribute.settingEndTimeStamp=!settingStartTimeStamp data.ll.observation.Tdr.attribute.deploymentEnd=!fishingEnd data.ll.observation.Tdr.attribute.fishingEnd=!fishingStart data.ll.observation.Tdr.attribute.fishingStart=!deploymentStart +data.ps.observation.Set.attribute.endTimeStamp=startTime,haulingEndTimeStamp:-45 +data.ps.observation.Set.attribute.haulingEndTimeStamp=startTime data.ps.observation.Set.attribute.haulingStartTimeStamp=startTime ===================================== model/src/main/models/Observe/dto/attribute/timeAfterWarning.properties → model/src/main/models/Observe/dto/attribute/timestampAfterWarning.properties ===================================== ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/validation/DtoFormValidatorTransformer.java ===================================== @@ -393,7 +393,7 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { " <message>%3$s##${startDate}##${endDate}</message>\n" + " </field-validator>\n"; private static final String TIME_AFTER_WITH_MIN_DELAY_FIELD_TEMPLATE = - " \n" + + " \n" + " <field-validator type=\"timeAfter\">\n" + " <param name=\"otherDateProperty\">%2$s</param>\n" + " <param name=\"minDelayInMinutes\">%4$s</param>\n" + @@ -409,7 +409,7 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { " <message>%3$s##${startDate}##${endDate}</message>\n" + " </field-validator>\n"; private static final String TIMESTAMP_AFTER_WITH_MIN_DELAY_FIELD_TEMPLATE = - " \n" + + " \n" + " <field-validator type=\"timestampAfter\">\n" + " <param name=\"otherDateProperty\">%2$s</param>\n" + " <param name=\"minDelayInMinutes\">%4$s</param>\n" + @@ -622,8 +622,8 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { Map<String, String> dayAfter = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getDayAfter(tagValuesStore, c, a)); Map<String, String> dayAfterWarning = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getDayAfterWarning(tagValuesStore, c, a)); Map<String, String> timeAfter = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getTimeAfter(tagValuesStore, c, a)); - Map<String, String> timeAfterWarning = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getTimeAfterWarning(tagValuesStore, c, a)); Map<String, String> timestampAfter = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getTimestampAfter(tagValuesStore, c, a)); + Map<String, String> timestampAfterWarning = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getTimestampAfterWarning(tagValuesStore, c, a)); List<String> mandatory = TemplateContract.getProperties(beanClass, attributes, (c, a) -> validationTagValues.isNotNull(tagValuesStore, c, a) && !"String".equals(GeneratorUtil.getSimpleName(a.getType()))); List<String> mandatoryString = TemplateContract.getProperties(beanClass, attributes, (c, a) -> validationTagValues.isNotNull(tagValuesStore, c, a) && "String".equals(GeneratorUtil.getSimpleName(a.getType()))); List<String> mandatoryCollection = TemplateContract.getProperties(beanClass, attributes, (c, a) -> validationTagValues.isNotNull(tagValuesStore, c, a) && GeneratorUtil.isNMultiplicity(a)); @@ -690,7 +690,7 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { return String.format(MANDATORY_IF_STRING_FIELD_TEMPLATE, f, value, i18n); }); - addTemporalValidators(dayBefore, dayAfter, dayAfterWarning, timeAfter, timeAfterWarning, timestampAfter); + addTemporalValidators(dayBefore, dayAfter, dayAfterWarning, timeAfter, timestampAfter, timestampAfterWarning); addErrorValidators(positiveNumber, POSITIVE_NUMBER_FIELD_TEMPLATE); addErrorValidators(strictlyPositiveNumber, STRICTLY_POSITIVE_NUMBER_FIELD_TEMPLATE); @@ -802,7 +802,7 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { addUserValidators(userValidators, dtoClazz); } - private void addTemporalValidators(Map<String, String> dayBefore, Map<String, String> dayAfter, Map<String, String> dayAfterWarning, Map<String, String> timeAfter, Map<String, String> timeAfterWarning, Map<String, String> timestampAfter) { + private void addTemporalValidators(Map<String, String> dayBefore, Map<String, String> dayAfter, Map<String, String> dayAfterWarning, Map<String, String> timeAfter, Map<String, String> timestampAfter, Map<String, String> timestampAfterWarning) { addErrorValidators(dayBefore, (f, v) -> { String values = (String) v; StringBuilder result = new StringBuilder(); @@ -923,10 +923,10 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { if (delay.startsWith("-")) { delay = delay.substring(1); template = TIMESTAMP_AFTER_WITH_MIN_DELAY_FIELD_TEMPLATE; - i18n2 = labelsBuilder.getI18nPropertyKey(dtoClazz, String.format("validation.%s.delay.too.long", f)); + i18n2 = labelsBuilder.getI18nPropertyKey(dtoClazz, String.format("validation.%s.delay.too.short", f)); } else { template = TIMESTAMP_AFTER_WITH_MAX_DELAY_FIELD_TEMPLATE; - i18n2 = labelsBuilder.getI18nPropertyKey(dtoClazz, String.format("validation.%s.delay.too.short", f)); + i18n2 = labelsBuilder.getI18nPropertyKey(dtoClazz, String.format("validation.%s.delay.too.long", f)); } value = value.substring(0, index); String i18n = labelsBuilder.getI18nPropertyKey(dtoClazz, String.format("validation.%s.after.%s", f, value)); @@ -948,7 +948,7 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { } return result.toString(); }); - addWarningValidators(timeAfterWarning, (f, v) -> { + addWarningValidators(timestampAfterWarning, (f, v) -> { String values = (String) v; StringBuilder result = new StringBuilder(); for (String value : values.split("\\s*,\\s*")) { @@ -960,11 +960,11 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { String i18n2; if (delay.startsWith("-")) { delay = delay.substring(1); - template = TIME_AFTER_WITH_MIN_DELAY_FIELD_TEMPLATE; + template = TIMESTAMP_AFTER_WITH_MIN_DELAY_FIELD_TEMPLATE; i18n2 = labelsBuilder.getI18nPropertyKey(dtoClazz, String.format("validation.%s.delay.too.short", f)); } else { i18n2 = labelsBuilder.getI18nPropertyKey(dtoClazz, String.format("validation.%s.delay.too.long", f)); - template = TIME_AFTER_WITH_MAX_DELAY_FIELD_TEMPLATE; + template = TIMESTAMP_AFTER_WITH_MAX_DELAY_FIELD_TEMPLATE; } value = value.substring(0, index); String i18n = labelsBuilder.getI18nPropertyKey(dtoClazz, String.format("validation.%s.after.%s", f, value)); @@ -976,7 +976,7 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { } } return result.toString(); - }, timeFunction); + }); } private void addBoundTemperature(Map<String, String> boundTemperature) { ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/validation/ValidationTagValues.java ===================================== @@ -269,8 +269,8 @@ public class ValidationTagValues extends DefaultTagValueMetadatasProvider { public String getTimeAfter(ObjectModelTagValuesStore store, ObjectModelClass clazz, ObjectModelAttribute attribute) { return store.findAttributeTagValue(Store.timeAfter, clazz, attribute); } - public String getTimeAfterWarning(ObjectModelTagValuesStore store, ObjectModelClass clazz, ObjectModelAttribute attribute) { - return store.findAttributeTagValue(Store.timeAfterWarning, clazz, attribute); + public String getTimestampAfterWarning(ObjectModelTagValuesStore store, ObjectModelClass clazz, ObjectModelAttribute attribute) { + return store.findAttributeTagValue(Store.timestampAfterWarning, clazz, attribute); } public String getTimestampAfter(ObjectModelTagValuesStore store, ObjectModelClass clazz, ObjectModelAttribute attribute) { @@ -343,7 +343,7 @@ public class ValidationTagValues extends DefaultTagValueMetadatasProvider { dayAfterWarning("Pour qualifier un attribut date avec validation warning", String.class, null, ObjectModelAttribute.class), dayBefore("Pour qualifier un attribut date avec validation", String.class, null, ObjectModelAttribute.class), timeAfter("Pour qualifier un attribut time avec validation", String.class, null, ObjectModelAttribute.class), - timeAfterWarning("Pour qualifier un attribut time avec validation warning", String.class, null, ObjectModelAttribute.class), + timestampAfterWarning("Pour qualifier un attribut time avec validation warning", String.class, null, ObjectModelAttribute.class), timestampAfter("Pour qualifier un attribut timestamp avec validation", String.class, null, ObjectModelAttribute.class), notNullIf("Pour qualifier un attribut non null avec une condition pour ne pas traiter la validation", boolean.class, null, ObjectModelAttribute.class), unique("Pour qualifier un attribut qui doit être unique", boolean.class, null, ObjectModelAttribute.class), View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d2703ffc05f261b886bf3a8d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d2703ffc05f261b886bf3a8d… You're receiving this email because of your account on gitlab.com.

1 0