April 2023 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][pages] Remove old versions
by Tony CHEMIT (＠tchemit) 27 Apr '23

27 Apr '23

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: a34434eb by Tony Chemit at 2023-04-27T15:10:22+02:00 Remove old versions - - - - - 8 changed files: - − 9.0.0/CHANGELOG.html - − 9.0.0/architecture-logicielle.html - − 9.0.0/avdth/common.html - − 9.0.0/avdth/index.html - − 9.0.0/avdth/landing.html - − 9.0.0/avdth/local_market.html - − 9.0.0/avdth/logbook.html - − 9.0.0/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a34434ebf5283f8c27dc7c5bd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a34434ebf5283f8c27dc7c5bd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 25 commits: [jgitflow-maven-plugin]updating poms for 9.1.0-RC-3-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 27 Apr '23

27 Apr '23

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: f2bd555c by Tony Chemit at 2023-04-02T11:04:46+02:00 [jgitflow-maven-plugin]updating poms for 9.1.0-RC-3-SNAPSHOT development[skip ci] - - - - - d20f1118 by Tony Chemit at 2023-04-02T11:35:52+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - ab1809e1 by Tony Chemit at 2023-04-02T11:35:53+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 709d641b by Tony Chemit at 2023-04-02T11:35:55+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 6fb73436 by Tony Chemit at 2023-04-04T09:30:25+02:00 Un marée sur laquelle l'assistant d'appariement bloque - Closes #2667 - - - - - a5a466fe by Tony Chemit at 2023-04-07T11:20:58+02:00 avdth - remove old tests - - - - - b2ac2fe8 by Tony Chemit at 2023-04-08T15:10:15+02:00 Remplir le champs Vessel.cfrId (utilisé pour akado) - Closes #2672 - - - - - 52c0b593 by Tony Chemit at 2023-04-13T09:51:48+02:00 update pom - - - - - 1ef6adbf by Tony Chemit at 2023-04-14T10:04:08+02:00 Etat par défaut du bouton radio Saisie groupée / Saisie individuelle sur capture LL - Closes #2671 - - - - - 8fb09b9c by Tony Chemit at 2023-04-14T10:04:08+02:00 Petites améliorations sur la gestion des numéros de sous-échantillons - Closes #2668 - - - - - 0dce310f by Tony Chemit at 2023-04-14T10:04:08+02:00 Dans les tableaux, remplacer les champs vides pour les nombres de valeur 0 par 0 - Closes #2674 - - - - - 3614488d by Tony Chemit at 2023-04-14T11:50:22+02:00 Ajouter une colonne poids total (en t) sur le tableau des cuves calées - Closes #2675 - - - - - a32d89c2 by Tony Chemit at 2023-04-14T18:07:45+02:00 Client UI - Reduce to 15 columns for sample activity species table - - - - - cec31ba6 by Tony Chemit at 2023-04-17T12:16:53+02:00 Revert "pom - fix distributionManagement for site (use now ssh over git)" This reverts commit 422b324194756bf1b71b6551994027db981ac09a. - - - - - feb3e621 by Tony Chemit at 2023-04-27T12:39:01+02:00 update pom - - - - - 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 - - - - - 5eac81d5 by Tony Chemit at 2023-04-27T12:56:32+02:00 Pom - move to version 9.1.0-SNAPSHOT and tidy poms - - - - - 5400c557 by Tony Chemit at 2023-04-27T13:21:06+02:00 Souci de migration v9 d'un commentaire - Closes #2677 - - - - - 1d19187e by Tony Chemit at 2023-04-27T13:21:41+02:00 Update changelog for v.9.1.0 [skip CI] - - - - - bc579df8 by Tony Chemit at 2023-04-27T13:40:08+02:00 [jgitflow-maven-plugin]updating poms for 9.1.0 branch with snapshot versions[skip ci] - - - - - 95c9a4b4 by Tony Chemit at 2023-04-27T13:40:51+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.0' with non-snapshot versions[skip ci] - - - - - 358d183c by Tony Chemit at 2023-04-27T14:19:22+02:00 [jgitflow-maven-plugin]merging 'release/9.1.0' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUITableModel.java - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java - 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/SampleSpeciesMeasureTableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/WellActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/WellActivityUITableModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/actions/SampleActivityResetComputedValue.java - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateResult.java - core/api/dto-decoration/pom.xml - core/api/dto-decoration/src/main/i18n/getters/labels.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3ef904dbaeca7258c298ee74… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3ef904dbaeca7258c298ee74… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 9.1.0 branch with snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 27 Apr '23

