Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8aff39ac by Tony Chemit at 2023-07-22T16:34:58+02:00 Ajout des champs observation et logbook sur ps_common.VesselActivity et ll_common.VesselActivity - - - - - f4e7d206 by Tony Chemit at 2023-07-22T16:34:58+02:00 Mise à jour de la migration - - - - - 129d5c85 by Tony Chemit at 2023-07-22T16:34:58+02:00 Mise à jour des formulaires des référentiels VesselActivity - - - - - c9be69cb by Tony Chemit at 2023-07-22T16:34:58+02:00 Utilisation des nouveaux filtres dans les formulaires d'activités - - - - - 05182233 by Tony Chemit at 2023-07-22T16:44:33+02:00 Mise à jour de la documentation de l'API publique - - - - - 6ba35dbb by Tony Chemit at 2023-07-22T16:56:48+02:00 Merge branch 'feature/issue_2498' into develop Filtrage des types d'activité bateau pour les données observation et logbooks PS et LL - Closes #2498 - - - - - 30 changed files: - 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/ActivityUIModelStates.java - + client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/referential/common/VesselActivityUI.jaxx - 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/logbook/ActivityUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/VesselActivityUI.jaxx - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.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/referential/ll/common/VesselActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ll/common/VesselActivityDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/VesselActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/VesselActivityDto-update-error-validation.xml - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.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/fr/ird/observe/entities/referential/ll/common/VesselActivityImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/ps/common/VesselActivityImpl.hbm.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/06_01_issue-2498-ps-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/06_02_issue-2498-ll-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/empty-schema-H2.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.2/empty-schema-PG.sql - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/VesselActivity/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/VesselActivity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ll/common/VesselActivity/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/ps/common/VesselActivity/definition.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/78479d52e8c05cf3c6157f5c5... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/78479d52e8c05cf3c6157f5c5... You're receiving this email because of your account on gitlab.com.