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

[Git][ultreiaio/ird-observe][develop-9.0.x] update pom
by Tony CHEMIT (＠tchemit) 18 Jan '23

18 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 22dd35bc by Tony Chemit at 2023-01-18T14:30:07+01:00 update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.3</version> + <version>2023.4</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/22dd35bcabc32c2bd43d3c4d8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/22dd35bcabc32c2bd43d3c4d8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Revue du remplissage de activity.setCount - Closes #2610
by Tony CHEMIT (＠tchemit) 18 Jan '23

18 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 9aa60a6d by Tony Chemit at 2023-01-18T14:06:47+01:00 Revue du remplissage de activity.setCount - Closes #2610 - - - - - 1 changed file: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java ===================================== @@ -226,32 +226,38 @@ public class ActivityReader extends DataReader<Activity> { // 11 - V_TMER on route // 12 - V_TPEC on route String vesselActivityCode = resultSet.getString(13); + Object setCountObject = resultSet.getObject(14); + Integer setCount = setCountObject == null ? null : ((Number) setCountObject).intValue(); switch (vesselActivityCode) { case "0": // SetSuccessStatus=0 + ReasonForNullSet=0 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091) entity.setSetSuccessStatus(dataContext.getSetSuccessStatus0()); entity.setReasonForNullSet(dataContext.getReasonForNullSet0()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 + entity.setSetCount(setCount); break; case "1": // SetSuccessStatus=1 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091) entity.setSetSuccessStatus(dataContext.getSetSuccessStatus1()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 + entity.setSetCount(setCount); break; case "2": // SetSuccessStatus=2 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091) entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 + entity.setSetCount(setCount); break; case "14": // (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2429) // SetSuccessStatus=2 entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2()); // Add Observed system 110 entity.addObservedSystem(dataContext.getObservedSystem110()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 + entity.setSetCount(setCount); break; } entity.setVesselActivity(dataContext.getVesselActivity(vesselActivityCode)); - Object setCount = resultSet.getObject(14); - if (setCount != null) { - entity.setSetCount(((Number) setCount).intValue()); - } String schoolTypeCode = resultSet.getString(15); entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode)); Object fDonOrg = resultSet.getObject(16); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9aa60a6d950fbda5002383f44… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9aa60a6d950fbda5002383f44… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Revue du remplissage de activity.setCount - Closes #2610
by Tony CHEMIT (＠tchemit) 18 Jan '23

18 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4082c852 by Tony Chemit at 2023-01-18T14:07:54+01:00 Revue du remplissage de activity.setCount - Closes #2610 - - - - - 1 changed file: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java ===================================== @@ -226,32 +226,38 @@ public class ActivityReader extends DataReader<Activity> { // 11 - V_TMER on route // 12 - V_TPEC on route String vesselActivityCode = resultSet.getString(13); + Object setCountObject = resultSet.getObject(14); + Integer setCount = setCountObject == null ? null : ((Number) setCountObject).intValue(); switch (vesselActivityCode) { case "0": // SetSuccessStatus=0 + ReasonForNullSet=0 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091) entity.setSetSuccessStatus(dataContext.getSetSuccessStatus0()); entity.setReasonForNullSet(dataContext.getReasonForNullSet0()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 + entity.setSetCount(setCount); break; case "1": // SetSuccessStatus=1 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091) entity.setSetSuccessStatus(dataContext.getSetSuccessStatus1()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 + entity.setSetCount(setCount); break; case "2": // SetSuccessStatus=2 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091) entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 + entity.setSetCount(setCount); break; case "14": // (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2429) // SetSuccessStatus=2 entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2()); // Add Observed system 110 entity.addObservedSystem(dataContext.getObservedSystem110()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 + entity.setSetCount(setCount); break; } entity.setVesselActivity(dataContext.getVesselActivity(vesselActivityCode)); - Object setCount = resultSet.getObject(14); - if (setCount != null) { - entity.setSetCount(((Number) setCount).intValue()); - } String schoolTypeCode = resultSet.getString(15); entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode)); Object fDonOrg = resultSet.getObject(16); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4082c852e03a717741231e275… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4082c852e03a717741231e275… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.24 [skip CI]
by Tony CHEMIT (＠tchemit) 15 Jan '23

