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

[Git][ultreiaio/ird-observe][develop] fix maven build
by Tony CHEMIT (＠tchemit) 27 Aug '21

27 Aug '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7839a610 by Tony Chemit at 2021-08-27T17:42:41+02:00 fix maven build - - - - - 1 changed file: - models/dto/java/pom.xml Changes: ===================================== models/dto/java/pom.xml ===================================== @@ -234,11 +234,6 @@ <artifactId>i18n-spi</artifactId> <version>${lib.version.java4all.i18n}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>models-dto-java</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>fr.ird.observe</groupId> <artifactId>toolkit-dto</artifactId> @@ -280,11 +275,6 @@ <artifactId>i18n-spi</artifactId> <version>${lib.version.java4all.i18n}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>models-dto-java</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>fr.ird.observe</groupId> <artifactId>toolkit-dto</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7839a61094dab0f1a4b670ba4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7839a61094dab0f1a4b670ba4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe
by Tony CHEMIT (＠tchemit) 27 Aug '21

27 Aug '21

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: a13e2dec by Tony Chemit at 2021-08-27T16:49:50+02:00 Site checkin for project ObServe - - - - - 1 changed file: - + CHANGELOG.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a13e2dec8c2fe7b809862ef70… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a13e2dec8c2fe7b809862ef70… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 31 commits: update pom
by Tony CHEMIT (＠tchemit) 27 Aug '21

27 Aug '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c15e1e6b by Tony Chemit at 2021-08-12T19:03:04+02:00 update pom - - - - - 419d2faa by Tony Chemit at 2021-08-12T19:03:04+02:00 Déporter la regex de contrôle de la syntaxe des cuves dans la configuration de l'application - Closes #1890 - - - - - 2deaf285 by Tony Chemit at 2021-08-12T19:03:04+02:00 Always getting activities with a set, so make this directly in the dao query, not after via a filter... - - - - - 58247e55 by Tony Chemit at 2021-08-12T19:03:04+02:00 Review data services (replace them by one service per data type). Now got one data service per domain, plus transversal data services (one per type), that's all! - - - - - 675cae3c by Tony Chemit at 2021-08-12T19:03:04+02:00 >From nearly two minutes to 20seconds for testing reports! - - - - - c12aa04f by Tony Chemit at 2021-08-12T19:03:04+02:00 Improve validation code - - - - - 989f060a by Tony Chemit at 2021-08-12T19:03:04+02:00 Contraindre la date de débarquement FP - Closes #1965 - - - - - aaf3efc9 by Tony Chemit at 2021-08-12T19:03:04+02:00 Introduce new tag values to characterize tableColumns (InlineDataDto and ContainerChildDto) - Closes ultreiaio/ird-observe-toolkit#96 - - - - - 3057bf8f by Tony Chemit at 2021-08-12T19:03:04+02:00 Add a new dto template **ConsolidateDtoModel** to generate missing tagValues by convention - Closes ultreiaio/ird-observe-toolkit#97 - - - - - 8bbff75b by Tony Chemit at 2021-08-12T19:03:04+02:00 Introduce generate-i18n-labels mojo to generate i18n labels using RegisterI18nLabels annotation - Closes ultreiaio/i18n#222 Introduce RegisterI18nLabels annotation to compute smart I18n labels - Closes ultreiaio/i18n#221 Introduce TypeTranslator - Closes ultreiaio/i18n#220 Add new I18n labels API - Closes ultreiaio/ird-observe-toolkit#98 - - - - - 1101282a by Tony Chemit at 2021-08-12T19:03:04+02:00 Renommage Size en SampleMeasure - Closes #1961 - - - - - c2a5063d by Tony Chemit at 2021-08-12T19:03:04+02:00 Consolidation des contraintes de nullité dans le modèle de persistance - See ultreiaio/ird-observe#1928 - - - - - e70174e7 by Tony Chemit at 2021-08-12T19:03:04+02:00 clean pom - - - - - 729d606e by Tony Chemit at 2021-08-12T19:03:04+02:00 At last remove one of the many Program objects... - - - - - 20949db3 by Tony Chemit at 2021-08-12T19:03:04+02:00 clean services i18n - - - - - fc030a7d by Tony Chemit at 2021-08-12T19:03:04+02:00 FIXME Improve generated i18n keys for InlineData and friends... - - - - - ae9954e2 by Tony Chemit at 2021-08-12T19:03:04+02:00 Rename RegisterI18nLabels to RegisterI18nLabel and introduce RegisterI18nLabels annotation - Closes ultreiaio/i18n#224 - - - - - 481ccb26 by Tony Chemit at 2021-08-18T17:17:38+02:00 Introduce models-dto-i18n and review some I18n API - - - - - 8e9df445 by Tony Chemit at 2021-08-18T17:17:38+02:00 Make generate-i18n-labels generate-resource default phase - Closes ultreiaio/i18n#225 - - - - - 0dec8ad2 by Tony Chemit at 2021-08-18T17:17:38+02:00 seal graalvm version until we apply correct fix (many warn logs) - - - - - c2df30cf by Tony Chemit at 2021-08-18T17:17:38+02:00 remove unnecessary exclusions of maven dependencies around hibernate - - - - - 02a94c66 by Tony Chemit at 2021-08-18T17:17:38+02:00 Review i18n keys - - - - - 3fe2f9a9 by Tony Chemit at 2021-08-18T17:17:38+02:00 update maven \o/ and reuse base-11 image - - - - - 29d7e391 by Tony Chemit at 2021-08-19T13:39:02+02:00 Review validation API (group it in ird.observe.validation package) - - - - - ce29dd3f by Tony Chemit at 2021-08-19T14:05:50+02:00 Review i18n keys and move to dto some enumerations Replace dummy _editors xml attribute in JAXX files by the tagValue containerChildDtoProperties ^^ - - - - - f4e25f13 by Tony Chemit at 2021-08-24T14:43:41+02:00 update pom and toolkit - - - - - 19d79aae by Tony Chemit at 2021-08-24T14:43:41+02:00 Remplir les données de marché local depuis AVDTH - See ultreiaio/ird-observe#1906 - - - - - 5a3cd7d8 by Tony Chemit at 2021-08-24T14:43:41+02:00 update tck and then remove some fix on AVDTH import - - - - - 0235e735 by Tony Chemit at 2021-08-25T15:07:58+02:00 Documentation de la migration AVDTH - See #1975 - - - - - da9f841d by Tony Chemit at 2021-08-25T15:38:39+02:00 Documentation de la migration AVDTH - See #1975 - - - - - 106fc8a9 by Tony Chemit at 2021-08-27T16:40:43+02:00 Amélioration de la documentation des configurations - Closes #1976 - - - - - 30 changed files: - .gitignore - .gitlab-ci.yml - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - − client/configuration/src/main/i18n/getters/java-enumeration.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/src/main/i18n/getters/java.getter - client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java - client/core/src/main/java/fr/ird/observe/client/util/UIFileHelper.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/treetable/JaxxComboBoxCellEditor.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/actions/pom.xml - client/datasource/actions/src/main/i18n/getters/java-enumeration.getter - 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/AdminTabUI.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUI.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/SynchroUIActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Apply.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/SwingReferentialSynchronizeTask.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/actions/RegisterTaskActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ObserveValidationMessageTableRenderer.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a9f32f07c556e285b4242e5a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a9f32f07c556e285b4242e5a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 16 commits: update pom
by Tony CHEMIT (＠tchemit) 08 Aug '21

