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

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.0-RC-6
by Tony CHEMIT (＠tchemit) 20 Jun '21

20 Jun '21

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

1 0

[Git][ultreiaio/ird-observe][develop-9] Update jaxx plugin
by Tony CHEMIT (＠tchemit) 20 Jun '21

20 Jun '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 1008d3c2 by Tony Chemit at 2021-06-20T18:34:01+02:00 Update jaxx plugin - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -171,7 +171,7 @@    -  + <lib.version.java4all.jaxx>3.0.0-RC-5</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1008d3c21e0a97ea973684a34… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1008d3c21e0a97ea973684a34… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 13 commits: Review TripLanding form
by Tony CHEMIT (＠tchemit) 20 Jun '21

20 Jun '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 0a86f20d by Tony Chemit at 2021-06-20T13:06:38+02:00 Review TripLanding form - - - - - 00e03707 by Tony Chemit at 2021-06-20T13:06:38+02:00 Fix some issues with decorators (with species/scientificLabel) and others... - Closes ultreiaio/ird-observe-toolkit#68 - - - - - 2a9adb5a by Tony Chemit at 2021-06-20T13:06:38+02:00 [PS][Observations] rajouter un champ horodatage - Closes ultreiaio/ird-observe#1619 - - - - - 088ecfa4 by Tony Chemit at 2021-06-20T13:06:38+02:00 Add DateEditor showReset everywhere - - - - - 8e0c0378 by Tony Chemit at 2021-06-20T13:06:38+02:00 Echantillonneurs des Seychelles - Closes ultreiaio/ird-observe#1901 - - - - - a24a599b by Tony Chemit at 2021-06-20T14:23:11+02:00 Mettre en place une nouvelle action dans le menu Source de données pour importer une base AVDTH - Closes #1902 - - - - - 04e420e4 by Tony Chemit at 2021-06-20T14:23:11+02:00 Add a new SqlService - Closes ultreiaio/ird-observe-toolkit#69 - - - - - 5d976cd3 by Tony Chemit at 2021-06-20T14:23:11+02:00 Le menu **actions** reste accessible lorsque l'application est occupée - Closes #1904 - - - - - 4485fe86 by Tony Chemit at 2021-06-20T14:23:11+02:00 Table MAREE - Champs MAREE.F_ENQ et MAREE.C_ZONE_GEO - See #1905 - - - - - 822f68c8 by Tony Chemit at 2021-06-20T14:23:11+02:00 Le filtre sur l'arbre de navigation n'est pas bien appliqué - Closes #1907 - - - - - 430b4e79 by Tony Chemit at 2021-06-20T14:23:11+02:00 Après application du filtre de navigation, si l'ancienne sélection prote sur un nœud programme qui n'est plus présent, il est réajouté, ce qui n'est pas correct - Closes #1908 - - - - - aedc4ed2 by Tony Chemit at 2021-06-20T14:23:11+02:00 Bien géré le fait que l'heure d'une activité LogBook est optionnelle - Closes #1909 - - - - - 3b80149e by Tony Chemit at 2021-06-20T14:23:11+02:00 Table ACTIVITE - champs non pris en compte - See #1910 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.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/ObserveKeyStrokesEditorApi.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - + 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/avdth/ImportDialogHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/ChooseFile.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/CopyToClipBoard.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Extract.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/AvdthDataBuilder.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Import.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Prepare.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Quit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenu.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenu.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenuModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ImportAvdthFileAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java - + client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel-error-validation.xml - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/FpaZoneUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/ProgramUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/ShipOwnerUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/VesselUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c8c53ff6209ee99605ccbf45… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c8c53ff6209ee99605ccbf45… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 4 commits: Mettre en place une nouvelle action dans le menu Source de données pour...
by Tony CHEMIT (＠tchemit) 19 Jun '21