15 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b2c06e2e by Tony Chemit at 2023-01-15T20:18:23+01:00 Update changelog for v.9.0.24 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,11 +1,26 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-01-05 13:38. + * Last generated at 2023-01-15 20:16. + +## Version [9.0.24](https://gitlab.com/ultreiaio/ird-observe/-/milestones/254) + +**Closed at 2023-01-15.** + +### Download +* [Client (observe-9.0.24-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.24.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.24-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2573]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2573) **Revoir le calcul et la mise à jour du type de banc de la calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2457]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2457) **La création d'un objet sur une activité n'ajoute pas le système observé 20/FOB comme attendu** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Tâche 2499]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2499) **Interrogations sur la localisation de certaines tables de ps_common** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Tâche 2596]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2596) **Réduire la taille du livrable server-zip** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.0.23](https://gitlab.com/ultreiaio/ird-observe/-/milestones/253) -**Closed at 2023-01-04.** +**Closed at 2023-01-05.** ### Download * [Client (observe-9.0.23-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b2c06e2e552d79e125a169fe1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b2c06e2e552d79e125a169fe1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Update changelog for v.9.0.24 [skip CI]
by Tony CHEMIT (＠tchemit) 15 Jan '23

15 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 6ad021c0 by Tony Chemit at 2023-01-15T20:18:08+01:00 Update changelog for v.9.0.24 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,11 +1,26 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-01-05 13:38. + * Last generated at 2023-01-15 20:16. + +## Version [9.0.24](https://gitlab.com/ultreiaio/ird-observe/-/milestones/254) + +**Closed at 2023-01-15.** + +### Download +* [Client (observe-9.0.24-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.24.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.24-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2573]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2573) **Revoir le calcul et la mise à jour du type de banc de la calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2457]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2457) **La création d'un objet sur une activité n'ajoute pas le système observé 20/FOB comme attendu** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Tâche 2499]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2499) **Interrogations sur la localisation de certaines tables de ps_common** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Tâche 2596]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2596) **Réduire la taille du livrable server-zip** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.0.23](https://gitlab.com/ultreiaio/ird-observe/-/milestones/253) -**Closed at 2023-01-04.** +**Closed at 2023-01-05.** ### Download * [Client (observe-9.0.23-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6ad021c0f957244495172a458… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6ad021c0f957244495172a458… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Update changelog for v.9.0.23 [skip CI]
by Tony CHEMIT (＠tchemit) 15 Jan '23

15 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: f13606a1 by Tony Chemit at 2023-01-15T20:17:36+01:00 Update changelog for v.9.0.23 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,11 +1,26 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-01-05 13:38. + * Last generated at 2023-01-15 20:16. + +## Version [9.0.24](https://gitlab.com/ultreiaio/ird-observe/-/milestones/254) + +**Closed at 2023-01-15.** + +### Download +* [Client (observe-9.0.24-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.24.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.24-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2573]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2573) **Revoir le calcul et la mise à jour du type de banc de la calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2457]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2457) **La création d'un objet sur une activité n'ajoute pas le système observé 20/FOB comme attendu** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Tâche 2499]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2499) **Interrogations sur la localisation de certaines tables de ps_common** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Tâche 2596]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2596) **Réduire la taille du livrable server-zip** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.0.23](https://gitlab.com/ultreiaio/ird-observe/-/milestones/253) -**Closed at 2023-01-04.** +**Closed at 2023-01-05.** ### Download * [Client (observe-9.0.23-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f13606a102cce01003c3ed2d0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f13606a102cce01003c3ed2d0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Model - Rename in model + Fixtures
by Tony CHEMIT (＠tchemit) 15 Jan '23