08 Aug '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 50e4c1e1 by Tony Chemit at 2021-08-08T15:21:13+02:00 update pom - - - - - 059886a1 by Tony Chemit at 2021-08-08T15:21:13+02:00 Déporter la regex de contrôle de la syntaxe des cuves dans la configuration de l'application - Closes #1890 - - - - - beaa4861 by Tony Chemit at 2021-08-08T15:21:13+02:00 Always getting activities with a set, so make this directly in the dao query, not after via a filter... - - - - - 8c507e4f by Tony Chemit at 2021-08-08T15:21:13+02:00 Review data services (replace them by one service per data type). Now got one data service per domain, plus transversal data services (one per type), that's all! - - - - - 82a0c0a3 by Tony Chemit at 2021-08-08T15:21:13+02:00 >From nearly two minutes to 20seconds for testing reports! - - - - - cd01bd1b by Tony Chemit at 2021-08-08T15:21:13+02:00 Improve validation code - - - - - 07a86649 by Tony Chemit at 2021-08-08T15:21:13+02:00 Contraindre la date de débarquement FP - Closes #1965 - - - - - b43be2f8 by Tony Chemit at 2021-08-08T15:21:13+02:00 Introduce new tag values to characterize tableColumns (InlineDataDto and ContainerChildDto) - Closes ultreiaio/ird-observe-toolkit#96 - - - - - a344e6be by Tony Chemit at 2021-08-08T15:21:13+02:00 Add a new dto template **ConsolidateDtoModel** to generate missing tagValues by convention - Closes ultreiaio/ird-observe-toolkit#97 - - - - - c5801d67 by Tony Chemit at 2021-08-08T15:21:13+02:00 Introduce generate-i18n-labels mojo to generate i18n labels using RegisterI18nLabels annotation - Closes ultreiaio/i18n#222 Introduce RegisterI18nLabels annotation to compute smart I18n labels - Closes ultreiaio/i18n#221 Introduce TypeTranslator - Closes ultreiaio/i18n#220 Add new I18n labels API - Closes ultreiaio/ird-observe-toolkit#98 - - - - - 54f78a4d by Tony Chemit at 2021-08-08T15:21:13+02:00 Renommage Size en SampleMeasure - Closes #1961 - - - - - 96e9ef35 by Tony Chemit at 2021-08-08T15:21:13+02:00 Consolidation des contraintes de nullité dans le modèle de persistance - See ultreiaio/ird-observe#1928 - - - - - 350588bc by Tony Chemit at 2021-08-08T15:21:13+02:00 clean pom - - - - - 576b6afa by Tony Chemit at 2021-08-08T15:21:13+02:00 At last remove one of the many Program objects... - - - - - c6a502b1 by Tony Chemit at 2021-08-08T15:23:40+02:00 clean services i18n - - - - - a9f32f07 by Tony Chemit at 2021-08-08T15:52:44+02:00 FIXME Improve generated i18n keys for InlineData and friends... - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowIdExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jcss - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/referential/CommonContentI18nReferentialUI.jcss - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/referential/CommonContentReferentialUI.jcss - client/datasource/editor/common/pom.xml - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIHandler.java - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/i18n/getters/jaxx.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/localmarket/SampleSpeciesUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUITableModel.java - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUINavigationNode.scope - client/datasource/editor/ps/src/test/java/fr/ird/observe/client/datasource/editor/ps/PsNavigationTreeNodeTest.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e4ca3130eb03a779e6a05886… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e4ca3130eb03a779e6a05886… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 34 commits: Improve gitlab CI/CD
by Tony CHEMIT (＠tchemit) 06 Aug '21

