August 2024 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Remove unnecessary brace to one jaxx expression
by Tony CHEMIT (＠tchemit) 25 Aug '24

25 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7c6fb362 by Tony Chemit at 2024-08-25T17:03:56+02:00 Remove unnecessary brace to one jaxx expression - - - - - 1 changed file: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx ===================================== @@ -99,7 +99,7 @@ <JLabel id='coordinateLabel' constraints='BorderLayout.NORTH' styleClass="center"/> <JToggleButton id="skipMandatoryCoordinate" constraints='BorderLayout.CENTER' styleClass='bold' - onItemStateChanged="{getHandler().onSkipMandatoryCoordinateChanged(event);}"/> + onItemStateChanged="getHandler().onSkipMandatoryCoordinateChanged(event);"/> </JPanel> <CoordinatesEditor id='coordinate' constraints='BorderLayout.CENTER'/> </JPanel> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7c6fb36287064ac217694f9fc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7c6fb36287064ac217694f9fc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 25 commits: Add andThen nice method to chain consumers (with possible null on first one)
by Tony CHEMIT (＠tchemit) 25 Aug '24

25 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f4eb68ac by Tony Chemit at 2024-08-20T11:33:29+02:00 Add andThen nice method to chain consumers (with possible null on first one) - - - - - 4cf662c1 by Tony Chemit at 2024-08-20T12:23:06+02:00 Review SPI code to improve save mechanism (only override the onSave method, and no more the saveEntity one) - - - - - 7769ecd4 by Tony Chemit at 2024-08-20T12:26:38+02:00 update spi to use new save API - - - - - 1f371c0a by Tony Chemit at 2024-08-20T12:55:55+02:00 Improve tests log level - - - - - a890eba2 by Tony Chemit at 2024-08-20T13:26:51+02:00 Update pom - - - - - 180eb3f8 by Tony Chemit at 2024-08-20T13:35:02+02:00 Introduce WithEndDateEntityAware - - - - - 33ecab53 by Tony Chemit at 2024-08-20T13:40:56+02:00 use WithEndDateEntityAware in TripEntityAware and update Trip spi - - - - - cfce789d by Tony Chemit at 2024-08-20T13:40:56+02:00 use WithEndDateEntityAware on entities - - - - - 411a997d by Tony Chemit at 2024-08-20T13:40:56+02:00 update spi to use new save API and TripEntityAware onSaveUpdateTripIfEndDateChanged method - - - - - 5d5b1fa3 by Tony Chemit at 2024-08-20T14:00:25+02:00 Merge branch 'feature/issue_2903' into develop LL observations / logbook : mise à jour auto de la date de fin de marée en fonction des dates activités (comme en PS) - Closes #2903 - - - - - 1ee55e18 by Tony Chemit at 2024-08-25T16:41:53+02:00 update pom - - - - - cc41ff1f by Tony Chemit at 2024-08-25T16:44:57+02:00 KeepBeanPropertyOrder in presets storage - - - - - a81b9d25 by Tony Chemit at 2024-08-25T16:45:58+02:00 Add fileName property in FloatingObjectPreset (to be able to use it later) - - - - - c390674c by Tony Chemit at 2024-08-25T16:46:54+02:00 Improve FloatingObjectPresetStorage and load filename when reading storage, but never store it at write time - - - - - 9e76b0ae by Tony Chemit at 2024-08-25T16:47:48+02:00 Improve FloatingObjectPresetsStorage and add store method to be able to rewrite all the presets from the presetsMap parameter. - - - - - f7f5ba15 by Tony Chemit at 2024-08-25T16:48:39+02:00 Replace # by -- in presets (otherwise it is a comment and is never loaded - - - - - 72e036cf by Tony Chemit at 2024-08-25T16:49:32+02:00 Introduce method reloadDefaultDcpPresets to be able to reload embedded presets - - - - - afcdd7c8 by Tony Chemit at 2024-08-25T16:50:12+02:00 Introduce method setMainI18nLanguage to be able to apply it in presets ui - - - - - 68ecaefd by Tony Chemit at 2024-08-25T16:51:27+02:00 Improve FloatingObjectPresetUIInitializer to use it form preset managers also - - - - - ee4d42c1 by Tony Chemit at 2024-08-25T16:51:58+02:00 Open buildMaterialsList method to be used by presets manager - - - - - 0181e9c9 by Tony Chemit at 2024-08-25T16:54:24+02:00 Remove unnecessary brace to one jaxx expression - - - - - 986bbcb4 by Tony Chemit at 2024-08-25T16:54:36+02:00 Add presets manager UI - - - - - 6eb25afe by Tony Chemit at 2024-08-25T16:54:36+02:00 Add new content body to display presets manager - - - - - 8bebf241 by Tony Chemit at 2024-08-25T16:54:36+02:00 Remove unnecessary brace to one jaxx expression - - - - - fe0672b2 by Tony Chemit at 2024-08-25T16:55:10+02:00 Merge branch 'feature/issue_2826' into develop Permettre le renommage, la suppression, éventuellement l'édition des présélections de FOB - Closes #2826 - - - - - 30 changed files: - client/configuration/src/main/dcp-presets/ps/common/01-standard-fad-deployment-preset.yml - client/configuration/src/main/dcp-presets/ps/common/02-standard-fad-removal-preset.yml - client/configuration/src/main/dcp-presets/ps/common/03-standard-fad-update-preset.yml - client/configuration/src/main/dcp-presets/ps/common/04-standard-fad-abandonned-preset.yml - client/configuration/src/main/dcp-presets/ps/common/05-standard-fad-endOfUse-preset.yml - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIOpenExecutor.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/data/dcp/actions/ShowFloatingObjectPresetsUI.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectBuoyPresetUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUIInitializer.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsTabUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsTabUI.jcss - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsTabUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsTabUIModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsUIBodyContent.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsUIModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/CancelEdit.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/Delete.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/FloatingObjectPresetsTabUIActionSupport.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/GoDown.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/GoUp.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/Quit.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/ReloadDefaultConfiguration.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/SaveEdit.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7829610395af07dfcefda724… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7829610395af07dfcefda724… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue_2826
by Tony CHEMIT (＠tchemit) 25 Aug '24

