Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0669b44e by Tony Chemit at 2024-01-22T13:03:41+01:00 [services-test] Update validation fixture - See #2044 - - - - - 97485af4 by Tony Chemit at 2024-01-22T13:03:41+01:00 [persistence] Add new queries to get activities for pairing action - - - - - f530c6ae by Tony Chemit at 2024-01-22T13:03:41+01:00 [api-dto] Rethink activities pairing code (to used new pairing dto instead of massive calls to services which is very slow...) - - - - - e24c18bb by Tony Chemit at 2024-01-22T13:03:41+01:00 [api-persistence] Adapt code to fill activities pairing code - - - - - a7a45c93 by Tony Chemit at 2024-01-22T13:03:41+01:00 [api-services] Get new dto for activities pairing actions (and remove previous code with PairingContext which is replace by PairingEngine) - - - - - 9487fa2d by Tony Chemit at 2024-01-22T13:03:41+01:00 [server] Update mapping - - - - - cbd1153c by Tony Chemit at 2024-01-22T13:03:41+01:00 [client-actions] Use new Activities pairing API - - - - - c04088c6 by Tony Chemit at 2024-01-22T13:03:41+01:00 [client-editor] Use new Activities pairing API and review to states code - - - - - 871892a7 by Tony Chemit at 2024-01-22T13:21:12+01:00 Merge branch 'feature/issue-2830' into develop Amélioration des performances de l'assistant Apparairement d'activités - Closes #2830 - - - - - e9aabe0f by Tony Chemit at 2024-01-22T14:50:07+01:00 Rendre le fichier de définition des rapports multilingue - Closes #2599 - - - - - 30 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/RootNodeBuilder.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ps/RootNodeBuilder.java - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIModelStates.java - 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/src/main/java/fr/ird/observe/dto/data/ll/pairing/ActivityPairingDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/TripPairingContext.java → core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/ActivityPairingEngine.java - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/TriActivitiesPairingEngine.java - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/TripActivitiesPairingDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/TripPairingResult.java → core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/TripActivitiesPairingResult.java - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/RoutePairingDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/RoutePairingContext.java → core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/RoutePairingEngine.java - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/TripActivitiesPairingDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/RoutePairingContextRequest.java → core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/TripActivitiesPairingEngine.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/TripPairingResult.java → core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/TripActivitiesPairingResult.java - − core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/TripPairingContext.java - core/api/services/src/main/java/fr/ird/observe/services/service/data/ll/ActivityPairingService.java - core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/ActivityPairingService.java - core/persistence/java/src/main/java/fr/ird/observe/entities/Entities.java - 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/common/TripTopiaDao.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/logbook/RouteSpi.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/RouteTopiaDao.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/RouteTopiaDao.java - 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/logbook/RouteImpl.hbm.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bfd20961f823c41ba21982e24... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bfd20961f823c41ba21982e24... You're receiving this email because of your account on gitlab.com.