06 Aug '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e17f64eb by Tony Chemit at 2021-08-04T12:11:37+02:00 Improve gitlab CI/CD - - - - - 3e3b6a63 by Tony Chemit at 2021-08-04T12:11:37+02:00 Improve PingService - Closes ultreiaio/ird-observe-toolkit#88 - - - - - af4dc880 by Tony Chemit at 2021-08-04T12:11:37+02:00 Remove generic on Entity, and hard link to dto and reference - Closes ultreiaio/ird-observe-toolkit#89 - - - - - d942b06d by Tony Chemit at 2021-08-04T12:11:37+02:00 Change gitlab tracker names - - - - - 54c74241 by Tony Chemit at 2021-08-04T12:11:37+02:00 Introduce Synchronize service - See ultreiaio/ird-observe-toolkit#92 - - - - - 7e47a25b by Tony Chemit at 2021-08-04T12:11:37+02:00 Review spi package - See ultreiaio/ird-observe-toolkit#93 - - - - - d29bc20a by Tony Chemit at 2021-08-04T12:11:37+02:00 Review UsageService and related - See ultreiaio/ird-observe-toolkit#94 - - - - - 06cecf0a by Tony Chemit at 2021-08-04T12:11:37+02:00 New decorator API \o/ - See ultreiaio/ird-observe-toolkit#95 Review ToolkitId API (need more to use as much as possible label and no more references...) - - - - - 16f6f75c by Tony Chemit at 2021-08-04T12:11:37+02:00 Fix About text - - - - - 7dc33e6a by Tony Chemit at 2021-08-04T12:45:23+02:00 Review data services (replace them by one service per data type). Now got one data service per domain, plus transversal data services (one per type), that's all! - - - - - b452d0a2 by Tony Chemit at 2021-08-04T12:45:23+02:00 add decoratorService in ObserveReferentialCache to manage as soon as possible with it, and assure for the outside world not to deal with it. - - - - - 7cd71987 by Tony Chemit at 2021-08-04T12:45:23+02:00 Supprimer l'action Reallocation du programme d'une marée. - Closes #1964 - - - - - d094891e by Tony Chemit at 2021-08-04T12:45:23+02:00 fix i18n - - - - - fe08a770 by Tony Chemit at 2021-08-04T12:45:23+02:00 fix missing binding on apply action - - - - - 920b90d4 by Tony Chemit at 2021-08-04T12:45:23+02:00 Review LocalMarket.Batch validation - - - - - 24e05d37 by Tony Chemit at 2021-08-04T12:45:23+02:00 Ajout Ps.Logbook.Activity.setCount - - - - - 8244acd9 by Tony Chemit at 2021-08-04T12:45:23+02:00 Problème de modélisation des SampleSpecies - Closes #1960 - - - - - 3d6eb42b by Tony Chemit at 2021-08-04T12:45:23+02:00 regenerate fixtures - - - - - a529a417 by Tony Chemit at 2021-08-06T14:43:10+02:00 Revoir la modélisation des échantillons de marché local - Closes #1967 Améliorer la modélisation des cuves sur l'échantillonnage local market - Closes #1966 - - - - - 46485f0b by Tony Chemit at 2021-08-06T14:43:28+02:00 Amélioration des éditeurs inline - Closes #1972 Introduce InlineDataDto - See ultreiaio/ird-observe-toolkit#95 - - - - - eebef4c1 by Tony Chemit at 2021-08-06T14:43:30+02:00 [PS] Libellé activé par défaut pour "Pays" et "Navire" (plutôt que code) dans Objet flottant/Balise - Closes #1630 - - - - - 5ce4c4ec by Tony Chemit at 2021-08-06T14:43:30+02:00 suppression fichier shared - - - - - 9d78048f by Tony Chemit at 2021-08-06T14:43:30+02:00 update pom - - - - - b0349fd5 by Tony Chemit at 2021-08-06T14:43:30+02:00 Déporter la regex de contrôle de la syntaxe des cuves dans la configuration de l'application - Closes #1890 - - - - - d811a04d by Tony Chemit at 2021-08-06T14:43:30+02:00 Always getting activities with a set, so make this directly in the dao query, not after via a filter... - - - - - 4689775e by Tony Chemit at 2021-08-06T14:43:30+02:00 Review data services (replace them by one service per data type). Now got one data service per domain, plus transversal data services (one per type), that's all! - - - - - caf26b12 by Tony Chemit at 2021-08-06T14:43:30+02:00 >From nearly two minutes to 20seconds for testing reports! - - - - - c95c0a6d by Tony Chemit at 2021-08-06T14:43:30+02:00 Improve validation code - - - - - b5ba6a72 by Tony Chemit at 2021-08-06T14:44:10+02:00 Contraindre la date de débarquement FP - Closes #1965 - - - - - 07500ccf by Tony Chemit at 2021-08-06T14:56:21+02:00 Introduce new tag values to characterize tableColumns (InlineDataDto and ContainerChildDto) - Closes ultreiaio/ird-observe-toolkit#96 - - - - - 25d264c0 by Tony Chemit at 2021-08-06T14:56:29+02:00 Add a new dto template **ConsolidateDtoModel** to generate missing tagValues by convention - Closes ultreiaio/ird-observe-toolkit#97 - - - - - 35295c64 by Tony Chemit at 2021-08-06T18:23:41+02:00 Add new I18n labels API - Closes ultreiaio/ird-observe-toolkit#98 - - - - - 57be7847 by Tony Chemit at 2021-08-06T21:00:02+02:00 Renommage Size en SampleMeasure - Closes #1961 - - - - - e4ca3130 by Tony Chemit at 2021-08-06T21:15:40+02:00 Consolidation des contraintes de nullité dans le modèle de persistance - See ultreiaio/ird-observe#1928 - - - - - 30 changed files: - .gitlab-ci.yml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/i18n/templates/about_en_GB.ftl - client/configuration/src/main/i18n/templates/about_es_ES.ftl - client/configuration/src/main/i18n/templates/about_fr_FR.ftl - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ObserveServiceInitializerConfigClient.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/actions/MainUIActionSupport.java - client/core/src/main/java/fr/ird/observe/client/main/actions/ReloadResourcesAction.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ProgramSupportDto.java → client/core/src/main/java/fr/ird/observe/client/util/DisabledItemSelectionModel.java - client/core/src/main/java/fr/ird/observe/client/util/DtoIconHelper.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/EditableList.java → client/core/src/main/java/fr/ird/observe/client/util/table/EditableList.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/EditableTableModelSupport.java → client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModel.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/common/ProgramServiceLocalSupport.java → client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModelChanged.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/EditableTableWithCacheTableModelSupport.java → client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModelWithCache.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/AbstractSelectTableAction.java → client/core/src/main/java/fr/ird/observe/client/util/table/action/AbstractSelectTableAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/MoveToNextEditableCellAction.java → client/core/src/main/java/fr/ird/observe/client/util/table/action/MoveToNextCell.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/MoveToNextEditableRowAction.java → client/core/src/main/java/fr/ird/observe/client/util/table/action/MoveToNextRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/MoveToPreviousEditableCellAction.java → client/core/src/main/java/fr/ird/observe/client/util/table/action/MoveToPreviousCell.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8a1da80b0dbc3bd3ef2422ea… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8a1da80b0dbc3bd3ef2422ea… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: regenerate fixtures
by Tony CHEMIT (＠tchemit) 01 Aug '21