25 Aug '24

Tony CHEMIT deleted branch feature/issue_2826 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue_2826] 13 commits: update pom
by Tony CHEMIT (＠tchemit) 25 Aug '24

25 Aug '24

Tony CHEMIT pushed to branch feature/issue_2826 at ultreiaio / ird-observe Commits: 1ee55e18 by Tony Chemit at 2024-08-25T16:41:53+02:00 update pom - - - - - cc41ff1f by Tony Chemit at 2024-08-25T16:44:57+02:00 KeepBeanPropertyOrder in presets storage - - - - - a81b9d25 by Tony Chemit at 2024-08-25T16:45:58+02:00 Add fileName property in FloatingObjectPreset (to be able to use it later) - - - - - c390674c by Tony Chemit at 2024-08-25T16:46:54+02:00 Improve FloatingObjectPresetStorage and load filename when reading storage, but never store it at write time - - - - - 9e76b0ae by Tony Chemit at 2024-08-25T16:47:48+02:00 Improve FloatingObjectPresetsStorage and add store method to be able to rewrite all the presets from the presetsMap parameter. - - - - - f7f5ba15 by Tony Chemit at 2024-08-25T16:48:39+02:00 Replace # by -- in presets (otherwise it is a comment and is never loaded - - - - - 72e036cf by Tony Chemit at 2024-08-25T16:49:32+02:00 Introduce method reloadDefaultDcpPresets to be able to reload embedded presets - - - - - afcdd7c8 by Tony Chemit at 2024-08-25T16:50:12+02:00 Introduce method setMainI18nLanguage to be able to apply it in presets ui - - - - - 68ecaefd by Tony Chemit at 2024-08-25T16:51:27+02:00 Improve FloatingObjectPresetUIInitializer to use it form preset managers also - - - - - ee4d42c1 by Tony Chemit at 2024-08-25T16:51:58+02:00 Open buildMaterialsList method to be used by presets manager - - - - - 986bbcb4 by Tony Chemit at 2024-08-25T16:54:36+02:00 Add presets manager UI - - - - - 6eb25afe by Tony Chemit at 2024-08-25T16:54:36+02:00 Add new content body to display presets manager - - - - - 8bebf241 by Tony Chemit at 2024-08-25T16:54:36+02:00 Remove unnecessary brace to one jaxx expression - - - - - 30 changed files: - client/configuration/src/main/dcp-presets/ps/common/01-standard-fad-deployment-preset.yml - client/configuration/src/main/dcp-presets/ps/common/02-standard-fad-removal-preset.yml - client/configuration/src/main/dcp-presets/ps/common/03-standard-fad-update-preset.yml - client/configuration/src/main/dcp-presets/ps/common/04-standard-fad-abandonned-preset.yml - client/configuration/src/main/dcp-presets/ps/common/05-standard-fad-endOfUse-preset.yml - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIOpenExecutor.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/data/dcp/actions/ShowFloatingObjectPresetsUI.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectBuoyPresetUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUIInitializer.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsTabUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsTabUI.jcss - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsTabUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsTabUIModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsUIBodyContent.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetsUIModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/CancelEdit.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/Delete.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/FloatingObjectPresetsTabUIActionSupport.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/GoDown.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/GoUp.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/Quit.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/ReloadDefaultConfiguration.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/actions/SaveEdit.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/88ddeeb5d3c34b4fc9c8140f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/88ddeeb5d3c34b4fc9c8140f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue_2826
by Tony CHEMIT (＠tchemit) 21 Aug '24

