Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 51de4e12 by Tony Chemit at 2024-04-26T17:42:45+02:00 Ajout des deux nouveaux drapeaux sur le référentiel VesselType (longline et seine) - - - - - 7a5943e0 by Tony Chemit at 2024-04-26T17:42:45+02:00 Ajout de la migration - - - - - f854d709 by Tony Chemit at 2024-04-26T17:42:45+02:00 Utilisation des nouveaux drapeaux pour filtrer les navire dans les formulaires marée - - - - - 3c9d72f4 by Tony Chemit at 2024-04-26T17:42:45+02:00 Suppression des options de configuration dédiées aux filtre des navires pour les formulaires marée - - - - - 7541a511 by Tony Chemit at 2024-04-26T17:43:12+02:00 Utilisation des nouveaux drapeaux pour filtrer les navire dans l'arbre de navigation - - - - - 463453dd by Tony Chemit at 2024-04-26T17:46:18+02:00 Merge branch 'feature/issue-2869' into develop En mode classement par bateau, il est possible de créer une marée PS avec un bateau LL, de plus avec un bateau désactivé - Closes #2869 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/VesselTypeUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - 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/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/VesselTypeDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/VesselTypeDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/VesselTypeDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/VesselTypeDto-update-warning-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/data/ll/common/TripImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/common/TripImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/common/VesselTypeImpl.hbm.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.3/03_issue-2869-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.3/empty-schema-H2.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.3/empty-schema-PG.sql - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/common/VesselType/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/common/VesselType/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/common/VesselType/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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/55bb8fceaf3b58673eeb6fb94... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/55bb8fceaf3b58673eeb6fb94... You're receiving this email because of your account on gitlab.com.