01 Aug '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 99fb1e30 by Tony Chemit at 2021-08-01T02:21:28+02:00 regenerate fixtures - - - - - c46d1f09 by Tony Chemit at 2021-08-01T02:21:42+02:00 Revoir la modélisation des échantillons de marché local - Closes #1967 Améliorer la modélisation des cuves sur l'échantillonnage local market - Closes #1966 - - - - - 8c878a65 by Tony Chemit at 2021-08-01T02:21:44+02:00 Améliorations et corrections sur le rendu des tableaux inline. - - - - - 5b024406 by Tony Chemit at 2021-08-01T02:21:44+02:00 [PS] Libellé activé par défaut pour "Pays" et "Navire" (plutôt que code) dans Objet flottant/Balise - Closes #1630 - - - - - f457506d by Tony Chemit at 2021-08-01T02:21:44+02:00 suppression fichier shared - - - - - ce985621 by Tony Chemit at 2021-08-01T02:21:44+02:00 update pom - - - - - 5d627a64 by Tony Chemit at 2021-08-01T02:21:44+02:00 Déporter la regex de contrôle de la syntaxe des cuves dans la configuration de l'application - Closes #1890 - - - - - 8a1da80b by Tony Chemit at 2021-08-01T02:28:37+02:00 Improve gitlab CI/CD - - - - - 30 changed files: - .gitlab-ci.yml - client/configuration/src/main/config/Client.ini - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/EditableTableModelChanged.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/EditableTableModelSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/inline/AddNewRow.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/AddNewRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/inline/DeleteSelectedRow.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/DeleteSelectedRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/popup/AutoSelectRowAndShowPopupActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/inline/InlineTableAutoSelectRowAndShowPopupAction.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/popup/InlineTableAutoSelectRowAndShowPopupAction.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/GearUseFeaturesMeasurementsTableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripGearUseFeaturesUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/basket/BasketTableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/branchline/BranchlineTableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/section/SectionTableModel.java - + client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUI.capabilities - 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/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/GearUseFeaturesMeasurementsTableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleSpeciesMeasureTableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SamplePartUI.jaxx → client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleSpeciesUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleSpeciesUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SamplePartUIHandler.java → client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleSpeciesUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SamplePartUIModelStates.java → client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleSpeciesUIModelStates.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7c7e660db28d32faccac6e6f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7c7e660db28d32faccac6e6f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 27 commits: Assainir les paramètres des services d'UI - Closes ultreiaio/ird-observe#1957
by Tony CHEMIT (＠tchemit) 31 Jul '21

