Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ff170c07 by Tony Chemit at 2023-04-27T12:42:46+02:00 Core - Ajout du champs SampleActivity.weightedWeightComputed - - - - - 044699bc by Tony Chemit at 2023-04-27T12:42:50+02:00 Consolidation - Add ps logbook SampleActivity consolidation - - - - - ac280ff0 by Tony Chemit at 2023-04-27T12:42:54+02:00 Client UI - Add ps logbook SampleActivity.computedWeightedWeight - - - - - 9af01566 by Tony Chemit at 2023-04-27T12:43:02+02:00 Merge branch 'feature/issue_2053' into develop Automatiser le calcul de la pondération de la calée dans la cuve échantillonnée - Closes #2053 - - - - - 30 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleActivityTableModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/actions/SampleActivityResetComputedValue.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateResult.java - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ps/logbook/SampleActivityDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ps/logbook/SampleActivityReferenceDecoratorDefinition.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/SampleActivityConsolidateActions.java - + core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleActivityConsolidateContext.java - + core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleActivityConsolidateEngine.java - core/persistence/decoration/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleActivityDecoratorDefinition.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/WellActivityImpl.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/WellImpl.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 - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/logbook/SampleActivityImpl.hbm.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_1.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/14_adapt-table-ps_logbook_sampleActivity-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.1/empty-schema-H2.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.1/empty-schema-PG.sql - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/SampleActivity/definition.json - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - core/services/test/src/main/java/fr/ird/observe/services/service/data/ps/ConsolidateDataServiceFixtures.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ps/ConsolidateDataService.properties - model/src/main/models/Observe/dto/21-data-ps-logbook.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/feb3e6212b345b0a9b6e3dc3a... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/feb3e6212b345b0a9b6e3dc3a... You're receiving this email because of your account on gitlab.com.