Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d891446e by Tony Chemit at 2023-11-26T14:21:39+01:00 Add a new hook when loading a dto for from and validation (we will use it in Validation interceptor to load on dto some properties used for validation) - - - - - 72f5ad23 by Tony Chemit at 2023-11-26T14:25:53+01:00 Add new entity method Activity.isCoordinateRequired to compute this value - - - - - 7a3f463d by Tony Chemit at 2023-11-26T14:25:53+01:00 Add new dto method Activity.isCoordinateRequired to get value computed on entity - - - - - 11207afb by Tony Chemit at 2023-11-26T14:25:53+01:00 use new spi method loadDtoFtoValidation on Activity to load route date and coordinateRequired - - - - - 6814846e by Tony Chemit at 2023-11-26T14:25:53+01:00 Add validation rule on ActivityDto coordinates (not null except if !coordinateRequired) - - - - - 1c40214e by Tony Chemit at 2023-11-26T14:29:45+01:00 Merge branch 'feature/issue-2663' into develop Contrôle de validation position si opération sur objet != perte/fin transmission/fin balise - Closes #2663 - - - - - 30 changed files: - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityDto.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-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/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/SetSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.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/localmarket/SurveySpi.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/logbook/ActivitySpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json - model/src/main/models/Observe/dto/21-data-ps-logbook.model - model/src/main/models/Observe/dto/attribute/notNullIf.properties - model/src/main/models/Observe/persistence/21-data-ps-logbook.model - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update.json - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/ContainerDtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/EditableDtoEntityContext.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/16bd168ad28e5510fbab75982... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/16bd168ad28e5510fbab75982... You're receiving this email because of your account on gitlab.com.