31 Jul '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5a215d0a by Tony Chemit at 2021-07-28T14:54:39+02:00 Assainir les paramètres des services d'UI - Closes ultreiaio/ird-observe#1957 - - - - - 90e62e4e by Tony Chemit at 2021-07-28T14:54:39+02:00 Erreur lors de l'affichage de l'A propos - Closes #1958 - - - - - 2c2ba185 by Tony Chemit at 2021-07-28T14:54:39+02:00 update changelog [skip ci] - - - - - ebcedf96 by Tony Chemit at 2021-07-28T14:54:39+02:00 Improve gitlab CI/CD - - - - - 9ab9e7eb by Tony Chemit at 2021-07-28T14:54:39+02:00 Improve PingService - Closes ultreiaio/ird-observe-toolkit#88 - - - - - 7aad6b65 by Tony Chemit at 2021-07-28T14:54:39+02:00 Remove generic on Entity, and hard link to dto and reference - Closes ultreiaio/ird-observe-toolkit#89 - - - - - 5069be71 by Tony Chemit at 2021-07-28T14:54:39+02:00 Change gitlab tracker names - - - - - 7d880456 by Tony Chemit at 2021-07-28T14:54:39+02:00 Introduce Synchronize service - See ultreiaio/ird-observe-toolkit#92 - - - - - a61b0f75 by Tony Chemit at 2021-07-28T14:54:39+02:00 Review spi package - See ultreiaio/ird-observe-toolkit#93 - - - - - 7ee78440 by Tony Chemit at 2021-07-28T14:54:39+02:00 Review UsageService and related - See ultreiaio/ird-observe-toolkit#94 - - - - - 7623d0c9 by Tony Chemit at 2021-07-29T18:52:09+02:00 New decorator API \o/ - See ultreiaio/ird-observe-toolkit#95 Review ToolkitId API (need more to use as much as possible label and no more references...) - - - - - d208dfe9 by Tony Chemit at 2021-07-29T18:52:09+02:00 Fix About text - - - - - 22244d66 by Tony Chemit at 2021-07-29T18:52:09+02:00 Review data services (replace them by one service per data type). - - - - - da6876cc by Tony Chemit at 2021-07-29T18:52:09+02:00 add decoratorService in ObserveReferentialCache to manage as soon as possible with it, and assure for the outside world not to deal with it. - - - - - 53d52070 by Tony Chemit at 2021-07-29T18:52:09+02:00 Supprimer l'action Reallocation du programme d'une marée. - Closes #1964 - - - - - 540016bb by Tony Chemit at 2021-07-29T18:52:09+02:00 fix i18n - - - - - a073d262 by Tony Chemit at 2021-07-29T18:52:09+02:00 fix missing binding on apply action - - - - - bd0e2582 by Tony Chemit at 2021-07-29T18:52:09+02:00 Add FIXME - - - - - 72281851 by Tony Chemit at 2021-07-29T18:52:09+02:00 Review LocalMarket.Batch validation - - - - - 702d3b28 by Tony Chemit at 2021-07-29T18:52:09+02:00 Ajout Ps.Logbook.Activity.setCount - - - - - a3251edb by Tony Chemit at 2021-08-01T00:28:58+02:00 Problème de modélisation des SampleSpecies - Closes #1960 - - - - - 1e79ed86 by Tony Chemit at 2021-08-01T00:28:58+02:00 regenerate fixtures - - - - - 6e07b52b by Tony Chemit at 2021-08-01T00:28:58+02:00 Revoir la modélisation des échantillons de marché local - Closes #1967 Améliorer la modélisation des cuves sur l'échantillonnage local market - Closes #1966 - - - - - 5b84b870 by Tony Chemit at 2021-08-01T00:28:58+02:00 Améliorations et corrections sur le rendu des tableaux inline. - - - - - f472ebf4 by Tony Chemit at 2021-08-01T00:28:58+02:00 [PS] Libellé activé par défaut pour "Pays" et "Navire" (plutôt que code) dans Objet flottant/Balise - Closes #1630 - - - - - 431b688f by Tony Chemit at 2021-08-01T00:28:58+02:00 suppression fichier shared - - - - - 7c7e660d by Tony Chemit at 2021-08-01T00:30:43+02:00 update pom - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/templates/about_en_GB.ftl - client/configuration/src/main/i18n/templates/about_es_ES.ftl - client/configuration/src/main/i18n/templates/about_fr_FR.ftl - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ObserveServiceInitializerConfigClient.java - client/configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/actions/MainUIActionSupport.java - client/core/src/main/java/fr/ird/observe/client/main/actions/ReloadResourcesAction.java - client/core/src/main/java/fr/ird/observe/client/main/actions/ShowAboutAction.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/main/callback/ObserveUICallbackManager.java - client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ProgramSupportDto.java → client/core/src/main/java/fr/ird/observe/client/util/DisabledItemSelectionModel.java - client/core/src/main/java/fr/ird/observe/client/util/DtoIconHelper.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/session/ObserveSwingSessionHelper.java - client/core/src/main/java/fr/ird/observe/client/util/treetable/JaxxComboBoxCellEditor.java - + client/core/src/main/java/fr/ird/observe/spi/decoration/ToolkitIdLabelI18nDecoratorDefinition.java - client/core/src/main/java/fr/ird/observe/dto/decoration/WithDecoratorService.java → client/core/src/main/java/fr/ird/observe/spi/decoration/WithDecoratorService.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1a4e09fe98a71f606d5c763b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1a4e09fe98a71f606d5c763b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/removeProgram
by Tony CHEMIT (＠tchemit) 28 Jul '21