15 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f02ec760 by Tony Chemit at 2023-01-15T18:30:50+01:00 Model - Rename in model + Fixtures - - - - - 9b2fa1e9 by Tony Chemit at 2023-01-15T18:34:53+01:00 Api-Dto - Rename in model + Fixtures - - - - - f47928f9 by Tony Chemit at 2023-01-15T18:35:21+01:00 Core - Persistence - Rename in model + Fixtures - - - - - 36a345ee by Tony Chemit at 2023-01-15T18:35:31+01:00 Core - Services - Rename in model + Fixtures - - - - - 9da00c60 by Tony Chemit at 2023-01-15T18:35:43+01:00 Server - Rename in model + Fixtures - - - - - 40a40d26 by Tony Chemit at 2023-01-15T18:35:53+01:00 Client UI - Rename in model + Fixtures - - - - - 261ad6a2 by Tony Chemit at 2023-01-15T18:36:20+01:00 Merge branch 'feature/issue_2465' into develop Renommer l'entité common.LengtMeasureMethod en common.SizeMeasureMethod - Closes #2435 - - - - - 30 changed files: - client/datasource/editor/common/src/main/i18n/getters/navigation.getter - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthMeasureMethodUI.jaxx → client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/SizeMeasureMethodUI.jaxx - client/datasource/editor/common/src/main/resources/fr/ird/observe/client/datasource/editor/common/referential/common/ReferentialHomeUINavigationNode.scope - client/datasource/editor/common/src/main/resources/fr/ird/observe/client/datasource/editor/common/referential/common/LengthMeasureMethodUINavigationNode.scope → client/datasource/editor/common/src/main/resources/fr/ird/observe/client/datasource/editor/common/referential/common/SizeMeasureMethodUINavigationNode.scope - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIModelStates.java - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchReleaseUI.jaxx - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/common/LengthMeasureMethodDtoDecoratorDefinition.java → core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/common/SizeMeasureMethodDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/common/LengthMeasureMethodReferenceDecoratorDefinition.java → core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/common/SizeMeasureMethodReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/java/fr/ird/observe/dto/ObserveI18nLabelsBuilder.java - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsLl.java - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json - core/api/tree/src/test/resources/navigationTree.json - 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/resources/fr/ird/observe/dto/data/ll/logbook/SamplePartDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SamplePartDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SamplePartDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SamplePartDto-update-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-create-warning-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/52684633f9cd1583076042b8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/52684633f9cd1583076042b8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Migration - Add new vessel activity 36
by Tony CHEMIT (＠tchemit) 15 Jan '23