27 Apr '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bc579df8 by Tony Chemit at 2023-04-27T13:40:08+02:00 [jgitflow-maven-plugin]updating poms for 9.1.0 branch with snapshot versions[skip ci] - - - - - 95c9a4b4 by Tony Chemit at 2023-04-27T13:40:51+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.0' with non-snapshot versions[skip ci] - - - - - 358d183c by Tony Chemit at 2023-04-27T14:19:22+02:00 [jgitflow-maven-plugin]merging 'release/9.1.0' into 'master' - - - - - 13e3a87d by Tony Chemit at 2023-04-27T14:19:35+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 50f4fd8e by Tony Chemit at 2023-04-27T14:19:37+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 38e0b0ed by Tony Chemit at 2023-04-27T14:19:40+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/88d0c3b2c4648f7bd3cbf731… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/88d0c3b2c4648f7bd3cbf731… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.1.0
by Tony CHEMIT (＠tchemit) 27 Apr '23

27 Apr '23

Tony CHEMIT pushed new branch release/9.1.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/9.1.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Update changelog for v.9.1.0 [skip CI]
by Tony CHEMIT (＠tchemit) 27 Apr '23

27 Apr '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 51d3bafc by Tony Chemit at 2023-04-27T13:20:11+02:00 Update changelog for v.9.1.0 [skip CI] - - - - - 7e20ef9b by Tony Chemit at 2023-04-27T13:20:11+02:00 Souci de migration v9 d'un commentaire - Closes #2677 - - - - - 2 changed files: - CHANGELOG.md - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/FixCommentHelper.java Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,27 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-04-01 18:22. + * Last generated at 2023-04-27 12:59. + +## Version [9.1.0](https://gitlab.com/ultreiaio/ird-observe/-/milestones/262) + +**Closed at 2023-04-27.** + +### Download +* [Client (observe-9.1.0-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.1.0.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.1.0-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + +### Issues + * [[Type::Anomalie 2667]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2667) **Un marée sur laquelle l'assistant d'appariement bloque** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2671]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2671) **Etat par défaut du bouton radio Saisie groupée / Saisie individuelle sur capture LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2677]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2677) **Souci de migration v9 d'un commentaire** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2053]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2053) **Automatiser le calcul de la pondération de la calée dans la cuve échantillonnée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2666]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2666) **Sur un code AVDTH ASSOC inopportun, l'importeur bloque avec une exception** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2668]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2668) **Petites améliorations sur la gestion des numéros de sous-échantillons** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2672]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2672) **Remplir le champs Vessel.cfrId (utilisé pour akado)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2674]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2674) **Dans les tableaux, remplacer les champs vides pour les nombres de valeur 0 par 0** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2675]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2675) **Ajouter une colonne poids total (en t) sur le tableau des cuves calées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.1.0-RC-2](https://gitlab.com/ultreiaio/ird-observe/-/milestones/259) ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/FixCommentHelper.java ===================================== @@ -114,8 +114,8 @@ public class FixCommentHelper { while (resultSet.next()) { String fieldValue = resultSet.getString(2); String fixFieldValue = fieldValue.trim(); - if (!fieldValue.equals(fixFieldValue)) { - if (fixFieldValue.isEmpty()) { + if (!fieldValue.equals(fixFieldValue) || fixFieldValue.equals("\\")) { + if (fixFieldValue.isEmpty() || fixFieldValue.equals("\\")) { fixFieldValue = null; } String id = resultSet.getString(1); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a7bdf5a9096deb0cb7aa75f6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a7bdf5a9096deb0cb7aa75f6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Pom - move to version 9.1.0-SNAPSHOT and tidy poms
by Tony CHEMIT (＠tchemit) 27 Apr '23

27 Apr '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5eac81d5 by Tony Chemit at 2023-04-27T12:56:32+02:00 Pom - move to version 9.1.0-SNAPSHOT and tidy poms - - - - - a7bdf5a9 by Tony Chemit at 2023-04-27T13:00:13+02:00 Update changelog for v.9.1.0 [skip CI] - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9af0156682a287ab808312b3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9af0156682a287ab808312b3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Core - Ajout du champs SampleActivity.weightedWeightComputed
by Tony CHEMIT (＠tchemit) 27 Apr '23