28 Jul '21

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

1 0

[Git][ultreiaio/ird-observe][develop] 18 commits: back to develop
by Tony CHEMIT (＠tchemit) 28 Jul '21

28 Jul '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d283a49a by Tony Chemit at 2021-07-08T16:46:28+02:00 back to develop - - - - - 8923e573 by Tony Chemit at 2021-07-08T16:46:28+02:00 try to fix gitlab build - - - - - e835a5c4 by Tony Chemit at 2021-07-09T11:33:06+02:00 Assainissement de la configuration de l'import avdth - Closes #1956 - - - - - 6e368f0d by Tony Chemit at 2021-07-11T16:20:39+02:00 Assainir les paramètres des services d'UI - Closes ultreiaio/ird-observe#1957 - - - - - f6ffebf7 by Tony Chemit at 2021-07-11T16:20:39+02:00 Erreur lors de l'affichage de l'A propos - Closes #1958 - - - - - 6056abae by Tony Chemit at 2021-07-11T16:20:39+02:00 update changelog [skip ci] - - - - - 0ba5ad43 by Tony Chemit at 2021-07-11T16:20:39+02:00 Improve gitlab CI/CD - - - - - 632e5375 by Tony Chemit at 2021-07-11T16:28:28+02:00 Improve PingService - Closes ultreiaio/ird-observe-toolkit#88 - - - - - 1ce53b36 by Tony Chemit at 2021-07-14T10:54:21+02:00 Remove generic on Entity, and hard link to dto and reference - Closes ultreiaio/ird-observe-toolkit#89 - - - - - ae6ed0a3 by Tony Chemit at 2021-07-15T14:09:01+02:00 Change gitlab tracker names - - - - - a4ecb272 by Tony Chemit at 2021-07-17T13:17:27+02:00 Introduce Synchronize service - See ultreiaio/ird-observe-toolkit#92 - - - - - cc8af3bd by Tony Chemit at 2021-07-17T13:17:27+02:00 Review spi package - See ultreiaio/ird-observe-toolkit#93 - - - - - 16beee7e by Tony Chemit at 2021-07-17T13:17:27+02:00 Review UsageService and related - See ultreiaio/ird-observe-toolkit#94 - - - - - 77785d1c by Tony Chemit at 2021-07-28T12:18:38+02:00 New decorator API \o/ - See ultreiaio/ird-observe-toolkit#95 Review ToolkitId API (need more to use as much as possible label and no more references...) - - - - - 3fddba23 by Tony Chemit at 2021-07-28T12:18:40+02:00 Fix About text - - - - - f8f82956 by Tony Chemit at 2021-07-28T12:18:50+02:00 Review data services (replace them by one service per data type). - - - - - efaedd90 by Tony Chemit at 2021-07-28T12:18:52+02:00 add decoratorService in ObserveReferentialCache to manage as soon as possible with it, and assure for the outside world not to deal with it. - - - - - 1a4e09fe by Tony Chemit at 2021-07-28T12:18:52+02:00 Supprimer l'action Reallocation du programme d'une marée. - Closes #1964 - - - - - 30 changed files: - .gitlab-ci.yml - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - CHANGELOG.md - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/configuration/src/main/i18n/templates/about_en_GB.ftl - client/configuration/src/main/i18n/templates/about_es_ES.ftl - client/configuration/src/main/i18n/templates/about_fr_FR.ftl - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ObserveServiceInitializerConfigClient.java - client/configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/actions/MainUIActionSupport.java - client/core/src/main/java/fr/ird/observe/client/main/actions/ReloadResourcesAction.java - client/core/src/main/java/fr/ird/observe/client/main/actions/ShowAboutAction.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/main/callback/ObserveUICallbackManager.java - client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ProgramSupportDto.java → client/core/src/main/java/fr/ird/observe/client/util/DisabledItemSelectionModel.java - client/core/src/main/java/fr/ird/observe/client/util/DtoIconHelper.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/04415f1b4cc2858df0ea4547… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/04415f1b4cc2858df0ea4547… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: try to fix gitlab build
by Tony CHEMIT (＠tchemit) 08 Jul '21