15 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d5e54112 by Tony Chemit at 2023-01-15T13:59:09+01:00 Migration - Add new vessel activity 36 - - - - - 10efebdb by Tony Chemit at 2023-01-15T14:21:58+01:00 Tests - Update some fixtures - - - - - e01e43fb by Tony Chemit at 2023-01-15T14:26:41+01:00 Avdth - Use new vessel activity 36 in referential mapping - - - - - e6051d82 by Tony Chemit at 2023-01-15T14:27:19+01:00 Avdth - Update migration documentation - - - - - 52684633 by Tony Chemit at 2023-01-15T14:47:22+01:00 Merge branch 'feature/issue_2600' into develop Nouvelle référence 'Refueling' - Closes #2600 - - - - - 7 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_1.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/05_add_referential_ps_common_VesselActivity_36-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/05_add_referential_ps_common_VesselActivity_finalize-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - model/src/main/resources/fixtures/global.properties - src/site/markdown/avdth/referential.md Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java ===================================== @@ -83,8 +83,8 @@ public class VesselActivityInterceptor extends ReferentialInterceptor<VesselActi .put("19", "29") .put("20", "30") .put("35", "31") - //FIXME - .put("36", "99") + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2600 + .put("36", "36") // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2568 .put("40", "13") .put("41", "13") ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_1.java ===================================== @@ -36,10 +36,13 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.Date; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; +import java.util.stream.Stream; /** * Created on 14/09/2022. @@ -270,6 +273,24 @@ public class DataSourceMigrationForVersion_9_1 extends ByMajorMigrationVersionRe // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2546 executor.addScript("03", "fix_sql_types_issue_2546"); executor.addScript("04", "drop_ll_common_weightDeterminationMethod"); + + if (withIds) { + addVesselActivity36(executor); + } + } + + private void addVesselActivity36(MigrationVersionResourceExecutor executor) { + Set<String> existingCodes = executor.findMultipleResultAstSet(SqlQuery.wrap("SELECT CODE FROM ps_common.VesselActivity", resultSet -> resultSet.getString(1))); + Set<String> newCodes = new LinkedHashSet<>(); + Stream.of("36").forEach(code -> { + if (!existingCodes.contains(code)) { + executor.addScript("05", "add_referential_ps_common_VesselActivity_" + code); + newCodes.add(code); + } + }); + if (!newCodes.isEmpty()) { + executor.addScript("05", "add_referential_ps_common_VesselActivity_finalize"); + } } private Map<String, List<WellPlanStructure>> splitByTrip(List<WellPlanStructure> existingWellPlan) { ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/05_add_referential_ps_common_VesselActivity_36-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 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% +--- +INSERT INTO ps_common.vesselActivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, allowFad) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}36', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '36', null, null, FALSE, 1, 'Refueling', 'Ravitaillement en carburant', 'Refueling TODO', null, null, null, null, null, FALSE); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/05_add_referential_ps_common_VesselActivity_finalize-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 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% +--- +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.common.VesselActivity'; ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -89,7 +89,7 @@ ps_common.speciesFate=15 ps_common.transmittingBuoyOperation=5 ps_common.transmittingBuoyOwnership=5 ps_common.transmittingBuoyType=62 -ps_common.vesselActivity=36 +ps_common.vesselActivity=37 ps_common.weightCategory=137 ps_landing.destination=28 ps_landing.fate=2 ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4093 +REFERENTIAL_COUNT=4094 ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -251,7 +251,7 @@ Mapping type d'activité | 19 | 29 | | 20 | 30 | | 35 | 31 | -| 36 | 99 **FIXME** | +| 36 | 36 | 1. **Seule une activité de code 6 permet la création de captures**. 2. **Seule une activité de code 13 permet la création de DCP**.. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ab143805e7a4e20066da0aab… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ab143805e7a4e20066da0aab… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 14 commits: Model - Remove table from model + update some fixtures
by Tony CHEMIT (＠tchemit) 15 Jan '23

15 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 55cd52df by Tony Chemit at 2023-01-15T13:24:30+01:00 Model - Remove table from model + update some fixtures - - - - - 26959205 by Tony Chemit at 2023-01-15T13:24:30+01:00 Persistence - Remove from persistence - - - - - 66bbfe5e by Tony Chemit at 2023-01-15T13:24:30+01:00 Decoration - Remove decorations - - - - - a87acd3b by Tony Chemit at 2023-01-15T13:24:31+01:00 Migration - Adapt migration to remove table - - - - - fe181320 by Tony Chemit at 2023-01-15T13:24:31+01:00 Service - Update DifferentialMetaModel - - - - - 12a17a29 by Tony Chemit at 2023-01-15T13:24:31+01:00 Api tree - Update navigation models + fixtures - - - - - 9c6091c5 by Tony Chemit at 2023-01-15T13:24:32+01:00 Validation - Update validations + fixtures - - - - - dac757d1 by Tony Chemit at 2023-01-15T13:24:32+01:00 Services tests - Update fixtures - - - - - 7a44a08c by Tony Chemit at 2023-01-15T13:24:33+01:00 Persistence tests - Update fixtures - - - - - 12ca1f5f by Tony Chemit at 2023-01-15T13:24:34+01:00 I18n - Remove some translations - - - - - 3769270c by Tony Chemit at 2023-01-15T13:24:34+01:00 Server - Update mapping - - - - - 68da9443 by Tony Chemit at 2023-01-15T13:24:35+01:00 Server - Update public API doc - - - - - a870bd6b by Tony Chemit at 2023-01-15T13:24:36+01:00 Client UI - Remove UI and update scopes - - - - - ab143805 by Tony Chemit at 2023-01-15T13:25:20+01:00 Merge branch 'feature/issue_2602_2' into develop Table ll_common.weightdeterminationmethod inutile ? - Closes #2602 - - - - - 30 changed files: - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - − client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/referential/common/WeightDeterminationMethodUI.jaxx - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/referential/common/ReferentialHomeUINavigationNode.scope - − client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/referential/common/WeightDeterminationMethodUINavigationNode.scope - core/api/dto-decoration/src/main/i18n/getters/labels.getter - − core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/ll/common/WeightDeterminationMethodDtoDecoratorDefinition.java - − core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/ll/common/WeightDeterminationMethodReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json - core/api/tree/src/test/resources/fixtures/api-tree.properties - core/api/tree/src/test/resources/navigationTree.json - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - − core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/WeightDeterminationMethodDto-create-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/WeightDeterminationMethodDto-create-warning-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/WeightDeterminationMethodDto-update-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/WeightDeterminationMethodDto-update-warning-validation.xml - core/api/validation/src/test/resources/fixtures/api-validation.properties - core/api/validation/src/test/resources/fixtures/validation/bean-validator-detector-n1-create.list - core/api/validation/src/test/resources/fixtures/validation/bean-validator-detector-n1-update.list - − core/persistence/decoration/src/main/java/fr/ird/observe/entities/referential/ll/common/WeightDeterminationMethodDecoratorDefinition.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/ToolkitEntitySqlScriptModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlDeletePlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlScriptModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlUsageModel.json - − core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/ll/common/WeightDeterminationMethodImpl.hbm.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b35facbb3bacb6bb8815a85e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b35facbb3bacb6bb8815a85e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: Persistence - Introduce Maven module core-persistence-migration
by Tony CHEMIT (＠tchemit) 15 Jan '23

