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

[Git][ultreiaio/ird-observe] Pushed new branch release/8.0.9
by Tony CHEMIT (＠tchemit) March 24, 2021

March 24, 2021

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

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 8.0.10-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) March 24, 2021

March 24, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 072030de by Tony Chemit at 2021-03-24T09:18:58+01:00 [jgitflow-maven-plugin]updating poms for 8.0.10-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/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/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/dto/definition/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/persistence/definition/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/pom.xml - observe/pom.xml - pom.xml - server/configuration/pom.xml - server/core/pom.xml - server/i18n/pom.xml - server/pom.xml - server/runner/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/072030de00517cd3bfdf54f88… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/072030de00517cd3bfdf54f88… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update CHANGELOG [skip ci]
by Tony CHEMIT (＠tchemit) March 24, 2021

March 24, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2f8cd4b5 by Tony Chemit at 2021-03-24T09:11:26+01:00 update CHANGELOG [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,19 +1,21 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2021-03-20 13:17. + * Last generated at 2021-03-24 09:08. ## Version [8.0.9](https://gitlab.com/ultreiaio/ird-observe/-/milestones/185) -**Closed at 2021-03-20.** +**Closed at 2021-03-24.** ### Issues * [[Anomalie 1380]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1380) **[V9] Lorsque l'on éditer un champ et que l'on enregistre sur PS trip/onglet livre de bord, le focus se déplace sur l'onglet caractéristiques** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1821]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1821) **Problème de chargement de la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 1628]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1628) **[LL][Landing] Renommer table compagnies** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Evolution 1811]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1811) **Remove BranchlineService** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 1816]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1816) **Petits ajustements sur le gestionnaire de connection** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 1818]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1818) **Réduire la taille de l'archive d'un retour d'expérience** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1819]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1819) **Amélioration de la représentation des référentiels** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [8.0.8](https://gitlab.com/ultreiaio/ird-observe/-/milestones/184) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2f8cd4b5dbabb2719f8bb77e7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2f8cd4b5dbabb2719f8bb77e7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Poblème de chargement de la carte - Closes #1821
by Tony CHEMIT (＠tchemit) March 24, 2021

March 24, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ae0b8c3e by Tony Chemit at 2021-03-24T09:03:02+01:00 Poblème de chargement de la carte - Closes #1821 - - - - - 34ad2a19 by Tony Chemit at 2021-03-24T09:03:02+01:00 Améliorer du démarrage si la base locale n'a pas pu être ouverte - Closes #1820 - - - - - 1576b356 by Tony Chemit at 2021-03-24T09:03:02+01:00 update toolkit - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/api/src/main/i18n/templates/InitStorageModel_en_GB.ftl - client/datasource/api/src/main/i18n/templates/InitStorageModel_es_ES.ftl - client/datasource/api/src/main/i18n/templates/InitStorageModel_fr_FR.ftl - client/datasource/api/src/main/java/fr/ird/observe/client/datasource/api/h2/backup/InitStorageModel.java → client/datasource/api/src/main/java/fr/ird/observe/client/datasource/api/InitStorageModel.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUI.jaxx - 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/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/AddLogbook.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/AddObservations.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/ConfigureMapAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/ToggleConfigure.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/ToggleLegend.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIOpenExecutor.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/812c918f5aeb4b543bd86100… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/812c918f5aeb4b543bd86100… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: update pom
by Tony CHEMIT (＠tchemit) March 23, 2021

March 23, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d15f5af2 by Tony Chemit at 2021-03-23T09:08:53+01:00 update pom - - - - - 9c774cfd by Tony Chemit at 2021-03-23T09:08:53+01:00 Fix and improve StorageUIModel templates - - - - - 8a47277c by Tony Chemit at 2021-03-23T10:34:47+01:00 Problème de chargement de la carte - Closes #1821 - - - - - f4e78f61 by Tony Chemit at 2021-03-23T10:34:47+01:00 Améliorer du démarrage si la base locale n'a pas pu être ouverte - Closes #1820 - - - - - 2bec5d37 by Tony Chemit at 2021-03-23T10:43:19+01:00 update toolkit - - - - - 812c918f by Tony Chemit at 2021-03-23T16:33:42+01:00 Problème de chargement de la carte - See #1821 - - - - - 30 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/api/src/main/i18n/templates/InitStorageModel_en_GB.ftl - client/datasource/api/src/main/i18n/templates/InitStorageModel_es_ES.ftl - client/datasource/api/src/main/i18n/templates/InitStorageModel_fr_FR.ftl - client/datasource/api/src/main/java/fr/ird/observe/client/datasource/api/h2/backup/InitStorageModel.java → client/datasource/api/src/main/java/fr/ird/observe/client/datasource/api/InitStorageModel.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_en_GB.ftl - client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_es_ES.ftl - client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_fr_FR.ftl - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUI.jaxx - 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/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/AddLogbook.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/AddObservations.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/ConfigureMapAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/ToggleConfigure.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/ToggleLegend.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/TripMapUIActionSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5981cc31f09433abeb785731… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5981cc31f09433abeb785731… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix and improve StorageUIModel templates
by Tony CHEMIT March 22, 2021

March 22, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5981cc31 by Tony Chemit at 2021-03-22T09:55:16+01:00 Fix and improve StorageUIModel templates - - - - - 3 changed files: - client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_en_GB.ftl - client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_es_ES.ftl - client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_fr_FR.ftl Changes: ===================================== client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_en_GB.ftl ===================================== @@ -76,11 +76,42 @@ </ul> </#if> <#else> - <#if .data_model.initModel.onConnectModeLocal> - <h2>Connection to the local database</h2> + <#if .data_model.initModel.onConnectMode> + <#if .data_model.initModel.onConnectModeLocal> + <h2>Connection to the local database</h2> - <@storageInfo.storageModelDataSourceInformation .data_model/> + <@storageInfo.storageModelDataSourceInformation .data_model/> + <#elseif .data_model.initModel.onConnectModeRemote> + <#if !.data_model.adminAction??> + <h2>Remote database connection</h2> + <hr/> + <h3>Remote database information :</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <#else> + <h2>${.data_model.adminActionLabel}</h2> + <hr/> + <h3>Remote connection information:</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <@storageInfo.onAdminActionCreate .data_model /> + <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> + </#if> + + <#elseif .data_model.initModel.onConnectModeServer> + <#if !.data_model.adminAction??> + <h2>Remote server connection</h2> + <hr/> + <h3>Remote server informations:</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <#else> + <h2>${.data_model.adminAction.label}</h2> + <hr/> + <h3>Remote server informations :</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <@storageInfo.onAdminActionCreate .data_model /> + <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> + </#if> + </#if> <#elseif .data_model.initModel.onCreateMode> <#if .data_model.doBackup> <h2>Local database backup</h2> @@ -109,36 +140,6 @@ <h3>Reference data import from a remote server:</h3> <@storageInfo.storageModelDataSourceInformation .data_model /> </#if> - - <#elseif .data_model.initModel.onConnectModeRemote> - <#if !.data_model.adminAction??> - <h2>Remote database connection</h2> - <hr/> - <h3>Remote database information :</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <#else> - <h2>${.data_model.adminActionLabel}</h2> - <hr/> - <h3>Remote connection information:</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <@storageInfo.onAdminActionCreate .data_model /> - <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> - </#if> - - <#elseif .data_model.initModel.onConnectModeServer>> - <#if !.data_model.adminAction??> - <h2>Remote server connection</h2> - <hr/> - <h3>Remote server informations:</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <#else> - <h2>${.data_model.adminAction.label}</h2> - <hr/> - <h3>Remote server informations :</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <@storageInfo.onAdminActionCreate .data_model /> - <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> - </#if> </#if> <h3>Update policy</h3> <ul> ===================================== client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_es_ES.ftl ===================================== @@ -77,10 +77,42 @@ </ul> </#if> <#else> - <#if .data_model.initModel.onConnectModeLocal> - <h2>Conexión a la base local</h2> - <@storageInfo.storageModelDataSourceInformation .data_model/> + <#if .data_model.initModel.onConnectMode> + <#if .data_model.initModel.onConnectModeLocal> + <h2>Conexión a la base local</h2> + <@storageInfo.storageModelDataSourceInformation .data_model/> + <#elseif .data_model.initModel.onConnectModeRemote> + <#if !.data_model.adminAction??> + <h2>Conexión a una base remota</h2> + <hr/> + <h3>Informaciones sobre la base remota a utilizar:</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <#else> + <h2>${.data_model.adminActionLabel}</h2> + <hr/> + <h3>Informaciones sobre la base remota a utilizar:</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + + <@storageInfo.onAdminActionCreate .data_model /> + <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> + </#if> + + <#elseif .data_model.initModel.onConnectModeServer>> + <#if !.data_model.adminAction??> + <h2>Connexion a un servicio web remoto</h2> + <hr/> + <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <#else> + <h2>${.data_model.adminAction.label}</h2> + <hr/> + <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <@storageInfo.onAdminActionCreate .data_model /> + <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> + </#if> + </#if> <#elseif .data_model.initModel.onCreateMode> <#if .data_model.doBackup> <h2>Copia de seguridad de la base local</h2> @@ -109,37 +141,6 @@ <h3>Importación del referencial con un servicio web remoto:</h3> <@storageInfo.storageModelDataSourceInformation .data_model /> </#if> - - <#elseif .data_model.initModel.onConnectModeRemote> - <#if !.data_model.adminAction??> - <h2>Conexión a una base remota</h2> - <hr/> - <h3>Informaciones sobre la base remota a utilizar:</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <#else> - <h2>${.data_model.adminActionLabel}</h2> - <hr/> - <h3>Informaciones sobre la base remota a utilizar:</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - - <@storageInfo.onAdminActionCreate .data_model /> - <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> - </#if> - - <#elseif .data_model.initModel.onConnectModeServer>> - <#if !.data_model.adminAction??> - <h2>Connexion a un servicio web remoto</h2> - <hr/> - <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <#else> - <h2>${.data_model.adminAction.label}</h2> - <hr/> - <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <@storageInfo.onAdminActionCreate .data_model /> - <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> - </#if> </#if> <h3>Política de actualización</h3> <ul> ===================================== client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_fr_FR.ftl ===================================== @@ -77,10 +77,40 @@ </ul> </#if> <#else> - <#if .data_model.initModel.onConnectModeLocal> - <h2>Connection à la base locale</h2> - <@storageInfo.storageModelDataSourceInformation .data_model/> + <#if .data_model.initModel.onConnectMode> + <#if .data_model.initModel.onConnectModeLocal> + <h2>Connection à la base locale</h2> + <@storageInfo.storageModelDataSourceInformation .data_model/> + <#elseif .data_model.initModel.onConnectModeRemote> + <#if !.data_model.adminAction??> + <h2>Connexion directe à une base distante</h2> + <hr/> + <h3>Informations sur la base distante à utiliser :</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <#else> + <h2>${.data_model.adminActionLabel}</h2> + <hr/> + <h3>Informations sur la base distante à utiliser :</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <@storageInfo.onAdminActionCreate .data_model /> + <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> + </#if> + <#elseif .data_model.initModel.onConnectModeServer>> + <#if !.data_model.adminAction??> + <h2>Connexion à un service web distant</h2> + <hr/> + <h3>Informations sur le service web distant à utiliser :</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <#else> + <h2>${.data_model.adminAction.label}</h2> + <hr/> + <h3>Informations sur le service web à utiliser :</h3> + <@storageInfo.storageModelDataSourceInformation .data_model /> + <@storageInfo.onAdminActionCreate .data_model /> + <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> + </#if> + </#if> <#elseif .data_model.initModel.onCreateMode> <#if .data_model.doBackup> <h2>Sauvegarde de la base locale</h2> @@ -109,37 +139,6 @@ <h3>Import du référentiel depuis un service web distant :</h3> <@storageInfo.storageModelDataSourceInformation .data_model /> </#if> - - <#elseif .data_model.initModel.onConnectModeRemote> - <#if !.data_model.adminAction??> - <h2>Connexion directe à une base distante</h2> - <hr/> - <h3>Informations sur la base distante à utiliser :</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <#else> - <h2>${.data_model.adminActionLabel}</h2> - <hr/> - <h3>Informations sur la base distante à utiliser :</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - - <@storageInfo.onAdminActionCreate .data_model /> - <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> - </#if> - - <#elseif .data_model.initModel.onConnectModeServer>> - <#if !.data_model.adminAction??> - <h2>Connexion à un service web distant</h2> - <hr/> - <h3>Informations sur le service web distant à utiliser :</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <#else> - <h2>${.data_model.adminAction.label}</h2> - <hr/> - <h3>Informations sur le service web à utiliser :</h3> - <@storageInfo.storageModelDataSourceInformation .data_model /> - <@storageInfo.onAdminActionCreate .data_model /> - <@storageInfo.security securityModel=.data_model.securityModel dataSourceInformation=.data_model.dataSourceInformation /> - </#if> </#if> <h3>Politique de mise à jour</h3> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5981cc31f09433abeb7857310… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5981cc31f09433abeb7857310… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update jaxx
by Tony CHEMIT March 21, 2021

March 21, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a1e16e92 by Tony Chemit at 2021-03-21T11:41:07+01:00 update jaxx - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -161,7 +161,7 @@   -  + <lib.version.java4all.jaxx>3.0.0-RC-4</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a1e16e92b785298e676ea7cbb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a1e16e92b785298e676ea7cbb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 22 commits: Ajout des référentiels PS_LOGBOOK - Closes #1803
by Tony CHEMIT March 21, 2021

March 21, 2021

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: fab94ba4 by Tony Chemit at 2021-03-21T11:10:11+01:00 Ajout des référentiels PS_LOGBOOK - Closes #1803 - - - - - fdbb347f by Tony Chemit at 2021-03-21T11:10:11+01:00 Ajout des référentiels PS_LANDING - See #1805 - - - - - 1397d884 by Tony Chemit at 2021-03-21T11:10:11+01:00 Ajout des référentiels PS_LOCALMARKET - See #1806 - - - - - 3c80c300 by Tony Chemit at 2021-03-21T11:10:11+01:00 clean tag values - - - - - 40b4d058 by Tony Chemit at 2021-03-21T11:10:11+01:00 Ajout des données PS_LOGBOOK - See #1808 - - - - - 614b13b2 by Tony Chemit at 2021-03-21T11:10:11+01:00 Remove BranchlineService - Closes #1811 - - - - - 57a253b6 by Tony Chemit at 2021-03-21T11:10:11+01:00 Ajout des données PS_LANDING - See #1809 - - - - - de60677f by Tony Chemit at 2021-03-21T11:10:11+01:00 Modification du formulaire Trip - See #1813 - - - - - ee495083 by Tony Chemit at 2021-03-21T11:16:25+01:00 Ajout des données PS_LOCALMARKET - See #1810 - - - - - 1720f48d by Tony Chemit at 2021-03-21T11:16:27+01:00 Ajout des données PS_LOGBOOK - See #1808 - - - - - 32c1e13c by Tony Chemit at 2021-03-21T11:16:27+01:00 Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - db787753 by Tony Chemit at 2021-03-21T11:16:27+01:00 FIX installCreateNewOpenableAction NPE - - - - - d506127c by Tony Chemit at 2021-03-21T11:16:27+01:00 FIX ListUI title - - - - - 783911e4 by Tony Chemit at 2021-03-21T11:16:27+01:00 Fix newDataReferenceDecorateTableCellRenderer method (generating with a hard coded context, but may not exists, so catch it...) - - - - - e03322b9 by Tony Chemit at 2021-03-21T11:16:27+01:00 Add FIXME - - - - - 57064bf7 by Tony Chemit at 2021-03-21T11:16:27+01:00 Add new method to firePropertyChanged from outside on states - - - - - 895052fb by Tony Chemit at 2021-03-21T11:16:27+01:00 Génération des nœuds des référentiels - See #1819 - - - - - e1af2816 by Tony Chemit at 2021-03-21T11:16:27+01:00 Realign code to Open UI - - - - - 5fd5f1c0 by Tony Chemit at 2021-03-21T11:16:27+01:00 Fix Sample UI Loading - - - - - f19a720f by Tony Chemit at 2021-03-21T11:16:27+01:00 Improve EditableDataServiceLocalSupport (manage now single or multiple association type) - - - - - 04dab723 by Tony Chemit at 2021-03-21T11:16:27+01:00 update toolkit - - - - - 031e2d15 by Tony Chemit at 2021-03-21T11:16:27+01:00 update jaxx - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.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/selection/RootSelectionTreeNodeProvider.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/nodes/RootSelectionTreeNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorNavigationModuleContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/SelectEditDataAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationTreeNodeProvider.java - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/CommonRootNavigationTreeNodeProvider.java - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/CommonRootSelectionTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootNavigationTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootSelectionTreeNodeProvider.java - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.capabilities - + client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripLocalMarketUI.capabilities - + client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.capabilities - + client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/logbook/RouteUI.capabilities - + client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/logbook/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/PsRootNavigationTreeNodeProvider.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootSelectionTreeNodeProvider.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/629f01af5f1edb203abb26b8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/629f01af5f1edb203abb26b8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 13 commits: Add FIXME
by Tony CHEMIT March 21, 2021

March 21, 2021

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 31dbcfb0 by Tony Chemit at 2021-03-20T15:44:07+01:00 Add FIXME - - - - - 70a5368e by Tony Chemit at 2021-03-20T16:19:36+01:00 Add new method to firePropertyChanged from outside on states - - - - - a4dcdd7f by Tony Chemit at 2021-03-20T16:19:50+01:00 Ajout des données PS_LOGBOOK - See #1808 - - - - - 10c518a6 by Tony Chemit at 2021-03-20T16:32:43+01:00 Ajout des données PS_LOGBOOK - See #1808 - - - - - e32aae63 by Tony Chemit at 2021-03-20T18:23:11+01:00 Génération des nœuds des référentiels - See #1819 - - - - - 7bd9cdaf by Tony Chemit at 2021-03-20T23:42:05+01:00 Ajout des données PS_LOCALMARKET - See #1810 - - - - - ccf987b8 by Tony Chemit at 2021-03-21T01:52:23+01:00 Ajout des données PS_LOGBOOK - See #1808 - - - - - 0885b69f by Tony Chemit at 2021-03-21T01:52:23+01:00 Realign code to Open UI - - - - - 04cc67ba by Tony Chemit at 2021-03-21T01:52:23+01:00 Fix Sample UI Loading - - - - - e633058d by Tony Chemit at 2021-03-21T01:52:23+01:00 Improve EditableDataServiceLocalSupport (manage now single or multiple association type) - - - - - 13d49b11 by Tony Chemit at 2021-03-21T01:52:23+01:00 update toolkit - - - - - b37cef68 by Tony Chemit at 2021-03-21T02:27:40+01:00 update jaxx - - - - - 629f01af by Tony Chemit at 2021-03-21T02:28:39+01:00 Modification du formulaire Trip - See #1813 - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.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/selection/RootSelectionTreeNodeProvider.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/nodes/RootSelectionTreeNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorNavigationModuleContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/SelectEditDataAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationTreeNodeProvider.java - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/CommonRootNavigationTreeNodeProvider.java - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/CommonRootSelectionTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootNavigationTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootSelectionTreeNodeProvider.java - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootNavigationTreeNodeProvider.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootSelectionTreeNodeProvider.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - 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/logbook/ActivityUI.jaxx - 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/SampleSpeciesSizeUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesSizeUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SetCatchUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SetCatchUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SetCatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/TripWellPlanUIModelStates.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/TripWellPlanUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SetCatchUIHandler.java → client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/WeightCategoryHelper.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/75162f0d70a467349e333151… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/75162f0d70a467349e333151… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Génération des nœuds des référentiels - See #1819
by Tony CHEMIT March 20, 2021

March 20, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 324f44c1 by Tony Chemit at 2021-03-20T18:22:37+01:00 Génération des nœuds des référentiels - See #1819 - - - - - 9957c389 by Tony Chemit at 2021-03-20T23:45:47+01:00 Realign code to Open UI - - - - - dabdc097 by Tony Chemit at 2021-03-20T23:49:25+01:00 Improve EditableDataServiceLocalSupport (manage now single or multiple association type) - - - - - 38cc77f6 by Tony Chemit at 2021-03-20T23:49:29+01:00 update toolkit - - - - - 14 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/RootSelectionTreeNodeProvider.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/nodes/RootSelectionTreeNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationTreeNodeProvider.java - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/CommonRootNavigationTreeNodeProvider.java - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/CommonRootSelectionTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootNavigationTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootSelectionTreeNodeProvider.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootNavigationTreeNodeProvider.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootSelectionTreeNodeProvider.java - pom.xml - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/EditableDataServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectServiceLocalSupport.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java ===================================== @@ -42,24 +42,30 @@ public class ContentEditUIOpenExecutor<D extends EditableDto, U extends ContentE @Override public void loadContent(U ui) { - // suppression des messages de validation - ContentUIHandler.removeAllMessages(ui); - ContentEditUIHandler<D, U> handler = ui.getHandler(); handler.getContentOpen().resetCoordinateEditors(); //FIXME chemit 20100913 : il vaudrait le faire uniquement lors de l'édition // chaque arrive sur un écran invalide le cache de validation getClientValidationContext().reset(); - ContentEditUIModel<D> model = ui.getModel(); - Form<D> form = model.openForm(handler, model.getStates().getSelectedId()); - handler.getContentOpen().onOpenForm(form); - handler.onOpenAfterOpenModel(); + // suppression des messages de validation + ContentUIHandler.removeAllMessages(ui); + + openModel(ui); handler.fixFormSize(); handler.onEndOpenUI(); } + public void openModel(U ui) { + ContentEditUIModel<D> model = ui.getModel(); + String selectedId = model.getStates().getSelectedId(); + ContentEditUIHandler<D, U> handler = ui.getHandler(); + Form<D> form = model.openForm(handler, selectedId); + handler.getContentOpen().onOpenForm(form); + handler.onOpenAfterOpenModel(); + } + @Override public void startEdit(U ui) { ContentEditUIModel<D> model = ui.getModel(); @@ -67,6 +73,7 @@ public class ContentEditUIOpenExecutor<D extends EditableDto, U extends ContentE handler.getContentOpen().prepareValidationContext(); handler.getContentOpen().installValidators(model.getStates().getBean()); ui.getHandler().getContentOpen().startEditTabUIModel(); + model.getStates().setModified(model.getStates().isCreatingMode()); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/RootSelectionTreeNodeProvider.java ===================================== @@ -23,7 +23,11 @@ package fr.ird.observe.client.datasource.editor.api.content.selection; */ import fr.ird.observe.client.configuration.NavigationTreeConfig; +import fr.ird.observe.client.datasource.editor.api.content.referential.ReferentialHomeUINavigationNode; import fr.ird.observe.client.datasource.editor.api.content.selection.nodes.RootSelectionTreeNode; +import fr.ird.observe.client.datasource.editor.api.content.selection.nodes.ref.ReferentialListSelectionTreeNode; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationTreeNodeProvider; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.services.service.data.SelectionResult; @@ -31,7 +35,7 @@ import fr.ird.observe.spi.module.BusinessModule; import fr.ird.observe.spi.module.BusinessProject; import fr.ird.observe.spi.module.ObserveBusinessModule; -import java.util.Locale; +import java.util.List; import java.util.Objects; /** @@ -45,18 +49,26 @@ public abstract class RootSelectionTreeNodeProvider { private final BusinessModule module; private final int priority; - public static String getIconSuffix(BusinessModule module) { - return module.getName().equals("common") ? "" : ("_" + module.getName()); - } - protected RootSelectionTreeNodeProvider(BusinessProject project, BusinessModule module) { this.module = Objects.requireNonNull(module); this.priority = Objects.requireNonNull(project).getModulePriority(module); } - public abstract void initRootDataNode(DecoratorService decoratorService, NavigationTreeConfig config, SelectionResult navigationResult, RootSelectionTreeNode rootNode); + public void initRootDataNode(DecoratorService decoratorService, NavigationTreeConfig config, SelectionResult navigationResult, RootSelectionTreeNode rootNode) { + // by default no data + } - public abstract void initRootReferentialNode(Locale locale, NavigationTreeConfig config, SelectionResult navigationResult, RootSelectionTreeNode rootNode); + public final void initRootReferentialNode(NavigationTreeConfig config, SelectionResult navigationResult, RootSelectionTreeNode rootNode) { + if (!config.isLoadReferential()) { + return; + } + List<Class<? extends NavigationNode>> referentialHomes = RootNavigationTreeNodeProvider.referentialHomes(getModule()); + for (Class<? extends NavigationNode> referentialHome : referentialHomes) { + @SuppressWarnings("unchecked") Class<? extends ReferentialHomeUINavigationNode> nodeType = (Class<? extends ReferentialHomeUINavigationNode>) referentialHome; + ReferentialHomeUINavigationNode node = ReferentialHomeUINavigationNode.create(nodeType, navigationResult.getReferentialCountMap()); + rootNode.add(new ReferentialListSelectionTreeNode(node)); + } + } public int priority() { return priority; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeModel.java ===================================== @@ -179,12 +179,8 @@ public class SelectionTreeModel extends DefaultTreeModel implements WithClientCo SelectionResult navigationResult = navigationService.getSelection(config.isLoadPsModule(), config.isLoadLlModule(), config.isLoadReferential()); RootSelectionTreeNode root = new RootSelectionTreeNode(); - root.initRootNode(config, decoratorService, navigationResult); - - if (config.isLoadReferential()) { - root.initRootReferentialNode(config, navigationResult, getClientConfig().getLocale()); - } + root.initRootReferentialNode(config, navigationResult); setRoot(root); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/nodes/RootSelectionTreeNode.java ===================================== @@ -33,7 +33,6 @@ import java.util.Comparator; import java.util.Enumeration; import java.util.LinkedList; import java.util.List; -import java.util.Locale; import java.util.ServiceLoader; /** @@ -114,9 +113,9 @@ public class RootSelectionTreeNode extends SelectionTreeNodeSupport<Void> { } } - public void initRootReferentialNode(NavigationTreeConfig config, SelectionResult navigationResult, Locale locale) { + public void initRootReferentialNode(NavigationTreeConfig config, SelectionResult navigationResult) { for (RootSelectionTreeNodeProvider rootNodeProvider : rootNodeProviders) { - rootNodeProvider.initRootReferentialNode(locale, config, navigationResult, this); + rootNodeProvider.initRootReferentialNode(config, navigationResult, this); } } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationTreeNodeProvider.java ===================================== @@ -28,11 +28,15 @@ import fr.ird.observe.client.configuration.NavigationTreeConfig; import fr.ird.observe.client.datasource.editor.api.content.data.list.ContentListUINavigationNode; import fr.ird.observe.client.datasource.editor.api.content.referential.ReferentialHomeUINavigationNode; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScopes; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.services.service.data.NavigationResult; +import fr.ird.observe.spi.module.BusinessModule; import fr.ird.observe.spi.module.BusinessProject; +import fr.ird.observe.spi.module.BusinessSubModule; import fr.ird.observe.spi.module.ObserveBusinessModule; import java.util.Comparator; @@ -66,9 +70,35 @@ public abstract class RootNavigationTreeNodeProvider<B extends fr.ird.observe.sp return PROVIDERS; } - protected RootNavigationTreeNodeProvider(BusinessProject project, B module, ImmutableList<Class<? extends NavigationNode>> acceptedNodeTypes, Class<? extends DtoReference> acceptedType) { + public static List<Class<? extends NavigationNode>> referentialHomes(BusinessModule module) { + ImmutableMap.Builder<Class<?>, Integer> priorityBuilder = ImmutableMap.builder(); + for (BusinessSubModule subModule : module.getSubModules()) { + priorityBuilder.put(subModule.getClass(), module.getSubModulePriority(subModule)); + } + ImmutableMap<Class<?>, Integer> priority = priorityBuilder.build(); + return NavigationScopes.get().getScopes().values().stream() + .filter(s -> Objects.equals(module.getClass(), s.getModuleType()) + && ReferentialHomeUINavigationNode.class.isAssignableFrom(s.getNodeType()) + ) + .sorted(Comparator.comparingInt(s -> priority.get(s.getSubModuleType()))) + .map(NavigationScope::getNodeType) + .collect(Collectors.toList()); + } + + + protected RootNavigationTreeNodeProvider(BusinessProject project, B module) { + this(project, module, null, null); + } + + protected RootNavigationTreeNodeProvider(BusinessProject project, B module, Class<? extends NavigationNode> acceptedEntryPointNode, Class<? extends DtoReference> acceptedType) { this.module = Objects.requireNonNull(module); - this.acceptedNodeTypes = acceptedNodeTypes; + ImmutableList.Builder<Class<? extends NavigationNode>> acceptedNodeTypes = ImmutableList.builder(); + if (acceptedEntryPointNode != null) { + acceptedNodeTypes.add(acceptedEntryPointNode); + } + List<Class<? extends NavigationNode>> referentialHomes = referentialHomes(module); + acceptedNodeTypes.addAll(referentialHomes); + this.acceptedNodeTypes = acceptedNodeTypes.build(); this.acceptedType = acceptedType; this.priority = Objects.requireNonNull(project).getModulePriority(module); } ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/CommonRootNavigationTreeNodeProvider.java ===================================== @@ -23,7 +23,6 @@ package fr.ird.observe.client.datasource.editor.common; */ import com.google.auto.service.AutoService; -import com.google.common.collect.ImmutableList; import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationTreeNodeProvider; import fr.ird.observe.spi.module.ObserveBusinessProject; import fr.ird.observe.spi.module.common.BusinessModule; @@ -36,8 +35,7 @@ import fr.ird.observe.spi.module.common.BusinessModule; public class CommonRootNavigationTreeNodeProvider extends RootNavigationTreeNodeProvider<BusinessModule> { public CommonRootNavigationTreeNodeProvider() { - super(ObserveBusinessProject.get(), ObserveBusinessProject.get().getCommonBusinessModule(), - ImmutableList.of(fr.ird.observe.client.datasource.editor.common.referential.common.ReferentialHomeUINavigationNode.class), null); + super(ObserveBusinessProject.get(), ObserveBusinessProject.get().getCommonBusinessModule()); } } ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/CommonRootSelectionTreeNodeProvider.java ===================================== @@ -23,16 +23,9 @@ package fr.ird.observe.client.datasource.editor.common; */ import com.google.auto.service.AutoService; -import fr.ird.observe.client.configuration.NavigationTreeConfig; import fr.ird.observe.client.datasource.editor.api.content.selection.RootSelectionTreeNodeProvider; -import fr.ird.observe.client.datasource.editor.api.content.selection.nodes.RootSelectionTreeNode; -import fr.ird.observe.client.datasource.editor.api.content.selection.nodes.ref.ReferentialListSelectionTreeNode; -import fr.ird.observe.dto.decoration.DecoratorService; -import fr.ird.observe.services.service.data.SelectionResult; import fr.ird.observe.spi.module.ObserveBusinessProject; -import java.util.Locale; - /** * Created on 06/10/2020. * @@ -45,13 +38,4 @@ public class CommonRootSelectionTreeNodeProvider extends RootSelectionTreeNodePr public CommonRootSelectionTreeNodeProvider() { super(ObserveBusinessProject.get(), ObserveBusinessProject.get().getCommonBusinessModule()); } - - @Override - public void initRootDataNode(DecoratorService decoratorService, NavigationTreeConfig config, SelectionResult navigationResult, RootSelectionTreeNode rootNode) { - } - - @Override - public void initRootReferentialNode(Locale locale, NavigationTreeConfig config, SelectionResult navigationResult, RootSelectionTreeNode rootNode) { - rootNode.add(new ReferentialListSelectionTreeNode(fr.ird.observe.client.datasource.editor.common.referential.common.ReferentialHomeUINavigationNode.create(navigationResult.getReferentialCountMap()))); - } -} +} \ No newline at end of file ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootNavigationTreeNodeProvider.java ===================================== @@ -23,7 +23,6 @@ package fr.ird.observe.client.datasource.editor.ll; */ import com.google.auto.service.AutoService; -import com.google.common.collect.ImmutableList; import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationNode; import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationTreeNodeProvider; import fr.ird.observe.client.datasource.editor.ll.data.common.TripListUINavigationNode; @@ -40,10 +39,11 @@ public class LlRootNavigationTreeNodeProvider extends RootNavigationTreeNodeProv public LlRootNavigationTreeNodeProvider() { super(ObserveBusinessProject.get(), ObserveBusinessProject.get().getLlBusinessModule(), - ImmutableList.of(TripListUINavigationNode.class, - fr.ird.observe.client.datasource.editor.ll.referential.common.ReferentialHomeUINavigationNode.class, - fr.ird.observe.client.datasource.editor.ll.referential.landing.ReferentialHomeUINavigationNode.class, - fr.ird.observe.client.datasource.editor.ll.referential.observation.ReferentialHomeUINavigationNode.class), +// ImmutableList.of( + TripListUINavigationNode.class, +// fr.ird.observe.client.datasource.editor.ll.referential.common.ReferentialHomeUINavigationNode.class, +// fr.ird.observe.client.datasource.editor.ll.referential.landing.ReferentialHomeUINavigationNode.class, +// fr.ird.observe.client.datasource.editor.ll.referential.observation.ReferentialHomeUINavigationNode.class), ProgramReference.class); } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootSelectionTreeNodeProvider.java ===================================== @@ -29,7 +29,6 @@ import fr.ird.observe.client.configuration.NavigationTreeConfig; import fr.ird.observe.client.datasource.editor.api.content.selection.RootSelectionTreeNodeProvider; import fr.ird.observe.client.datasource.editor.api.content.selection.nodes.ProgramSelectionTreeNode; import fr.ird.observe.client.datasource.editor.api.content.selection.nodes.RootSelectionTreeNode; -import fr.ird.observe.client.datasource.editor.api.content.selection.nodes.ref.ReferentialListSelectionTreeNode; import fr.ird.observe.client.datasource.editor.ll.data.common.TripListUINavigationNode; import fr.ird.observe.client.datasource.editor.ll.data.common.TripSelectionTreeNode; import fr.ird.observe.client.datasource.editor.ll.data.common.TripUINavigationNode; @@ -43,7 +42,6 @@ import fr.ird.observe.spi.module.ObserveBusinessProject; import javax.swing.Icon; import java.util.Collection; import java.util.Collections; -import java.util.Locale; import java.util.Map; /** @@ -80,11 +78,4 @@ public class LlRootSelectionTreeNodeProvider extends RootSelectionTreeNodeProvid } } } - - @Override - public void initRootReferentialNode(Locale locale, NavigationTreeConfig config, SelectionResult navigationResult, RootSelectionTreeNode rootNode) { - rootNode.add(new ReferentialListSelectionTreeNode(fr.ird.observe.client.datasource.editor.ll.referential.common.ReferentialHomeUINavigationNode.create(navigationResult.getReferentialCountMap()))); - rootNode.add(new ReferentialListSelectionTreeNode(fr.ird.observe.client.datasource.editor.ll.referential.landing.ReferentialHomeUINavigationNode.create(navigationResult.getReferentialCountMap()))); - rootNode.add(new ReferentialListSelectionTreeNode(fr.ird.observe.client.datasource.editor.ll.referential.observation.ReferentialHomeUINavigationNode.create(navigationResult.getReferentialCountMap()))); - } } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootNavigationTreeNodeProvider.java ===================================== @@ -23,7 +23,6 @@ package fr.ird.observe.client.datasource.editor.ps; */ import com.google.auto.service.AutoService; -import com.google.common.collect.ImmutableList; import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationNode; import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationTreeNodeProvider; import fr.ird.observe.client.datasource.editor.ps.data.common.TripListUINavigationNode; @@ -40,9 +39,10 @@ public class PsRootNavigationTreeNodeProvider extends RootNavigationTreeNodeProv public PsRootNavigationTreeNodeProvider() { super(ObserveBusinessProject.get(), ObserveBusinessProject.get().getPsBusinessModule(), - ImmutableList.of(TripListUINavigationNode.class, - fr.ird.observe.client.datasource.editor.ps.referential.common.ReferentialHomeUINavigationNode.class, - fr.ird.observe.client.datasource.editor.ps.referential.observation.ReferentialHomeUINavigationNode.class), +// ImmutableList.of( + TripListUINavigationNode.class, +// fr.ird.observe.client.datasource.editor.ps.referential.common.ReferentialHomeUINavigationNode.class, +// fr.ird.observe.client.datasource.editor.ps.referential.observation.ReferentialHomeUINavigationNode.class), ProgramReference.class); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootSelectionTreeNodeProvider.java ===================================== @@ -29,7 +29,6 @@ import fr.ird.observe.client.configuration.NavigationTreeConfig; import fr.ird.observe.client.datasource.editor.api.content.selection.RootSelectionTreeNodeProvider; import fr.ird.observe.client.datasource.editor.api.content.selection.nodes.ProgramSelectionTreeNode; import fr.ird.observe.client.datasource.editor.api.content.selection.nodes.RootSelectionTreeNode; -import fr.ird.observe.client.datasource.editor.api.content.selection.nodes.ref.ReferentialListSelectionTreeNode; import fr.ird.observe.client.datasource.editor.ps.data.common.TripListUINavigationNode; import fr.ird.observe.client.datasource.editor.ps.data.common.TripSelectionTreeNode; import fr.ird.observe.client.datasource.editor.ps.data.common.TripUINavigationNode; @@ -43,7 +42,6 @@ import fr.ird.observe.spi.module.ObserveBusinessProject; import javax.swing.Icon; import java.util.Collection; import java.util.Collections; -import java.util.Locale; import java.util.Map; /** @@ -80,10 +78,4 @@ public class PsRootSelectionTreeNodeProvider extends RootSelectionTreeNodeProvid } } } - - @Override - public void initRootReferentialNode(Locale locale, NavigationTreeConfig config, SelectionResult navigationResult, RootSelectionTreeNode rootNode) { - rootNode.add(new ReferentialListSelectionTreeNode(fr.ird.observe.client.datasource.editor.ps.referential.common.ReferentialHomeUINavigationNode.create(navigationResult.getReferentialCountMap()))); - rootNode.add(new ReferentialListSelectionTreeNode(fr.ird.observe.client.datasource.editor.ps.referential.observation.ReferentialHomeUINavigationNode.create(navigationResult.getReferentialCountMap()))); - } } ===================================== pom.xml ===================================== @@ -151,7 +151,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <toolkit.version>5.0.13</toolkit.version> + <toolkit.version>5.0.14</toolkit.version> <lib.version.ognl>3.1.28</lib.version.ognl>  ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/EditableDataServiceLocalSupport.java ===================================== @@ -50,18 +50,25 @@ public abstract class EditableDataServiceLocalSupport<PE extends Entity, D exten protected final DataDtoEntityContext<D, R, E, T> spi; protected final DtoEntityContext<?, ?, PE, ?> parentSpi; protected final String propertyName; + protected final boolean multiple; protected EditableDataServiceLocalSupport(DtoEntityContext<?, ?, PE, ?> parentSpi, DataDtoEntityContext<D, R, E, T> spi, String propertyName) { this.parentSpi = parentSpi; this.spi = spi; this.propertyName = propertyName; + this.multiple = parentSpi.isMultipleProperty(propertyName); } protected abstract void onPreCreate(PE parent, E preCreated); + @SuppressWarnings({"unchecked", "rawtypes"}) protected SaveResultDto onSave(PE parent, E entity, D dto) { if (dto.isNotPersisted()) { - parent.set(propertyName, entity); + if (multiple) { + ((Collection)parent.get(propertyName)).add( entity); + }else { + parent.set(propertyName, entity); + } } return saveEntity(spi, entity); } @@ -81,7 +88,11 @@ public abstract class EditableDataServiceLocalSupport<PE extends Entity, D exten @Override public boolean delete(String id) { - deleteSingleAssociation(id, spi, parentSpi, propertyName); + if (multiple) { + deleteMultipleAssociation(parentSpi, propertyName, spi, id); + } else { + deleteSingleAssociation(id, spi, parentSpi, propertyName); + } return false; } @@ -155,8 +166,15 @@ public abstract class EditableDataServiceLocalSupport<PE extends Entity, D exten return spi.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), id); } - protected PE getParent(String id) { - return getSingleAssociationParent(parentSpi, propertyName, id); + protected final PE getParent(String id) { + if (multiple) { + return getParent(parentSpi, propertyName, id); + } else { + return getSingleAssociationParent(parentSpi, propertyName, id); + } } + public boolean isMultiple() { + return multiple; + } } ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectServiceLocalSupport.java ===================================== @@ -46,10 +46,10 @@ import fr.ird.observe.entities.referential.common.Country; import fr.ird.observe.entities.referential.common.Vessel; import fr.ird.observe.entities.referential.ps.common.ObjectMaterial; import fr.ird.observe.entities.referential.ps.common.ObjectOperation; +import fr.ird.observe.entities.referential.ps.common.ObservedSystem; import fr.ird.observe.entities.referential.ps.common.TransmittingBuoyOperation; import fr.ird.observe.entities.referential.ps.common.TransmittingBuoyOwnership; import fr.ird.observe.entities.referential.ps.common.TransmittingBuoyType; -import fr.ird.observe.entities.referential.ps.common.ObservedSystem; import fr.ird.observe.services.local.service.data.EditableDataServiceLocalSupport; import fr.ird.observe.services.service.data.ps.observation.FloatingObjectService; import org.apache.logging.log4j.LogManager; @@ -129,11 +129,6 @@ class FloatingObjectServiceLocalSupport extends EditableDataServiceLocalSupport< return entityToForm(entity); } - @Override - protected Activity getParent(String id) { - return getParent(parentSpi, propertyName, id); - } - @Override protected void onPreCreate(Activity parent, FloatingObject preCreated) { @@ -142,9 +137,6 @@ class FloatingObjectServiceLocalSupport extends EditableDataServiceLocalSupport< @Override protected SaveResultDto onSave(Activity parent, FloatingObject entity, FloatingObjectDto dto) { log.info(String.format("Will persist %d part(s).", entity.getFloatingObjectPartSize())); - if (dto.isNotPersisted()) { - parent.addFloatingObject(entity); - } boolean addFobObservedSystem = !ProtectedIdsPs.PS_OBSERVATION_FOB_OBSERVED_SYSTEM_EXCLUDE_OPERATIONS.contains(dto.getObjectOperation().getId()) && !parent.getObservedSystemTopiaIds().contains(ProtectedIdsPs.PS_OBSERVATION_FOB_OBSERVED_SYSTEM); if (addFobObservedSystem) { @@ -152,13 +144,7 @@ class FloatingObjectServiceLocalSupport extends EditableDataServiceLocalSupport< ObservedSystem observedSystem = ObservedSystem.loadEntity(getApplicationLocale(), getTopiaPersistenceContext(), ProtectedIdsPs.PS_OBSERVATION_FOB_OBSERVED_SYSTEM); parent.addObservedSystem(observedSystem); } - return saveEntity(spi, entity); - } - - @Override - public boolean delete(String floatingObjectId) { - deleteMultipleAssociation(Activity.SPI, Activity.PROPERTY_FLOATING_OBJECT, FloatingObject.SPI, floatingObjectId); - return false; + return super.onSave(parent, entity, dto); } private List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchyDtos(List<ObjectMaterial> objectMaterials) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f4bdfee4dd142bb86f7ae2e5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f4bdfee4dd142bb86f7ae2e5… You're receiving this email because of your account on gitlab.com.

1 0