08 Jul '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 15782d42 by Tony Chemit at 2021-07-08T16:39:25+02:00 try to fix gitlab build - - - - - 04415f1b by Tony Chemit at 2021-07-08T16:39:25+02:00 Assainissement de la configuration de l'import avdth - Closes #1956 - - - - - 10 changed files: - .gitlab-ci.yml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - models/dto/java/src/main/java/fr/ird/observe/dto/migration/avdth/AvdthDataImportConfiguration.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/interceptors/TripInterceptor.java - models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthDataBuilderTestSupport.java - models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/atlantic/AvdthAtlanticDataBuilderAllTest.java - models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/atlantic/AvdthAtlanticDataBuilderByYearTest.java - models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/indian/AvdthIndianDataBuilderAllTest.java - models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/indian/AvdthIndianDataBuilderByYearTest.java - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -21,13 +21,13 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat services: - docker:dind script: - - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-11 gitlab-ci-token $CI_BUILD_TOKEN; fi + - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-11-experimental gitlab-ci-token $CI_BUILD_TOKEN; fi .build-for-release: &build-for-release environment: name: test script: - - if [ -n "${BUILD_FOR_RELEASE}" ]; then ultreiaio-maven-execute 'clean verify -U -DperformRelease -Dmaven.javadoc.skip'; fi + - if [ -n "${BUILD_FOR_RELEASE}" ]; then export MAVEN_OPTS="-Xmx2048m" ; ultreiaio-maven-execute 'clean verify -U -DperformRelease -Dmaven.javadoc.skip'; fi .publish-site: &publish-site environment: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java ===================================== @@ -271,7 +271,7 @@ public class ImportDialogModel extends AbstractJavaBean { now, getIdPrefix(), getProgram().getTopiaId(), - getOcean().getCode(), + getOcean().getTopiaId(), referentialLocale, temporaryDirectory, false, ===================================== models/dto/java/src/main/java/fr/ird/observe/dto/migration/avdth/AvdthDataImportConfiguration.java ===================================== @@ -45,13 +45,13 @@ public class AvdthDataImportConfiguration implements ObserveDto { */ private final String idPrefix; /** - * Program code where to attach imported trip. + * Program id where to attach imported trip. */ - private final String programCode; + private final String programId; /** - * Ocean code where to attach imported trip. + * Ocean id where to attach imported trip. */ - private final String oceanCode; + private final String oceanId; /** * Referential locale used. */ @@ -84,8 +84,8 @@ public class AvdthDataImportConfiguration implements ObserveDto { public AvdthDataImportConfiguration(Date now, String idPrefix, - String programCode, - String oceanCode, + String programId, + String oceanId, ReferentialLocale referentialLocale, Path scriptTemporaryDirectory, boolean forceImport, @@ -95,8 +95,8 @@ public class AvdthDataImportConfiguration implements ObserveDto { ProgressionModel progressionModel) { this.now = now; this.idPrefix = idPrefix; - this.programCode = programCode; - this.oceanCode = oceanCode; + this.programId = programId; + this.oceanId = oceanId; this.referentialLocale = referentialLocale; this.scriptTemporaryDirectory = scriptTemporaryDirectory; this.forceImport = forceImport; @@ -142,12 +142,12 @@ public class AvdthDataImportConfiguration implements ObserveDto { return idPrefix; } - public String getProgramCode() { - return programCode; + public String getProgramId() { + return programId; } - public String getOceanCode() { - return oceanCode; + public String getOceanId() { + return oceanId; } public AvdthReferentialImportConfiguration toReferentialImportConfiguration() { ===================================== models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/interceptors/TripInterceptor.java ===================================== @@ -53,7 +53,6 @@ public class TripInterceptor extends DataInterceptor<Trip> { private ImmutableMap<String, Ocean> ocean; private ImmutableMap<String, Program> program; - private ImmutableMap<String, Program> programById; private ImmutableMap<String, Harbour> harbour; private ImmutableMap<String, Vessel> vessel; private ImmutableMap<String, WellContentStatus> wellContentStatus; @@ -66,9 +65,8 @@ public class TripInterceptor extends DataInterceptor<Trip> { @Override public void prepare(AvdthReferentialImportResult referential) { - ocean = Maps.uniqueIndex(referential.getOcean(), Ocean::getCode); - program = Maps.uniqueIndex(referential.getProgram().stream().filter(p -> p.getCode() != null && !Objects.equals(p.getCode(), "0")).collect(Collectors.toList()), Program::getCode); - programById = Maps.uniqueIndex(referential.getProgram(), Program::getId); + ocean = Maps.uniqueIndex(referential.getOcean(), Ocean::getId); + program = Maps.uniqueIndex(referential.getProgram(), Program::getId); harbour = Maps.uniqueIndex(referential.getHarbour(), Harbour::getCode); vessel = Maps.uniqueIndex(referential.getVessel(), Vessel::getCode); wellContentStatus = Maps.uniqueIndex(referential.getWellContentStatus(), WellContentStatus::getCode); @@ -88,15 +86,12 @@ public class TripInterceptor extends DataInterceptor<Trip> { entity.setLocalMarketSurveySamplingAcquisitionStatus(notFilledAcquisitionStatus); entity.setAdvancedSamplingAcquisitionStatus(notFilledAcquisitionStatus); entity.setHistoricalData(false); - String programCode = getContext().getProgramCode(); - Program program = this.program.get(programCode); - if (program==null) { - program = this.programById.get(programCode); - } - entity.setProgram(Objects.requireNonNull(program, String.format("Can't find program with code or id: %s", programCode))); - String oceanCode = getContext().getOceanCode(); - Ocean ocean = this.ocean.get(oceanCode); - entity.setOcean(Objects.requireNonNull(ocean, String.format("Can't find ocean with code : %s", oceanCode))); + String programId = getContext().getProgramId(); + Program program = this.program.get(programId); + entity.setProgram(Objects.requireNonNull(program, String.format("Can't find program with id: %s", programId))); + String oceanId = getContext().getOceanId(); + Ocean ocean = this.ocean.get(oceanId); + entity.setOcean(Objects.requireNonNull(ocean, String.format("Can't find ocean with id: %s", oceanId))); String vesselCode = resultSet.getString(1); Vessel vessel = this.vessel.get(vesselCode); entity.setVessel(Objects.requireNonNull(vessel,String.format("Can't find vessel code with code: %s", vesselCode))); ===================================== models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthDataBuilderTestSupport.java ===================================== @@ -106,7 +106,7 @@ public abstract class AvdthDataBuilderTestSupport extends PersistenceTestSupport protected abstract Path getRootPath(); - protected abstract String getOceanCode(); + protected abstract String getOceanId(); @CopyDatabaseConfiguration @Test @@ -119,8 +119,8 @@ public abstract class AvdthDataBuilderTestSupport extends PersistenceTestSupport AvdthDataImportConfiguration configuration = new AvdthDataImportConfiguration( ObserveFixtures.DATE, "20200601", - "9", - getOceanCode(), + "fr.ird.referential.common.Program#1239832686262#0.42751447061198444", + getOceanId(), ReferentialLocale.FR, scriptTemporaryDirectory, forceImport(), true, avdthFile, scriptPath, new ProgressionModel()); ===================================== models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/atlantic/AvdthAtlanticDataBuilderAllTest.java ===================================== @@ -48,8 +48,8 @@ public class AvdthAtlanticDataBuilderAllTest extends AvdthDataBuilderTestSupport } @Override - protected String getOceanCode() { - return "1"; + protected String getOceanId() { + return "fr.ird.referential.common.Ocean#1239832686151#0.17595105505051245"; } } ===================================== models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/atlantic/AvdthAtlanticDataBuilderByYearTest.java ===================================== @@ -48,7 +48,7 @@ public class AvdthAtlanticDataBuilderByYearTest extends AvdthDataBuilderTestSupp } @Override - protected String getOceanCode() { - return "1"; + protected String getOceanId() { + return "fr.ird.referential.common.Ocean#1239832686151#0.17595105505051245"; } } ===================================== models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/indian/AvdthIndianDataBuilderAllTest.java ===================================== @@ -57,7 +57,7 @@ public class AvdthIndianDataBuilderAllTest extends AvdthDataBuilderTestSupport { } @Override - protected String getOceanCode() { - return "2"; + protected String getOceanId() { + return "fr.ird.referential.common.Ocean#1239832686152#0.8325731048817705"; } } ===================================== models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/indian/AvdthIndianDataBuilderByYearTest.java ===================================== @@ -57,7 +57,7 @@ public class AvdthIndianDataBuilderByYearTest extends AvdthDataBuilderTestSuppor } @Override - protected String getOceanCode() { - return "2"; + protected String getOceanId() { + return "fr.ird.referential.common.Ocean#1239832686152#0.8325731048817705"; } } ===================================== pom.xml ===================================== @@ -136,7 +136,6 @@ <java.version>11</java.version> <major>9.x</major> - <maven.version>3.8.1</maven.version>  <devMode>true</devMode> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/55e69f40fbb6ec9c7c201a8b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/55e69f40fbb6ec9c7c201a8b… You're receiving this email because of your account on gitlab.com.

1 0