19 Jun '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: ac9546f7 by Tony Chemit at 2021-06-19T11:25:25+02:00 Mettre en place une nouvelle action dans le menu Source de données pour importer une base AVDTH - Closes #1902 - - - - - b0443161 by Tony Chemit at 2021-06-19T11:25:25+02:00 Add a new SqlService - Closes ultreiaio/ird-observe-toolkit#69 - - - - - abf1ba5c by Tony Chemit at 2021-06-19T11:25:25+02:00 Le menu **actions** reste accessible lorsque l'application est occupée - Closes #1904 - - - - - c8c53ff6 by Tony Chemit at 2021-06-19T11:25:25+02:00 Champs MAREE.F_ENQ et MAREE.C_ZONE_GEO - See #1905 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.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/ObserveKeyStrokesEditorApi.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - + 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/avdth/ImportDialogHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/ChooseFile.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/CopyToClipBoard.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Extract.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/AvdthDataBuilder.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Import.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Prepare.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Quit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenu.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenu.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenuModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ImportAvdthFileAction.java - + client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel-error-validation.xml - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/dto/java/src/main/java/fr/ird/observe/dto/migration/avdth/AvdthDataImportConfiguration.java - models/dto/java/src/main/java/fr/ird/observe/dto/migration/avdth/AvdthDataImportResult.java - + models/dto/java/src/main/java/fr/ird/observe/dto/migration/avdth/AvdthDataPrepareResult.java - models/dto/java/src/main/java/fr/ird/observe/dto/migration/avdth/AvdthReferentialImportConfiguration.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/AvdthReferentialBuilder.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/TableReader.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c21f0ac07857a5f4c432e20d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c21f0ac07857a5f4c432e20d… You're receiving this email because of your account on gitlab.com.

1 0

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

18 Jun '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 7f635fa8 by Tony Chemit at 2021-06-18T16:47:35+02:00 update pom - - - - - 4e618d29 by Tony Chemit at 2021-06-18T16:47:35+02:00 Migration des DCP d'AVDTH vers ObServe et son modèle FOB - See #1609 - - - - - b98bf9dc by Tony Chemit at 2021-06-18T16:47:35+02:00 Faire apparaître le top niveau "FOB" dans l'UI des matériaux des FOB - Closes #1865 - - - - - 77245a54 by Tony Chemit at 2021-06-18T16:47:35+02:00 Fix EditableDataServiceLocalSupport.save method (dto was copied twice to entity which can cause big trouble) - - - - - a19b4dc5 by Tony Chemit at 2021-06-18T16:47:35+02:00 Introduce models-persistence-avdth Maven module - - - - - 7219e90c by Tony Chemit at 2021-06-18T16:47:35+02:00 Review models-persistence tests Maven modules - - - - - 5e05682c by Tony Chemit at 2021-06-18T16:47:35+02:00 Liste d'espèces accesssoires utilisées dans les lots commerciaux - See ultreiaio/ird-observe#1614 - - - - - 15fb40b7 by Tony Chemit at 2021-06-18T16:47:35+02:00 add well in references - - - - - 8521f615 by Tony Chemit at 2021-06-18T16:47:35+02:00 Make ps.logbook.Catch WellIdWare - - - - - a5e291eb by Tony Chemit at 2021-06-18T16:47:35+02:00 Produire un résultat de l'import avec quelques statistiques - See #1894 - - - - - 1933b8df by Tony Chemit at 2021-06-18T16:47:35+02:00 Petite modification sur Vessel (puissance moteur) - Closes ultreiaio/ird-observe#1891 - - - - - db27560e by Tony Chemit at 2021-06-18T16:47:35+02:00 Ajout de date sur lot de marché local - Closes ultreiaio/ird-observe#1892 - - - - - c8f2e74d by Tony Chemit at 2021-06-18T16:47:35+02:00 remove usage of nuiton-utils - - - - - 5d31d4c3 by Tony Chemit at 2021-06-18T16:47:35+02:00 Migration des données Logbook depuis AVDTH - See #1862 - - - - - 215865ba by Tony Chemit at 2021-06-18T16:47:35+02:00 Usinage des catégories des landings dans ObServe - See ultreiaio/ird-observe#1885 - - - - - c0580c91 by Tony Chemit at 2021-06-18T16:47:35+02:00 Review CollectionUniqueKey validator - Closes ultreiaio/ird-observe-toolkit#67 - - - - - 4722937e by Tony Chemit at 2021-06-18T16:47:35+02:00 Review TripLanding form - - - - - 82c8f216 by Tony Chemit at 2021-06-18T16:47:35+02:00 Fix some issues with decorators (with species/scientificLabel) and others... - Closes ultreiaio/ird-observe-toolkit#68 - - - - - ea333914 by Tony Chemit at 2021-06-18T16:47:35+02:00 [PS][Observations] rajouter un champ horodatage - Closes ultreiaio/ird-observe#1619 - - - - - f8f585a3 by Tony Chemit at 2021-06-18T16:47:35+02:00 Add DateEditor showReset everywhere - - - - - 4471fa11 by Tony Chemit at 2021-06-18T16:47:35+02:00 Echantillonneurs des Seychelles - Closes ultreiaio/ird-observe#1901 - - - - - 99ff1621 by Tony Chemit at 2021-06-18T16:47:35+02:00 Mettre en place une nouvelle action dans le menu Source de données pour importer une base AVDTH - Closes #1902 - - - - - 611e8328 by Tony Chemit at 2021-06-18T16:47:35+02:00 Add a new SqlService - Closes ultreiaio/ird-observe-toolkit#69 - - - - - c21f0ac0 by Tony Chemit at 2021-06-18T16:47:35+02:00 Le menu **actions** reste accessible lorsque l'application est occupée - Closes #1904 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/main/actions/ShowAboutAction.java - client/core/src/main/java/fr/ird/observe/client/util/busy/BusyLayerUI.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/editor/api/pom.xml - 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/ObserveKeyStrokesEditorApi.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - + 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/avdth/ImportDialogHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/ChooseFile.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/CopyToClipBoard.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Extract.java - models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/AvdthDataBuilder.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Import.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Prepare.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/dcp/FloatingObjectPartLegendTreeCellRenderer.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Quit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableMeta.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenu.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenu.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenuModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ImportAvdthFileAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeModel.java - + client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/65d4dc70d35aa3baaf11357e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/65d4dc70d35aa3baaf11357e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 37 commits: Remplir les données depuis AVDTH - See ultreiaio/ird-observe#1866
by Tony CHEMIT (＠tchemit) 12 Jun '21