15 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4c95b8f5 by Tony Chemit at 2023-01-15T13:23:28+01:00 Persistence - Introduce Maven module core-persistence-migration - - - - - 599ba3fc by Tony Chemit at 2023-01-15T13:23:29+01:00 Auto-trim on validation tests - - - - - 96da2af1 by Tony Chemit at 2023-01-15T13:23:29+01:00 Documentation de l'outil de reporting - Closes #2597 - - - - - 3bf3bb85 by Tony Chemit at 2023-01-15T13:23:30+01:00 Report API - Remove no more used operation GroupByLength - - - - - 3cb85dff by Tony Chemit at 2023-01-15T13:23:31+01:00 Report API - Replace operation SumFloatColumn by SumColumn and remove it - - - - - 5955bb5d by Tony Chemit at 2023-01-15T13:23:31+01:00 update pom - - - - - 93f7be99 by Tony Chemit at 2023-01-15T13:23:31+01:00 With launch4J 2.3.0 set disableVersionInfoDefaults since it won't work for RC-x project.version - - - - - b35facbb by Tony Chemit at 2023-01-15T13:23:32+01:00 Revoir le calcul et la mise à jour du type de banc de la calée - Closes #2573 - - - - - 30 changed files: - client/runner/pom.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.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/logbook/ActivityImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivityImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java - core/persistence/resources/.mvn/add-auto-service → core/persistence/migration/.mvn/add-auto-service - core/persistence/resources/.mvn/need-tck-archive → core/persistence/migration/.mvn/need-tck-archive - + core/persistence/migration/.mvn/pom.gitflow.develop - + core/persistence/migration/.mvn/pom.gitflow.master - + core/persistence/migration/.mvn/pom.organizationId - + core/persistence/migration/.mvn/pom.projectId - + core/persistence/migration/.mvn/pom.stageId - + core/persistence/migration/LICENSE.txt - + core/persistence/migration/README.md - + core/persistence/migration/pom.xml - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_1.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_1.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_10.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_10.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_11.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_11.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_12.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_12.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_14.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_14.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_15.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_15.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_16.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_16.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_5.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_5.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_7.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_7.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_8.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_8.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_9.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v3/DataSourceMigrationForVersion_3_9.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v4/DataSourceMigrationForVersion_4_0.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v4/DataSourceMigrationForVersion_4_0.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v4/DataSourceMigrationForVersion_4_0_1.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v4/DataSourceMigrationForVersion_4_0_1.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v4/DataSourceMigrationForVersion_4_0_2.java → core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v4/DataSourceMigrationForVersion_4_0_2.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3728b25946f8f78f36780adf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3728b25946f8f78f36780adf… You're receiving this email because of your account on gitlab.com.

1 0