27 Apr '23

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/feb3e6212b345b0a9b6e3dc3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/feb3e6212b345b0a9b6e3dc3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Revert "pom - fix distributionManagement for site (use now ssh over git)"
by Tony CHEMIT (＠tchemit) 27 Apr '23

27 Apr '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cec31ba6 by Tony Chemit at 2023-04-17T12:16:53+02:00 Revert "pom - fix distributionManagement for site (use now ssh over git)" This reverts commit 422b324194756bf1b71b6551994027db981ac09a. - - - - - feb3e621 by Tony Chemit at 2023-04-27T12:39:01+02:00 update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.16</version> + <version>2023.17</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -74,7 +74,7 @@ <distributionManagement> <site> <id>gitlab.com</id> - <url>scm:git:ssh://git@gitlab.com:${projectPath}.git</url> + <url>scm:git:https://git@gitlab.com/${projectPath}.git</url> </site> </distributionManagement> <properties> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cb3bf27770973e8d74add2e9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cb3bf27770973e8d74add2e9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Client UI - Reduce to 15 columns for sample activity species table
by Tony CHEMIT (＠tchemit) 14 Apr '23

14 Apr '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a32d89c2 by Tony Chemit at 2023-04-14T18:07:45+02:00 Client UI - Reduce to 15 columns for sample activity species table - - - - - 1 changed file: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesMeasureTableModel.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesMeasureTableModel.java ===================================== @@ -54,7 +54,7 @@ public class SampleSpeciesMeasureTableModel extends EditableTableModelWithCache< JXTableUtil.initEditors(table, NumberCellEditor.newFloatColumnEditor(), NumberCellEditor.newIntegerColumnEditor()); table.init(ui, ui.getValidatorMeasure()); - JXTableUtil.setMinimumHeight(table.getRowHeight() * 20, table, ui.getSampleSpeciesMeasuresScrollPane()); + JXTableUtil.setMinimumHeight(table.getRowHeight() * 15, table, ui.getSampleSpeciesMeasuresScrollPane()); } public SampleSpeciesMeasureTableModel(EditableListProperty<SampleSpeciesMeasureDto> listProperty) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a32d89c2a2678b29ede427009… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a32d89c2a2678b29ede427009… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajouter une colonne poids total (en t) sur le tableau des cuves calées - Closes #2675
by Tony CHEMIT (＠tchemit) 14 Apr '23