12 Jun '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 48ca972c by Tony Chemit at 2021-06-08T11:24:46+02:00 Remplir les données depuis AVDTH - See ultreiaio/ird-observe#1866 - - - - - 8a2ddbda by Tony Chemit at 2021-06-08T11:24:46+02:00 Migration des TargetCatch de la v7/8 vers Catch de la v9 : Méthode d'aquisition - Closes #1870 - - - - - 6ecbf70a by Tony Chemit at 2021-06-08T11:24:46+02:00 fix maven profile missing dependency - - - - - 9ac22c99 by Tony Chemit at 2021-06-09T03:57:42+02:00 Mapping des cuves AVDTH - See ultreiaio/ird-observe#1877 Add more not null persistence constraints - - - - - 3a1d5798 by Tony Chemit at 2021-06-09T03:57:42+02:00 Quelques ajouts de champs sur la V9 - See ultreiaio/ird-observe#1744 - - - - - 77e89550 by Tony Chemit at 2021-06-09T03:57:42+02:00 Migration des données Débarquement depuis AVDTH - See ultreiaio/ird-observe#1884 - - - - - 97946a10 by Tony Chemit at 2021-06-09T03:57:42+02:00 Remplir les données depuis AVDTH - See ultreiaio/ird-observe#1866 - - - - - 1fe53a17 by Tony Chemit at 2021-06-09T03:57:42+02:00 update fixtures - - - - - e3044237 by Tony Chemit at 2021-06-09T03:57:42+02:00 Fix bad delete or move ps_logbook.Route and Activity (not-null WellPlan.activity blocks the operation, so need to remove them before removing or deleting any activity...) - - - - - 7d1a5e28 by Tony Chemit at 2021-06-09T03:57:42+02:00 Amélioration des tables PS de qualification de l'origine des donnéesAmélioration des tables PS de qualification de l'origine des données - See ultreiaio/ird-observe#1872 - - - - - 5bc5022d by Tony Chemit at 2021-06-09T03:57:42+02:00 Ajout d'un nouvel attribut **Person.psSampler** - See ultreiaio/ird-observe#1887 - - - - - cd7b8498 by Tony Chemit at 2021-06-09T03:57:42+02:00 Mapping associations AVDTH - See ultreiaio/ird-observe#1864 - - - - - 960020cc by Tony Chemit at 2021-06-10T13:41:00+02:00 Ajout de bornes min et max sur les catégories de poids - See ultreiaio/ird-observe#1886 - - - - - 4b82a08a by Tony Chemit at 2021-06-10T13:41:00+02:00 remove usage of old log4j dependencies thanks to sonatype lift report :) - - - - - 60f2a748 by Tony Chemit at 2021-06-10T13:41:00+02:00 update pom - - - - - 98ecf398 by Tony Chemit at 2021-06-10T13:41:00+02:00 Migration des DCP d'AVDTH vers ObServe et son modèle FOB - See #1609 - - - - - 17d940b3 by Tony Chemit at 2021-06-10T13:41:00+02:00 Faire apparaître le top niveau "FOB" dans l'UI des matériaux des FOB - Closes #1865 - - - - - a7d77cd5 by Tony Chemit at 2021-06-10T13:41:00+02:00 Fix EditableDataServiceLocalSupport.save method (dto was copied twice to entity which can cause big trouble) - - - - - 938e516b by Tony Chemit at 2021-06-10T13:41:00+02:00 Introduce models-persistence-avdth Maven module - - - - - 6f2151b3 by Tony Chemit at 2021-06-10T13:41:00+02:00 Review models-persistence tests Maven modules - - - - - 54633d9a by Tony Chemit at 2021-06-10T13:41:00+02:00 Liste d'espèces accesssoires utilisées dans les lots commerciaux - See ultreiaio/ird-observe#1614 - - - - - 576d8774 by Tony Chemit at 2021-06-10T13:41:00+02:00 add well in references - - - - - 5fcb815e by Tony Chemit at 2021-06-10T13:41:00+02:00 Make ps.logbook.Catch WellIdWare - - - - - 0ea36a94 by Tony Chemit at 2021-06-10T13:43:02+02:00 Produire un résultat de l'import avec quelques statistiques - See #1894 - - - - - d1d445e6 by Tony Chemit at 2021-06-10T13:43:02+02:00 Petite modification sur Vessel (puissance moteur) - Closes ultreiaio/ird-observe#1891 - - - - - de5a3223 by Tony Chemit at 2021-06-10T13:43:02+02:00 Ajout de date sur lot de marché local - Closes ultreiaio/ird-observe#1892 - - - - - d4ef499d by Tony Chemit at 2021-06-10T17:45:12+02:00 remove usage of nuiton-utils - - - - - 88957d6e by Tony Chemit at 2021-06-10T17:45:12+02:00 update pom - - - - - 4b07574e by Tony Chemit at 2021-06-10T18:28:12+02:00 Migration des données Logbook depuis AVDTH - See #1862 - - - - - f5735793 by Tony Chemit at 2021-06-10T21:16:14+02:00 Usinage des catégories des landings dans ObServe - See ultreiaio/ird-observe#1885 - - - - - eb360f17 by Tony Chemit at 2021-06-11T12:17:32+02:00 Review CollectionUniqueKey validator - Closes ultreiaio/ird-observe-toolkit#67 - - - - - efa940f7 by Tony Chemit at 2021-06-11T15:26:25+02:00 Review TripLanding form - - - - - ea80cf58 by Tony Chemit at 2021-06-11T15:26:25+02:00 Fix some issues with decorators (with species/scientificLabel) and others... - Closes ultreiaio/ird-observe-toolkit#68 - - - - - 6e7c62fc by Tony Chemit at 2021-06-12T10:47:47+02:00 [PS][Observations] rajouter un champ horodatage - Closes ultreiaio/ird-observe#1619 - - - - - 88d8bc7d by Tony Chemit at 2021-06-12T10:48:04+02:00 Add DateEditor showReset everywhere - - - - - df9af10c by Tony Chemit at 2021-06-12T12:55:01+02:00 Echantillonneurs des Seychelles - Closes ultreiaio/ird-observe#1901 - - - - - 65d4dc70 by Tony Chemit at 2021-06-12T15:36:24+02:00 Nouvelle action pour importer une base avdth (seulement sur une base locale) - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/core/pom.xml - 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/ShowAboutAction.java - client/core/src/main/java/fr/ird/observe/client/util/busy/BusyLayerUI.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/editor/api/pom.xml - 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/AvdthImportConfiguration.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/dcp/FloatingObjectPartLegendTreeCellRenderer.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/AvdthImportConfigurationHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/AvdthImportConfigurationModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/ChooseFile.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableMeta.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenu.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenu.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenuModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ImportAvdthFileAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeModel.java - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/FpaZoneUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/ProgramUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/ShipOwnerUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/VesselUI.jaxx - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/referential/common/ReferentialHomeUINavigationNode.scope The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7cb1542f55d0c8380d8f1e13… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7cb1542f55d0c8380d8f1e13… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 17 commits: Remplir les données depuis AVDTH - See ultreiaio/ird-observe#1866
by Tony CHEMIT (＠tchemit) 07 Jun '21

