Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9ebc590e by Tony Chemit at 2024-09-13T13:42:22+02:00 update pom - - - - - 4dc13f29 by Tony Chemit at 2024-09-13T13:42:52+02:00 [model] update model - - - - - 0a3074ad by Tony Chemit at 2024-09-13T13:42:52+02:00 [api-dto-decoration] update i18n labels - - - - - 420cac36 by Tony Chemit at 2024-09-13T13:42:52+02:00 [persistence-java] update generated mappings and models - - - - - e1e6ae6e by Tony Chemit at 2024-09-13T13:42:52+02:00 [persistence-migration] add migration - - - - - 4bc6f1c0 by Tony Chemit at 2024-09-13T13:42:52+02:00 [persistence-resources] update generated resources - - - - - 5d055f4f by Tony Chemit at 2024-09-13T13:42:52+02:00 [services-i18n] update i18n stuff - - - - - 84725dda by Tony Chemit at 2024-09-13T13:42:52+02:00 [client] Add new field on Form and create action for it - - - - - 70053013 by Tony Chemit at 2024-09-13T13:42:52+02:00 [validation] Weights are no more mandatory - - - - - a53992f1 by Tony Chemit at 2024-09-13T13:42:52+02:00 [test] update fixtures - - - - - 4e4e007c by Tony Chemit at 2024-09-13T13:42:52+02:00 [persistence-migration] add migration - - - - - 03d61b3e by Tony Chemit at 2024-09-13T13:42:52+02:00 [api] Review consolidate request and result to add new Sample consolidation - - - - - 4f596e36 by Tony Chemit at 2024-09-13T13:42:52+02:00 Review consolidate engine to add new Sample consolidation and implements the new consolidation action - - - - - 93463773 by Tony Chemit at 2024-09-13T13:42:53+02:00 [test] Update consolidation test - - - - - f3c90a1c by Tony Chemit at 2024-09-13T13:42:53+02:00 [client] Add new configuration option to store the species list used in new consolidation action - - - - - e5cd4634 by Tony Chemit at 2024-09-13T13:42:53+02:00 [client] Review consolidation ui action - - - - - 8b4de0af by Tony Chemit at 2024-09-13T13:42:53+02:00 [doc] Update consolidation documentation - - - - - 74622168 by Tony Chemit at 2024-09-13T13:43:14+02:00 Merge branch 'feature/feature/issue-2669' into develop Automatiser la calcul des sample.minus10Weight et sample.plus10Weight par sommation des lots du plan de cuves - Closes #2669 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/i18n/getters/jaxx.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateConfigUI.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java - 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/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/ObservePsKeyStrokes.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/actions/SampleUIResetWeightsComputed.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/TripConsolidateRequest.java - 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/logbook/SampleConsolidateResult.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateResultBuilder.java - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java - core/api/validation/src/main/filtered-resources/META-INF/validation/model-default.json - core/api/validation/src/main/filtered-resources/META-INF/validation/model-xwork2.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-create-error-validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-create-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/43282691864818d528b6b8933... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/43282691864818d528b6b8933... You're receiving this email because of your account on gitlab.com.