21 Aug '24

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

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT (＠tchemit) 18 Aug '24

18 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f37ee280 by Tony Chemit at 2024-08-18T10:30:59+02:00 update pom - - - - - 78296103 by Tony Chemit at 2024-08-18T11:05:43+02:00 Replace tomcat plugin to deploy on demo the release war - - - - - 2 changed files: - pom.xml - server/runner/pom.xml Changes: ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.31</version> + <version>2024.32</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== server/runner/pom.xml ===================================== @@ -304,23 +304,26 @@ <classifier>${project.version}</classifier> </properties> <build> - <defaultGoal>verify</defaultGoal> + <defaultGoal>deploy</defaultGoal> <plugins> <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> <configuration> - <url>https://demo.ultreia.io/manager/text</url> - <server>ultreiaio.tomcat</server> - <path>/observe-${project.version}</path> + <serverId>doc.ultreia.io</serverId> + <url>scpexe://ultreia.io/opt/tomcat9/webapps</url> </configuration> <executions> <execution> - <id>default-redeploy-only</id> + <id>deploy-war</id> <goals> - <goal>redeploy-only</goal> + <goal>upload-single</goal> </goals> - <phase>verify</phase> + <phase>deploy</phase> + <configuration> + <fromFile>${project.build.directory}/observe-server-${project.version}.war</fromFile> + <toFile>observe-${project.version}.war</toFile> + </configuration> </execution> </executions> </plugin> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/63426148e9c4302cfd316dc2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/63426148e9c4302cfd316dc2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Reduce log level
by Tony CHEMIT (＠tchemit) 17 Aug '24