07 Jun '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 1fa59d95 by Tony Chemit at 2021-05-29T14:27:18+02:00 Remplir les données depuis AVDTH - See ultreiaio/ird-observe#1866 - - - - - 352bf5ab by Tony Chemit at 2021-05-29T14:27:18+02:00 Migration des TargetCatch de la v7/8 vers Catch de la v9 : Méthode d'aquisition - Closes #1870 - - - - - 00666833 by Tony Chemit at 2021-05-31T14:34:45+02:00 fix maven profile missing dependency - - - - - 47e666b5 by Tony Chemit at 2021-05-31T14:59:07+02:00 Mapping des cuves AVDTH - See ultreiaio/ird-observe#1877 Add more not null persistence constraints - - - - - 3927fb31 by Tony Chemit at 2021-06-02T12:05:39+02:00 Remplir les données depuis AVDTH - See ultreiaio/ird-observe#1866 - - - - - b66324fc by Tony Chemit at 2021-06-02T12:05:39+02:00 Quelques ajouts de champs sur la V9 - See ultreiaio/ird-observe#1744 - - - - - 7220f61f by Tony Chemit at 2021-06-04T10:44:13+02:00 Migration des données Débarquement depuis AVDTH - See ultreiaio/ird-observe#1884 - - - - - 6ec76753 by Tony Chemit at 2021-06-04T10:44:13+02:00 Remplir les données depuis AVDTH - See ultreiaio/ird-observe#1866 - - - - - 853b43b9 by Tony Chemit at 2021-06-04T12:19:22+02:00 update fixtures - - - - - d25c3fae by Tony Chemit at 2021-06-04T12:19:22+02:00 Fix bad delete or move ps_logbook.Route and Activity (not-null WellPlan.activity blocks the operation, so need to remove them before removing or deleting any activity...) - - - - - 7e50e97f by Tony Chemit at 2021-06-05T11:19:05+02:00 Amélioration des tables PS de qualification de l'origine des donnéesAmélioration des tables PS de qualification de l'origine des données - See ultreiaio/ird-observe#1872 - - - - - 29a9e79e by Tony Chemit at 2021-06-05T11:19:05+02:00 Ajout d'un nouvel attribut **Person.psSampler** - See ultreiaio/ird-observe#1887 - - - - - 6de848c3 by Tony Chemit at 2021-06-05T11:19:05+02:00 Mapping associations AVDTH - See ultreiaio/ird-observe#1864 - - - - - 3734bddd by Tony Chemit at 2021-06-05T16:35:56+02:00 Ajout de bornes min et max sur les catégories de poids - See ultreiaio/ird-observe#1886 - - - - - 15865263 by Tony Chemit at 2021-06-05T17:24:07+02:00 remove usage of old log4j dependencies thanks to sonatype lift report :) - - - - - 5098dab8 by Tony Chemit at 2021-06-05T18:04:33+02:00 update pom - - - - - 7cb1542f by Tony Chemit at 2021-06-07T12:51:15+02:00 Migration des DCP d'AVDTH vers ObServe et son modèle FOB - See #1609 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/datasource/editor/common/src/main/i18n/getters/jaxx.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/landing/TripLandingUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUIModelStates.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/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/TripWellPlanUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/landing/DestinationUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/landing/FateUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/landing/WeightCategoryUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/logbook/InformationSourceUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/logbook/WeightCategoryUI.jaxx - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/landing/DestinationUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/landing/ReferentialHomeUINavigationNode.scope - + client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/logbook/InformationSourceUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/referential/logbook/ReferentialHomeUINavigationNode.scope - client/datasource/editor/spi/pom.xml - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/definition/src/main/models/Observe/dto/01-referential-common.model - models/definition/src/main/models/Observe/dto/04-referential-ps-logbook.model - models/definition/src/main/models/Observe/dto/05-referential-ps-landing.model - models/definition/src/main/models/Observe/dto/21-data-ps-logbook.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d6ebc6aff59f414f63c18d74… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d6ebc6aff59f414f63c18d74… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Migration des TargetCatch de la v7/8 vers Catch de la v9 : Méthode d'aquisition - Closes #1870
by Tony CHEMIT (＠tchemit) 28 May '21