14 Apr '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3614488d by Tony Chemit at 2023-04-14T11:50:22+02:00 Ajouter une colonne poids total (en t) sur le tableau des cuves calées - Closes #2675 - - - - - 11 changed files: - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/WellActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/WellActivityUITableModel.java - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/WellActivityDto.java - 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 - model/src/main/models/Observe/dto/21-data-ps-logbook.model - model/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties - model/src/main/models/Observe/dto/class/i18nLabels.properties Changes: ===================================== client/datasource/editor/ps/src/main/i18n/getters/navigation.getter ===================================== @@ -169,6 +169,8 @@ observe.data.ps.logbook.WellActivity.action.save observe.data.ps.logbook.WellActivity.action.save.tip observe.data.ps.logbook.WellActivity.activity observe.data.ps.logbook.WellActivity.activity.short +observe.data.ps.logbook.WellActivity.computedTotalWeight +observe.data.ps.logbook.WellActivity.computedTotalWeight.short observe.data.ps.logbook.WellActivity.wellActivitySpecies observe.data.ps.logbook.WellActivity.wellActivitySpecies.short observe.data.ps.observation.Activity.action.create ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/WellActivityUIHandler.java ===================================== @@ -47,4 +47,10 @@ public class WellActivityUIHandler extends GeneratedWellActivityUIHandler { } return ui.getWellActivitySpeciesTable(); } + + @Override + protected void onTableModelChanged() { + super.onTableModelChanged(); + getUi().getTable().invalidate(); + } } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/WellActivityUITableModel.java ===================================== @@ -25,7 +25,6 @@ package fr.ird.observe.client.datasource.editor.ps.data.logbook; import fr.ird.observe.client.datasource.editor.api.content.EditableContentUI; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.client.util.table.EditableListProperty; -import fr.ird.observe.dto.data.ps.logbook.WellActivityDto; import fr.ird.observe.dto.data.ps.logbook.WellActivitySpeciesDto; import fr.ird.observe.dto.data.ps.logbook.WellDto; @@ -76,6 +75,7 @@ public class WellActivityUITableModel extends GeneratedWellActivityUITableModel getValidator().doValidate(); getValidator().setChanged(false); wellActivitySpeciesTableModel.setModified(false); + fireTableDataChanged(); } @Override @@ -83,9 +83,4 @@ public class WellActivityUITableModel extends GeneratedWellActivityUITableModel super.startEditTableEditBeanOnInlineModels(); wellActivitySpeciesTableModel.validate(); } - - @Override - protected void onSelectedRowChanged(WellActivityUI ui, int editingRow, WellActivityDto tableEditBean, WellActivityDto previousRowBean, boolean notPersisted, boolean newRow) { - super.onSelectedRowChanged(ui, editingRow, tableEditBean, previousRowBean, notPersisted, newRow); - } } ===================================== core/api/dto-decoration/src/main/i18n/getters/labels.getter ===================================== @@ -1023,6 +1023,8 @@ observe.data.ps.logbook.WellActivity.action.save observe.data.ps.logbook.WellActivity.action.save.tip observe.data.ps.logbook.WellActivity.activity observe.data.ps.logbook.WellActivity.activity.short +observe.data.ps.logbook.WellActivity.computedTotalWeight +observe.data.ps.logbook.WellActivity.computedTotalWeight.short observe.data.ps.logbook.WellActivity.title observe.data.ps.logbook.WellActivity.type observe.data.ps.logbook.WellActivity.wellActivitySpecies ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/WellActivityDto.java ===================================== @@ -28,6 +28,7 @@ import io.ultreia.java4all.decoration.DecoratorProvider; @GenerateJavaBeanDefinition public class WellActivityDto extends GeneratedWellActivityDto { + @Override public void registerDecorator(Decorator decorator) { super.registerDecorator(decorator); @@ -36,4 +37,9 @@ public class WellActivityDto extends GeneratedWellActivityDto { DecoratorProvider.registerDecorator(ActivityStubDto.class, decorator.getLocale(), activity); } } + + @Override + public Float getComputedTotalWeight() { + return (float)getWellActivitySpecies().stream().mapToDouble(WellActivitySpeciesDto::getWeight).sum(); + } } ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1227,6 +1227,8 @@ observe.data.ps.logbook.WellActivity.action.save=Insert observe.data.ps.logbook.WellActivity.action.save.tip=Insert the well activity observe.data.ps.logbook.WellActivity.activity=Activity observe.data.ps.logbook.WellActivity.activity.short=Activity +observe.data.ps.logbook.WellActivity.computedTotalWeight=Total weight (in t) +observe.data.ps.logbook.WellActivity.computedTotalWeight.short=Total weight (in t) observe.data.ps.logbook.WellActivity.title=Well activity observe.data.ps.logbook.WellActivity.type=Well activity observe.data.ps.logbook.WellActivity.wellActivitySpecies=Well activity species ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1227,6 +1227,8 @@ observe.data.ps.logbook.WellActivity.action.save=Insert observe.data.ps.logbook.WellActivity.action.save.tip=Insert the well activity observe.data.ps.logbook.WellActivity.activity=Activity observe.data.ps.logbook.WellActivity.activity.short=Activity +observe.data.ps.logbook.WellActivity.computedTotalWeight=Peso (en t) +observe.data.ps.logbook.WellActivity.computedTotalWeight.short=Peso (en t) observe.data.ps.logbook.WellActivity.title=Well activity observe.data.ps.logbook.WellActivity.type=Well activity observe.data.ps.logbook.WellActivity.wellActivitySpecies=Well activity species ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1227,6 +1227,8 @@ observe.data.ps.logbook.WellActivity.action.save=Insérer observe.data.ps.logbook.WellActivity.action.save.tip=Insérer cette cuve-calée observe.data.ps.logbook.WellActivity.activity=Activité observe.data.ps.logbook.WellActivity.activity.short=Activité +observe.data.ps.logbook.WellActivity.computedTotalWeight=Poids total (en t) +observe.data.ps.logbook.WellActivity.computedTotalWeight.short=Poids total (en t) observe.data.ps.logbook.WellActivity.title=Cuve-calée observe.data.ps.logbook.WellActivity.type=Cuve-calée observe.data.ps.logbook.WellActivity.wellActivitySpecies=Espèces ===================================== model/src/main/models/Observe/dto/21-data-ps-logbook.model ===================================== @@ -143,6 +143,7 @@ wellActivity + {*} data.ps.logbook.WellActivity data.ps.logbook.WellActivity > data.ContainerChild >> data.ps.logbook.ActivityLabelAware activity {*:1} data.ps.logbook.ActivityStub wellActivitySpecies + {*} data.ps.logbook.WellActivitySpecies +computedTotalWeight Float data.ps.logbook.WellActivitySpecies > data.Data >> data.InlineDataDto species {*:1} referential.common.SpeciesReference ===================================== model/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties ===================================== @@ -41,7 +41,7 @@ data.ps.localmarket.Batch=species,packaging,count,weight data.ps.localmarket.SampleSpecies=species,sizeMeasureType,measuredCount,comment data.ps.logbook.Catch=species,weightCategory,speciesFate,well,weight,count,comment data.ps.logbook.SampleSpecies=subSampleNumber,species,sizeMeasureType,measuredCount,totalCount,comment -data.ps.logbook.WellActivity=activity,wellActivitySpecies +data.ps.logbook.WellActivity=activity,wellActivitySpecies,computedTotalWeight data.ps.observation.Catch=species,speciesFate,reasonForDiscard,catchWeight,totalCount,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource,comment data.ps.observation.NonTargetCatchRelease=species,sex,speciesGroupReleaseMode,conformity,releasingTime,length,comment data.ps.observation.ObjectObservedSpecies=species,speciesStatus,count ===================================== model/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -82,7 +82,7 @@ data.ps.logbook.SampleSpecies=comment,measuredCount,sampleSpeciesMeasure,sizeMea data.ps.logbook.SampleSpeciesMeasure=count,sizeClass data.ps.logbook.TransmittingBuoy=comment,code,transmittingBuoyOwnership,transmittingBuoyType,transmittingBuoyOperation,country,vessel,latitude,longitude,quadrant data.ps.logbook.Well=well,wellVessel,wellFactory,wellSamplingConformity,wellSamplingStatus,generalTab,wellActivityTab,action.save,action.save.tip,wellVessel.short,wellFactory.short,wellAlternativeNumbering -data.ps.logbook.WellActivity=activity,wellActivitySpecies +data.ps.logbook.WellActivity=activity,wellActivitySpecies,computedTotalWeight,computedTotalWeight.short data.ps.logbook.WellActivitySpecies=species,weight,weightCategory,count,setSpeciesNumber data.ps.observation.Activity=date,coordinate,observedSystem.available,observedSystem.selected,comment,comment2,currentFpaZone,dataQuality,detectionMode,ersId,floatingObjectEmpty,latitude,longitude,nextFpaZone,nonTargetCatchSpecies,observedSystem,observedSystemDistance,previousFpaZone,quadrant,reasonForNoFishing,seaSurfaceTemperature,surroundingActivity,time,vesselActivity,vesselSpeed,wind,generalTab,error.no.activity.6,measurementsTab,observedSystemTab data.ps.observation.Catch=catchWeight,catchWeightTotalCount,meanWeightMeanLength,comment,informationSource,sizeMeasureMethod,meanLength,minWeight,maxWeight,meanWeight,minMaxWeight,reasonForDiscard,species,speciesFate,totalCount,weightMeasureMethod,well,catchWeightComputed.computed.tip,catchWeightComputed.observed.tip,meanLengthComputed.computed.tip,meanLengthComputed.observed.tip,meanWeightComputed.computed.tip,meanWeightComputed.observed.tip,totalCountComputed.computed.tip,totalCountComputed.observed.tip,meanLengthComputedSource,totalCountComputedSource,meanWeightComputedSource View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3614488d9ee2bbd5e3250fb3c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3614488d9ee2bbd5e3250fb3c… You're receiving this email because of your account on gitlab.com.

1 0