17 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a5743094 by Tony Chemit at 2024-08-17T18:01:03+02:00 Reduce log level - - - - - 63426148 by Tony Chemit at 2024-08-17T18:01:34+02:00 increase timeout for method SynchronizeService.produceSqlResult - - - - - 2 changed files: - toolkit/api-services/src/main/java/fr/ird/observe/services/service/referential/SynchronizeService.java - toolkit/api-services/src/main/java/fr/ird/observe/services/service/referential/synchro/OneSideSqlResult.java Changes: ===================================== toolkit/api-services/src/main/java/fr/ird/observe/services/service/referential/SynchronizeService.java ===================================== @@ -62,7 +62,7 @@ public interface SynchronizeService extends ObserveService { * @return all sql requests to be generated from this side */ // Note : sur cette méthode aucun droit métier à poser, les actions sont légitimes - @Post(useMultiPartForm = true) + @Post(useMultiPartForm = true, timeOut = 120) @MethodCredential OneSideSqlResult produceSqlResult(OneSideSqlRequest request); ===================================== toolkit/api-services/src/main/java/fr/ird/observe/services/service/referential/synchro/OneSideSqlResult.java ===================================== @@ -91,7 +91,7 @@ public class OneSideSqlResult implements JsonAware { } public OneSideSqlResult.Builder addInsertStatement(String sql) { - log.info(String.format("Add add sql: %s", sql)); + log.debug(String.format("Add add sql: %s", sql)); if (sql.startsWith(ASSOCIATION_STATEMENT_PREFIX)) { addAssociationTasksBuilder.add(unboxAssociationStatement(sql)); } else { @@ -101,7 +101,7 @@ public class OneSideSqlResult implements JsonAware { } public OneSideSqlResult.Builder addUpdateStatement(String sql) { - log.info(String.format("Add update sql: %s", sql)); + log.debug(String.format("Add update sql: %s", sql)); if (sql.startsWith(ASSOCIATION_STATEMENT_PREFIX)) { updateAssociationTasksBuilder.add(unboxAssociationStatement(sql)); } else { @@ -111,7 +111,7 @@ public class OneSideSqlResult implements JsonAware { } public OneSideSqlResult.Builder addDeleteStatement(String sql) { - log.info(String.format("Add delete sql: %s", sql)); + log.debug(String.format("Add delete sql: %s", sql)); if (sql.startsWith(ASSOCIATION_STATEMENT_PREFIX)) { deleteAssociationTasksBuilder.add(unboxAssociationStatement(sql)); } else { @@ -121,7 +121,7 @@ public class OneSideSqlResult implements JsonAware { } public OneSideSqlResult.Builder addDeactivateStatement(String sql) { - log.info(String.format("Add deactivate sql: %s", sql)); + log.debug(String.format("Add deactivate sql: %s", sql)); deactivateTasksBuilder.add(sql); return this; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/92dab31dab1b1dce1f42941c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/92dab31dab1b1dce1f42941c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Faille sur l'UI de remplacement de code de référentiel - Closes #2917
by Tony CHEMIT (＠tchemit) 17 Aug '24

17 Aug '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 09fab1d5 by Tony Chemit at 2024-07-11T12:39:44+02:00 Faille sur l'UI de remplacement de code de référentiel - Closes #2917 - - - - - c7def86d by Tony Chemit at 2024-07-11T13:45:54+02:00 fix CI - - - - - 4104a3af by Tony Chemit at 2024-08-17T17:29:05+02:00 update pom - - - - - dc83d313 by Tony Chemit at 2024-08-17T17:29:05+02:00 Amélioration des poids +10/-10 et total des échantillons lors de l'import AVDTH - Closes #2918 - - - - - 92dab31d by Tony Chemit at 2024-08-17T17:41:59+02:00 Mettre à null le commentaire Trip.logbookComment si celui ci n'est constitué que d'espaces - Closes #2923 - - - - - 11 changed files: - .gitlab-ci.yml - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Apply.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/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripReader.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/SampleReader.java - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -35,7 +35,7 @@ cache: services: - docker:dind script: - - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-11 gitlab-ci-token ${CI_REGISTRY_PASSWORD} ${BUILD_DIR}; fi + - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-11 gitlab-ci-token ${CI_REGISTRY_PASSWORD}; fi .build: &build environment: ===================================== client/datasource/actions/src/main/i18n/getters/java.getter ===================================== @@ -122,6 +122,7 @@ observe.ui.datasource.editor.actions.synchro.referential.action.revertFromRight. observe.ui.datasource.editor.actions.synchro.referential.description observe.ui.datasource.editor.actions.synchro.referential.launch.operation observe.ui.datasource.editor.actions.synchro.referential.legacy +observe.ui.datasource.editor.actions.synchro.referential.legacy.apply.operation observe.ui.datasource.editor.actions.synchro.referential.legacy.description observe.ui.datasource.editor.actions.synchro.referential.legacy.launch.operation observe.ui.datasource.editor.actions.synchro.referential.legacy.tip ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUIHandler.java ===================================== @@ -29,6 +29,8 @@ import fr.ird.observe.services.service.referential.synchro.UnidirectionalCallbac import io.ultreia.java4all.decoration.Decorator; import io.ultreia.java4all.i18n.I18n; import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.CardLayout2; import org.nuiton.jaxx.runtime.swing.model.JaxxDefaultListModel; @@ -48,6 +50,8 @@ import java.util.Set; @SuppressWarnings({"rawtypes", "unchecked"}) public class SynchronizeUIHandler extends AdminTabUIHandler<SynchronizeUI> implements UIHandler<SynchronizeUI> { + private static final Logger log = LogManager.getLogger(SynchronizeUIHandler.class); + @Override public void afterInit(SynchronizeUI ui) { super.afterInit(ui); @@ -73,8 +77,19 @@ public class SynchronizeUIHandler extends AdminTabUIHandler<SynchronizeUI> imple } SynchronizeModel stepModel = ui.getStepModel(); int row = stepModel.getObsoleteReferencesSelectionModel().getMinSelectionIndex(); + log.info("Selected row in obsolete references list: {}", row); JaxxDefaultListModel<ObsoleteReferentialReference<?>> obsoleteReferences = stepModel.getObsoleteReferences(); - if (row != -1 && obsoleteReferences.getElementAt(row) != null) { + if (row == -1) { + // No selection in the obsolete list + FilterableComboBox<ToolkitIdLabel> safeComboBox = getSafeComboBox(); + if (safeComboBox != null) { + safeComboBox.setSelectedItem(null); + safeComboBox.setEnabled(false); + ui.setCanApply(false); + } + return; + } + if (obsoleteReferences.getElementAt(row) != null) { ObsoleteReferentialReference referentialReference = obsoleteReferences.getElementAt(row); String key = referentialReference.getReferentialName().getName(); CardLayout2 safeRefsPanelLayout = ui.getSafeRefsPanelLayout(); @@ -82,6 +97,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler<SynchronizeUI> imple if (safeRefsPanelLayout.contains(key)) { // la liste déroulante existe deja pour ce type FilterableComboBox<?> list = (FilterableComboBox<?>) safeRefsPanelLayout.getComponent(safeRefsPanel, key); + list.setEnabled(true); if (!getSafeComboBox().equals(list)) { // on l'affiche safeRefsPanelLayout.show(safeRefsPanel, key); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Apply.java ===================================== @@ -40,15 +40,15 @@ import static io.ultreia.java4all.i18n.I18n.t; public class Apply extends SynchroUIActionSupport { public Apply() { - super(t("observe.ui.action.apply"), t("observe.ui.action.apply"), "accept", 'Q'); + super(t("observe.ui.action.apply"), t("observe.ui.datasource.editor.actions.synchro.referential.legacy.apply.operation"), "accept", 'Q'); } @Override protected void doActionPerformed(ActionEvent e, SynchronizeUI ui) { - resolveObsoleteReference(); + addAdminWorker(getUi().getStart().getToolTipText(), this::resolveObsoleteReference); } - private <D extends ReferentialDto> void resolveObsoleteReference() { + private <D extends ReferentialDto> WizardState resolveObsoleteReference() { @SuppressWarnings("unchecked") ObsoleteReferentialReference<D> obsoleteRef = (ObsoleteReferentialReference<D>) ui.getObsoleteReferencesList().getSelectedValue(); @@ -74,10 +74,11 @@ public class Apply extends SynchroUIActionSupport { try (ObserveSwingDataSource centralSource = ObserveSwingDataSource.doOpenSource(stepModel.getCentralSource())) { UnidirectionalSynchronizeEngine engine = stepModel.newEngine(); beforeSuccess(engine); - ui.getModel().setStepState(WizardState.SUCCESSED); + return WizardState.SUCCESSED; } } } + return WizardState.NEED_FIX; } } ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -619,6 +619,7 @@ observe.ui.datasource.editor.actions.synchro.referential.action.revertFromRight. observe.ui.datasource.editor.actions.synchro.referential.description=Advanced referential management observe.ui.datasource.editor.actions.synchro.referential.launch.operation=Compute differentials of referential observe.ui.datasource.editor.actions.synchro.referential.legacy=Update referential +observe.ui.datasource.editor.actions.synchro.referential.legacy.apply.operation=Apply remplacement and finalize the update if obsolete list is empty observe.ui.datasource.editor.actions.synchro.referential.legacy.description=Update referential observe.ui.datasource.editor.actions.synchro.referential.legacy.launch.operation=Synchronize referential from central database observe.ui.datasource.editor.actions.synchro.referential.legacy.tip=Synchronize object on local database ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -619,6 +619,7 @@ observe.ui.datasource.editor.actions.synchro.referential.action.revertFromRight. observe.ui.datasource.editor.actions.synchro.referential.description=Gestión avanzada del referencial observe.ui.datasource.editor.actions.synchro.referential.launch.operation=Calcular el diferencial de los referenciales de los fuentes de datos observe.ui.datasource.editor.actions.synchro.referential.legacy=Actualización del referencial +observe.ui.datasource.editor.actions.synchro.referential.legacy.apply.operation=Apply remplacement and finalize the update if obsolete list is empty \#TODO observe.ui.datasource.editor.actions.synchro.referential.legacy.description=Actualizar el referencial gracia a una base central observe.ui.datasource.editor.actions.synchro.referential.legacy.launch.operation=Calcular el diferencial de los referenciales de los fuentes de datos observe.ui.datasource.editor.actions.synchro.referential.legacy.tip=Operación de actualización del referencial de la base local ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -619,6 +619,7 @@ observe.ui.datasource.editor.actions.synchro.referential.action.revertFromRight. observe.ui.datasource.editor.actions.synchro.referential.description=Gestion avancée du référentiel observe.ui.datasource.editor.actions.synchro.referential.launch.operation=Calculer le différentiel des référentiels des sources de données observe.ui.datasource.editor.actions.synchro.referential.legacy=Mise à jour du référentiel +observe.ui.datasource.editor.actions.synchro.referential.legacy.apply.operation=Appliquer le remplacement et finir la mise à jour si la liste des références à remplacer est vide observe.ui.datasource.editor.actions.synchro.referential.legacy.description=Mettre à jour le référentiel depuis une base centrale observe.ui.datasource.editor.actions.synchro.referential.legacy.launch.operation=Calculer le différentiel des référentiels des sources de données observe.ui.datasource.editor.actions.synchro.referential.legacy.tip=Opération de mise à jour du référentiel de la base locale ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -296,16 +296,6 @@ public class ImportReferentialContext { localmarketSampleType = Objects.requireNonNull(Maps.uniqueIndex(referential.getSampleType(), SampleType::getCode).get("9")); } - - public void setNoneZeroFloat(Object o, Consumer<Float> setter) { - if (o != null) { - Float o1 = Float.valueOf(o.toString()); - if (o1.intValue() > 0) { - setter.accept(o1); - } - } - } - public SetSuccessStatus getSetSuccessStatus0() { return setSuccessStatus0; } ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripReader.java ===================================== @@ -150,7 +150,14 @@ public class TripReader extends DataReader<Trip> { entity.setStartDate(Objects.requireNonNull(startDate)); entity.setLandingWellContentStatus(dataContext.getWellContentStatus(resultSet.getString(11))); entity.setLoch(resultSet.getInt(12)); - entity.setLogbookComment(resultSet.getString(13)); + String logbookComment = resultSet.getString(13); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2923 + if (logbookComment != null) { + logbookComment = logbookComment.trim(); + if (!logbookComment.isEmpty()) { + entity.setLogbookComment(logbookComment); + } + } entity.setErsId(resultSet.getString(14)); entity.setDepartureWellContentStatus(dataContext.getWellContentStatus(resultSet.getString(15))); entity.setLogbookDataQuality(dataContext.getDataQualityA()); ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/SampleReader.java ===================================== @@ -115,12 +115,38 @@ public class SampleReader extends DataReader<Sample> { String wellId = WellReader.getWellId(resultSet, 7); entity.setWell(wellId); entity.setSuperSample(resultSet.getInt(9) == 1); - Object smallsWeight = resultSet.getObject(10); - dataContext.setNoneZeroFloat(smallsWeight, entity::setSmallsWeight); - Object bigsWeight = resultSet.getObject(11); - dataContext.setNoneZeroFloat(bigsWeight, entity::setBigsWeight); - Object totalWeight = resultSet.getObject(12); - dataContext.setNoneZeroFloat(totalWeight, entity::setTotalWeight); + entity.setSmallsWeight(((Number) resultSet.getObject(10)).floatValue()); + entity.setBigsWeight(((Number) resultSet.getObject(11)).floatValue()); + entity.setTotalWeight(((Number) resultSet.getObject(12)).floatValue()); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2918 + boolean smallsWeightNull = isNull(entity.getSmallsWeight()); + boolean bigsWeightNull = isNull(entity.getBigsWeight()); + boolean totalWeightNull = isNull(entity.getTotalWeight()); + if (smallsWeightNull && bigsWeightNull && totalWeightNull) { + entity.setSmallsWeight(null); + entity.setBigsWeight(null); + entity.setTotalWeight(0f); + return entity; + } + if (!smallsWeightNull || !bigsWeightNull) { + if (totalWeightNull) { + entity.setTotalWeight(null); + } + if (smallsWeightNull) { + entity.setSmallsWeight(0f); + } + if (bigsWeightNull) { + entity.setBigsWeight(0f); + } + return entity; + } + // now we have smallsWeightNull && bigsWeightNull + entity.setSmallsWeight(null); + entity.setBigsWeight(null); return entity; } + + private static boolean isNull(Float value) { + return Math.abs(value)-0.000001f==0; + } } ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.29</version> + <version>2024.31</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d0e69531e0fa55345f5b6fa4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d0e69531e0fa55345f5b6fa4… You're receiving this email because of your account on gitlab.com.

1 0