28 May '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: d6ebc6af by Tony Chemit at 2021-05-28T10:01:33+02:00 Migration des TargetCatch de la v7/8 vers Catch de la v9 : Méthode d'aquisition - Closes #1870 - - - - - 3 changed files: - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUIHandler.java Changes: ===================================== client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -154,6 +154,7 @@ observe.data.ps.observation.Activity.vesselActivity observe.data.ps.observation.Activity.vesselSpeed observe.data.ps.observation.Activity.wind observe.data.ps.observation.Catch.catchWeight +observe.data.ps.observation.Catch.informationSource observe.data.ps.observation.Catch.meanLength observe.data.ps.observation.Catch.meanWeight observe.data.ps.observation.Catch.reasonForDiscard ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx ===================================== @@ -31,6 +31,7 @@ fr.ird.observe.dto.referential.common.SpeciesReference fr.ird.observe.dto.referential.common.WeightMeasureMethodReference fr.ird.observe.dto.referential.ps.observation.ReasonForDiscardReference + fr.ird.observe.dto.referential.ps.observation.InformationSourceReference fr.ird.observe.client.datasource.editor.api.content.data.table.* fr.ird.observe.client.datasource.validation.ObserveSwingValidator @@ -101,11 +102,6 @@ <cell weightx='1' anchor='east'> <NumberEditor id='catchWeight' styleClass="float3"/> </cell> - <cell anchor='east'> - <JToolBar id='catchWeightComputedAction'> - <JButton id='catchWeightComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetCatchWeightComputed()'/> - </JToolBar> - </cell> </row>  @@ -127,11 +123,6 @@ <NumberEditor id='totalCount' styleClass="int6"/> </cell> - <cell anchor='east'> - <JToolBar id='totalCountComputedAction'> - <JButton id='totalCountComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetTotalCountComputed()'/> - </JToolBar> - </cell> </row>  @@ -142,11 +133,6 @@ <cell weightx='1'> <NumberEditor id='meanWeight' styleClass="float2"/> </cell> - <cell anchor='east'> - <JToolBar id='meanWeightComputedAction'> - <JButton id='meanWeightComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetMeanWeightComputed()'/> - </JToolBar> - </cell> </row>  @@ -157,11 +143,6 @@ <cell weightx='1'> <NumberEditor id='meanLength' styleClass="float2"/> </cell> - <cell anchor='east'> - <JToolBar id='meanLengthComputedAction'> - <JButton id='meanLengthComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetMeanLengthComputed()'/> - </JToolBar> - </cell> </row>  @@ -174,6 +155,16 @@ </cell> </row> +  + <row> + <cell> + <JLabel id='informationSourceLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='informationSource' genericType='InformationSourceReference'/> + </cell> + </row> +  <row> <cell columns='3' weighty='1'> @@ -183,4 +174,8 @@ </Table> + <JButton id='catchWeightComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetCatchWeightComputed()'/> + <JButton id='totalCountComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetTotalCountComputed()'/> + <JButton id='meanWeightComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetMeanWeightComputed()'/> + <JButton id='meanLengthComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetMeanLengthComputed()'/> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUIHandler.java ===================================== @@ -161,4 +161,12 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { return result; } + @Override + public void initActions() { + ui.getCatchWeight().getRightToolbar().add(ui.getCatchWeightComputedInformation()); + ui.getTotalCount().getRightToolbar().add(ui.getTotalCountComputedInformation()); + ui.getMeanWeight().getRightToolbar().add(ui.getMeanWeightComputedInformation()); + ui.getMeanLength().getRightToolbar().add(ui.getMeanLengthComputedInformation()); + super.initActions(); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d6ebc6aff59f414f63c18d74f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d6ebc6aff59f414f63c18d74f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 2 commits: Remplir les référentiels depuis AVDTH - See ultreiaio/ird-observe#1606
by Tony CHEMIT (＠tchemit) 24 May '21

