Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 12735f90 by Tony Chemit at 2023-07-21T10:58:39+02:00 Ajout du champs Trip.activitiesAcquisitionMode - - - - - 644ea7de by Tony Chemit at 2023-07-21T10:58:39+02:00 Migration classique - - - - - a030ca2d by Tony Chemit at 2023-07-21T10:58:39+02:00 Migration avdth - - - - - 71b894e1 by Tony Chemit at 2023-07-21T10:58:39+02:00 Mise en place du champs sur le formulaire marée Ajout de la valeur par défaut lors de la création d'une nouvelle marée au niveau du service - - - - - e76fb6f7 by Tony Chemit at 2023-07-21T10:58:51+02:00 Mise en place du formulaire activité et modification de la sauvegarde au niveau du service pour réordonner si nécessaire le Activity.number - - - - - e41483a3 by Tony Chemit at 2023-07-21T10:59:41+02:00 Merge branch 'feature/issue_2729' into develop En PS / logbook / Activité, voir comment mieux gérer l'ajout d'une activité dont l'horaire précéde celui de la dernière activité saisie (souci lié au numéro d'activité auto incrémenté) - Closes #2729 - - - - - 30 changed files: - 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/common/TripUI.jaxx - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/TimeAndNumberAware.java → client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-validation/src/main/i18n/getters/java.getter - − core/api/dto-validation/src/main/java/fr/ird/observe/dto/validation/validators/data/ps/logbook/ActivityCheckTime.java - core/api/dto-validation/src/main/resources/validators.xml - core/api/dto/src/main/i18n/getters/java-enumeration.getter - core/api/dto-validation/src/main/java/fr/ird/observe/dto/validation/validators/data/ps/logbook/RouteCheckActivityTime.java → core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/ActivitiesAcquisitionMode.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityStubDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/RouteDto.java - core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/common/TripService.java - 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/data/ps/common/TripDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/common/TripDto-update-error-validation.xml - 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/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/RouteDto-update-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-update-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/RouteDto-update-error-validation.xml - core/persistence/avdth/pom.xml - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/47a6d41546a0cf875494b612a... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/47a6d41546a0cf875494b612a... You're receiving this email because of your account on gitlab.com.