Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 24f2233f by Tony Chemit at 2022-11-09T12:16:57+01:00 I18n - Review min - max Weight labels - - - - - b547530c by Tony Chemit at 2022-11-09T12:17:07+01:00 Sql comment - Review howto write them in pure sql statements. - - - - - 07ff9393 by Tony Chemit at 2022-11-09T12:17:42+01:00 Dans l'import AVDTH, les longitudes extrêmes >90° ou >100° semblent mal gérées - Closes #2510 - - - - - 34339867 by Tony Chemit at 2022-11-09T12:17:50+01:00 Pas mal de positions géographiques sont mises à NULL/NULL par l'importeur AVDTH - Closes #2511 - - - - - 4d925357 by Tony Chemit at 2022-11-09T13:47:04+01:00 Persistence migration - Catch.speciesFate has already done via the Replay migration Persistence migration - replay migration Persistence migration - Add ps_common.SpeciesFate 15, update the 6 one Persistence migration - Fix ps_observation.InformationSource label (double quote instead of simple one) Model (Dto and persistence and migration) - add ps_observation.Catch.speciesFate not null and weightRangeAllowed - See ultreiaio/ird-observe#2515 Model (Dto and persistence) - add ps_observation.Catch (minWeight and maxWeight) - See ultreiaio/ird-observe#2515 - - - - - 4a746cdf by Tony Chemit at 2022-11-09T13:47:04+01:00 Model (Dto) - modify ps_observation.Catch unique key (up to 10 fields) Validation - update ps_observation.Catch validation See ultreiaio/ird-observe#2515 - - - - - 427a1b42 by Tony Chemit at 2022-11-09T13:47:04+01:00 Validation - Add ps_common.SpeciesFate weightRangeAllowed field - - - - - 13772da2 by Tony Chemit at 2022-11-09T13:47:04+01:00 I18n - Update with new fields (Catch and Species Fate) - - - - - 11f54670 by Tony Chemit at 2022-11-09T13:47:04+01:00 Tests - Update fixtures - - - - - 27603ce9 by Tony Chemit at 2022-11-09T13:47:04+01:00 GUI Referential - Add ps_common.SpeciesFate weightRangeAllowed field - - - - - d75a77d5 by Tony Chemit at 2022-11-09T13:47:04+01:00 GUI Data - Adapt SetCatchUI - - - - - 68bf33c0 by Tony Chemit at 2022-11-09T13:47:38+01:00 Merge branch 'feature/issue_2515' into develop Closes #2515 - - - - - 30 changed files: - 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/SpeciesUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/SpeciesFateUI.jaxx - core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveI18nLabelsBuilder.java - core/api/dto/src/main/resources/META-INF/dto/Observe/DifferentialMetaModel.json - core/api/services/src/main/i18n/getters/labels.getter - core/api/services/src/main/java/fr/ird/observe/dto/data/ps/observation/SetCatchDtoCatchesCollectionUniqueKeyValidator.java - core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties - 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/ps/observation/CatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetCatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetCatchDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/SpeciesFateDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/SpeciesFateDto-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/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripReplicatePartialRequestCallback.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/observation/ObservationReplicateRequestCallback.java - 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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5d7b7f624b1f9ca3aefa6de62... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5d7b7f624b1f9ca3aefa6de62... You're receiving this email because of your account on gitlab.com.