24 May '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: d8697941 by Tony Chemit at 2021-05-24T13:45:57+02:00 Remplir les référentiels depuis AVDTH - See ultreiaio/ird-observe#1606 - - - - - 1fab7985 by Tony Chemit at 2021-05-24T13:50:18+02:00 Remplir les données depuis AVDTH - See ultreiaio/ird-observe#1866 - - - - - 30 changed files: - .gitignore - models/definition/src/main/models/Observe/dto/class/references.properties - + models/dto/java/src/main/java/fr/ird/observe/dto/migration/avdth/AvdthReferential.java - models/persistence/java/pom.xml - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/AvdthDataBuilder.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/AvdthReferentialBuilder.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/data/DataLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/data/TripLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/FateLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/FpaZoneLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/HarbourLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/LandingWeightCategoryLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/LogbookWeightCategoryLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/ObservedSystemLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/OceanLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/PackagingLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/ReferentialLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/SampleQualityLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/SampleTypeLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/SchoolTypeLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/SpeciesFateLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/SpeciesLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/TransmittingBuoyTypeLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/VesseLoader.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/avdth/referential/VesselActivityLoader.java - + models/persistence/java/src/test/java/fr/ird/observe/entities/ObservePersistenceFixtures.java - models/persistence/java/src/test/java/fr/ird/observe/entities/PersistenceTestSupport.java - + models/persistence/java/src/test/java/fr/ird/observe/entities/avdth/AvdthAtlanticDataBuilderTest.java - + models/persistence/java/src/test/java/fr/ird/observe/entities/avdth/AvdthDataBuilderTestSupport.java - + models/persistence/java/src/test/java/fr/ird/observe/entities/avdth/AvdthIndianDataBuilderTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/636637d8efa7e634340fe883… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/636637d8efa7e634340fe883… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Amélioration des paramètres de configuration des requêtes GET - Closes #1863
by Tony CHEMIT (＠tchemit) 20 May '21

