Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: 90e393c7 by Tony Chemit at 2023-03-12T14:43:23+01:00 Consolidation - amélioration API - - - - - 8e7d4709 by Tony Chemit at 2023-03-12T14:43:23+01:00 Consolidation - amélioration API Dcp - - - - - ed7e96aa by Tony Chemit at 2023-03-12T14:43:23+01:00 Consolidation - renommage SampleConsolidateXXX en SampleMeasureConsolidateXXX Consolidation - ajout de SetConsolidateActions - - - - - 95047bae by Tony Chemit at 2023-03-13T08:24:22+01:00 Consolidation - ajout consolidation pour les logbook - - - - - 1313b4ed by Tony Chemit at 2023-03-13T08:24:22+01:00 Ajout d'une documentation sur la consolidation - Closes #2642 - - - - - 01c2aa78 by Tony Chemit at 2023-03-13T08:24:22+01:00 Remove javadoc from site reports (not ready to use it) - - - - - a8e37a36 by Tony Chemit at 2023-03-13T08:27:32+01:00 Update changelog for v.9.0.28 [skip CI] - - - - - 30 changed files: - .gitignore - CHANGELOG.md - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateResult.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/CleanComputedValuesAction.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/ComputeBiodegradableConsolidateAction.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/ComputeNonEntanglingConsolidateAction.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/ComputeSimplifiedObjectTypeConsolidateAction.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/FloatingObjectConsolidateAction.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/FloatingObjectConsolidateContextSupport.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/FloatingObjectConsolidateEngineSupport.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/FloatingObjectConsolidateRequestSupport.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/localmarket/BatchConsolidateActions.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateResult.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/FloatingObjectAdapter.java → core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateResultBuilder.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/FloatingObjectActions.java → core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/FloatingObjectConsolidateActions.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/FloatingObjectConsolidateEngine.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/FloatingObjectActions.java → core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/FloatingObjectConsolidateActions.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/FloatingObjectConsolidateEngine.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateEngine.java - + core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateContext.java - + core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateEngine.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/ActivityConsolidateContext.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/CatchConsolidateActions.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/SampleConsolidateActions.java → core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/SampleMeasureConsolidateActions.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/SampleConsolidateContext.java → core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/SampleMeasureConsolidateContext.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e4ecc3d7316fc997050d9dead... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e4ecc3d7316fc997050d9dead... You're receiving this email because of your account on gitlab.com.