20 May '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 636637d8 by Tony Chemit at 2021-05-20T13:45:52+02:00 Amélioration des paramètres de configuration des requêtes GET - Closes #1863 - - - - - 2 changed files: - server/core/src/main/java/fr/ird/observe/server/injector/JsonInjector.java - server/core/src/main/java/fr/ird/observe/server/injector/ObserveDtoInjector.java Changes: ===================================== server/core/src/main/java/fr/ird/observe/server/injector/JsonInjector.java ===================================== @@ -64,6 +64,9 @@ public abstract class JsonInjector<O> implements ExecutorParametersInjectorHandl Call.ParameterTree parameterTree; try { parameterTree = parameterTreeObject.get(name); + if (parameterTree == null) { + return buildNullValue(call, name, type, generic); + } Objects.requireNonNull(parameterTree); } catch (Exception e) { log.error(String.format("Could not get parameterTree for mapping: %s, call: %s - name: %s, type: %s", mapping, call, name, type), e); @@ -80,4 +83,8 @@ public abstract class JsonInjector<O> implements ExecutorParametersInjectorHandl return null; } + protected O buildNullValue(Call call, String name, Class<?> type, Type generic) { + throw new NullPointerException(String.format("By default do not accept null parameterTrees for parameter: %s with type: %s", name, type.getName())); + } + } ===================================== server/core/src/main/java/fr/ird/observe/server/injector/ObserveDtoInjector.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.server.injector; import com.google.gson.Gson; import com.google.gson.JsonParseException; import fr.ird.observe.dto.ObserveDto; +import fr.ird.observe.toolkit.navigation.tree.io.request.ToolkitRequestConfig; import io.ultreia.java4all.http.HRestClientService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -70,4 +71,11 @@ public class ObserveDtoInjector extends JsonInjector<ObserveDto> { return observeDto; } + @Override + protected ObserveDto buildNullValue(Call call, String name, Class<?> type, Type generic) { + if (ToolkitRequestConfig.class.isAssignableFrom(type)) { + return gson.fromJson("{}", generic); + } + return super.buildNullValue(call, name, type, generic); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/636637d8efa7e634340fe8835… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/636637d8efa7e634340fe8835… You're receiving this email because of your account on gitlab.com.

1 0