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

[Git][ultreiaio/ird-observe][develop] 5 commits: Correction sur PS Logbook Activity - See #1256
by Tony CHEMIT 03 Sep '20

03 Sep '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d9a9dd0d by Tony Chemit at 2020-09-03T02:45:04+02:00 Correction sur PS Logbook Activity - See #1256 - - - - - ba501eb9 by Tony Chemit at 2020-09-03T02:45:04+02:00 Correction sur PS Logbook FOB - See #1258 - - - - - 02b7176e by Tony Chemit at 2020-09-03T02:45:04+02:00 Rendre indépendante la consolidation des deux types de FOB - See #1258 - - - - - 41bfbce6 by Tony Chemit at 2020-09-03T04:04:56+02:00 [LOGBOOK PS] Position bateau vs position balise - Closes #1297 - - - - - 6b3c515f by Tony Chemit at 2020-09-03T04:05:44+02:00 Clean services - - - - - 30 changed files: - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivityUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivityUIHandler.java - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/logbook/ActivityUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/logbook/ActivityUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/logbook/ActivityUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/logbook/FloatingObjectUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/logbook/actions/ActivityUIAddFloatingObject.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/actions/ActivityUIAddFloatingObject.java - client-runner/src/main/assembly/dist/scripts/postgresql/extra/03_create-postgis-3-activity-seine.sql - dto/src/main/java/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset.java - dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/FloatingObjectDto.java - dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/RouteDto.java - dto/src/main/java/fr/ird/observe/dto/decoration/init/DataPSLogbookModelDecoratorInitializer.java - dto/src/main/models/Observe-21-data-ps-logbook.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/entities/data/ps/logbook/FloatingObjectImpl.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_1.java - persistence/src/main/models/Observe-21-data-ps-logbook.model - persistence/src/main/resources/db/migration/8.1/08_ps_logbook_create_data_model-common.sql - + persistence/src/main/resources/db/migration/8.1/09_ps_logbook_add_spatial_trigger-PG.sql - server-core/src/main/filtered-resources/mapping - services-api/src/main/java/fr/ird/observe/services/service/data/ps/ConsolidateDataService.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3da45ec65312839d84054f92… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3da45ec65312839d84054f92… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 52 commits: Make some updates for webmotion and others
by Tony CHEMIT 02 Sep '20

02 Sep '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6edc1899 by Tony Chemit at 2020-09-02T20:11:47+02:00 Make some updates for webmotion and others - - - - - 365166b5 by Tony Chemit at 2020-09-02T20:11:49+02:00 [Référentiel] Corriger un nom de champ - Closes #495 - - - - - 077c5324 by Tony Chemit at 2020-09-02T20:11:49+02:00 update pom - - - - - f947fc29 by Tony Chemit at 2020-09-02T20:11:49+02:00 Auto-chargement des rôles pour les utilisateurs de la base ciblées dans les assistants de création/mise à jour - Closes #1592 - - - - - ae742f99 by Tony Chemit at 2020-09-02T20:11:49+02:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 - - - - - 6488c67f by Tony Chemit at 2020-09-02T20:11:49+02:00 Auto-chargement des rôles pour les utilisateurs de la base ciblées dans les assistants de création/mise à jour - Closes #1592 plus un peu de ménage sur ce très vieux code - - - - - 7f05a7be by Tony Chemit at 2020-09-02T20:11:49+02:00 Generate getXXXSize method instead of sizeXXX ones + add isNotXXXEmpty Update pom - - - - - bb27fdc4 by Tony Chemit at 2020-09-02T20:11:49+02:00 remove unused contract on model - - - - - f2c6a321 by Tony Chemit at 2020-09-02T20:11:49+02:00 [V9] Sur le formulaire PS/Observations/Captures faune associée, champ "Origine de l'information" - See #1199 - - - - - 9adf201b by Tony Chemit at 2020-09-02T20:11:49+02:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 (suppression des tables résiduelles) - - - - - 9aa34e7e by Tony Chemit at 2020-09-02T20:11:49+02:00 Deplacer le réferentiel WeightCategory vers le schema ps_logbook - Closes #1594 - - - - - 25ead5b2 by Tony Chemit at 2020-09-02T20:11:49+02:00 Ajout référentiel PS Logbook WellsState - See #1300 - - - - - ef39af57 by Tony Chemit at 2020-09-02T20:11:49+02:00 [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - Closes #1300 - - - - - cd33bce9 by Tony Chemit at 2020-09-02T20:11:49+02:00 Add nice stream method - - - - - 2080a673 by Tony Chemit at 2020-09-02T20:11:49+02:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 Il manque des tables à supprimer. - - - - - 099744f9 by Tony Chemit at 2020-09-02T20:11:49+02:00 Ajout référentiel PS Logbook WellsState - See #1300 Correction d'un id Ajout d'une entrée inconnue - - - - - a221953d by Tony Chemit at 2020-09-02T20:11:49+02:00 [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - Closes #1300 Il manque generalComment dans la migration. - - - - - e0922074 by Tony Chemit at 2020-09-02T20:11:49+02:00 Make more validators skipable - - - - - e81d96db by Tony Chemit at 2020-09-02T20:11:49+02:00 Make plugin more quiet - - - - - a86b39b2 by Tony Chemit at 2020-09-02T20:11:49+02:00 Introduce DtoPropertyModification (maybe should be in java-bean project ?) - - - - - d065046f by Tony Chemit at 2020-09-02T20:11:49+02:00 Make tests from more recent databases - - - - - 8092cb08 by Tony Chemit at 2020-09-02T20:11:49+02:00 Improve SPI API (remove type in toDto and toReference methods) - - - - - db506100 by Tony Chemit at 2020-09-02T20:11:49+02:00 Let's move stuff from services to common-dto, common-service or dto : in services module just services declaration with no logic. - - - - - e2f579e8 by Tony Chemit at 2020-09-02T20:26:51+02:00 * Generate PS Logbook domain (PMD for ever) * Adapt and review Activity Pairing API - - - - - 99a1208c by Tony Chemit at 2020-09-02T20:26:54+02:00 * Add Editor action PS Activity Pairing - - - - - 21462415 by Tony Chemit at 2020-09-02T20:26:54+02:00 La reprise sur erreur en mode serveur doit être revue - Closes #1596 - - - - - 4a092947 by Tony Chemit at 2020-09-02T20:26:54+02:00 Move module services to services-api - - - - - 88ef5263 by Tony Chemit at 2020-09-02T20:26:54+02:00 clean pom - - - - - 112e5452 by Tony Chemit at 2020-09-02T20:26:54+02:00 increase apply security web service timeout (can be more than one minute) and realign the migrateData to same value (100 minutes instead of one thousand...) - - - - - 429581dc by Tony Chemit at 2020-09-02T20:26:54+02:00 clean file headers - - - - - d3244327 by Tony Chemit at 2020-09-02T20:26:54+02:00 missing i18n key - - - - - c295bef4 by Tony Chemit at 2020-09-02T20:26:54+02:00 Use new topia extension API See ultreiaio/topia-extension#42 See ultreiaio/topia-extension#43 See ultreiaio/topia-extension#44 Which permits (done on 8.1 but need to do it also on previous migration files) Figer tous les lastUpdate et topiaCreateDate dans les scripts de migration - See #1593 - - - - - 6886511b by Tony Chemit at 2020-09-02T20:26:54+02:00 Review server timeout management (was pretty lame : bad unit and default timeout always applied after request specialized values :() - Now everything is back to normal. - - - - - 5946962d by Tony Chemit at 2020-09-02T20:26:54+02:00 Remove unused service method - - - - - 43c3e8fb by Tony Chemit at 2020-09-02T20:26:54+02:00 Add new tip on install doc - - - - - 712144fc by Tony Chemit at 2020-09-02T20:26:54+02:00 If contentUI can not be opened, avoid a silly NPE - - - - - 29839182 by Tony Chemit at 2020-09-02T20:26:54+02:00 Let's display any bad exceptions (if any can be good :)) - - - - - ccd90f02 by Tony Chemit at 2020-09-02T20:26:54+02:00 Rename i18n keys - - - - - 3a1be0fa by Tony Chemit at 2020-09-02T20:26:54+02:00 Clean at last entities user code (very oldish style...) - - - - - 2aecfcd0 by Tony Chemit at 2020-09-02T20:26:54+02:00 Use last jaxx widgets API - - - - - 5f753451 by Tony Chemit at 2020-09-02T20:26:54+02:00 Make TripMap APi neutral and let's put domain style file where it belongs - - - - - f123fa2e by Tony Chemit at 2020-09-02T20:26:54+02:00 Fix some closing issues - - - - - 7ab53e46 by Tony Chemit at 2020-09-02T20:26:54+02:00 Fix veto actions on trips - - - - - 0a86f862 by Tony Chemit at 2020-09-02T20:26:54+02:00 More review on TripMap API - - - - - 49a938c1 by Tony Chemit at 2020-09-02T20:44:24+02:00 Mise à jour du module cartographie avec les nouvelles données - See #1248 - - - - - 95af9e79 by Tony Chemit at 2020-09-02T21:49:18+02:00 * Amélioration du nommage des SelectNode et utilisation des nœuds pour le modèle PS Logbook * Mis en commun du code de gestion des flux disponibles sur les marées * Mise en place des gardes fous de création de flux non disponibles sur le modèle PS - - - - - 7884119e by Tony Chemit at 2020-09-02T22:25:15+02:00 Fix route validation expression - - - - - 0e86d1b5 by Tony Chemit at 2020-09-03T00:50:13+02:00 Readd missing i18n keys while moving classes from modules... - - - - - 5ed3a570 by Tony Chemit at 2020-09-03T00:53:06+02:00 Correction sur PS Logbook Catch - See #1257 Pouvoir enregister une capture sans catégorie commerciale - Closes #1375 - - - - - 0e408b44 by Tony Chemit at 2020-09-03T00:53:57+02:00 Correction sur PS Logbook Activity - See #1256 - - - - - d7750e9c by Tony Chemit at 2020-09-03T00:59:01+02:00 Correction sur PS Logbook FOB - See #1258 - - - - - 3da45ec6 by Tony Chemit at 2020-09-03T01:42:45+02:00 Rendre indépendante la consolidation des deux types de FOB - See #1258 - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/java/fr/ird/observe/client/ObserveClientResourceManager.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/action/api/ActionWithSteps.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - − client-core/src/main/java/fr/ird/observe/client/util/BeanCheckBox.java - − client-core/src/main/java/fr/ird/observe/client/util/BeanDatePicker.java - − client-core/src/main/java/fr/ird/observe/client/util/BeanEnumEditor.java - − client-core/src/main/java/fr/ird/observe/client/util/BooleanEditor.java - client-core/src/main/java/fr/ird/observe/client/util/JaxxObjectInitializer.java - client-core/src/main/java/fr/ird/observe/client/util/ObserveKeyStrokesSupport.java - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-datasource-actions/pom.xml - client-datasource-actions/src/main/i18n/getters/java-enumeration.getter - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/i18n/getters/jaxx.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminStep.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/959bcc5f509ccd6dbea48406… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/959bcc5f509ccd6dbea48406… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 14 commits: Review server timeout management (was pretty lame : bad unit and default...
by Tony CHEMIT 02 Sep '20

02 Sep '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 86a0fba4 by Tony Chemit at 2020-08-31T21:54:38+02:00 Review server timeout management (was pretty lame : bad unit and default timeout always applied after request specialized values :() - Now everything is back to normal. - - - - - b17be487 by Tony Chemit at 2020-09-01T08:53:11+02:00 Remove unused service method - - - - - 18825915 by Tony Chemit at 2020-09-01T09:01:04+02:00 Add new tip on install doc - - - - - e185330f by Tony Chemit at 2020-09-02T13:21:43+02:00 If contentUI can not be opened, avoid a silly NPE - - - - - d6da91b3 by Tony Chemit at 2020-09-02T13:22:09+02:00 Let's display any bad exceptions (if any can be good :)) - - - - - b9f2a5c7 by Tony Chemit at 2020-09-02T13:46:53+02:00 Rename i18n keys - - - - - fcaa18b9 by Tony Chemit at 2020-09-02T13:49:33+02:00 Clean at last entities user code (very oldish style...) - - - - - df302611 by Tony Chemit at 2020-09-02T13:56:07+02:00 Use last jaxx widgets API - - - - - 27f2a643 by Tony Chemit at 2020-09-02T14:44:49+02:00 Make TripMap APi neutral and let's put domain style file where it belongs - - - - - 85d203ad by Tony Chemit at 2020-09-02T17:36:07+02:00 Fix some closing issues - - - - - 6e9bdf0a by Tony Chemit at 2020-09-02T17:40:07+02:00 Fix veto actions on trips - - - - - 64ac15e7 by Tony Chemit at 2020-09-02T17:41:08+02:00 More review on TripMap API - - - - - 289a8b14 by Tony Chemit at 2020-09-02T17:41:30+02:00 Mise à jour du module cartographie avec les nouvelles données - See #1248 - - - - - 959bcc5f by Tony Chemit at 2020-09-02T19:32:43+02:00 Downgrade jts-core :( - - - - - 30 changed files: - client-configuration/src/main/java/fr/ird/observe/client/ObserveClientResourceManager.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - − client-core/src/main/java/fr/ird/observe/client/util/BeanCheckBox.java - − client-core/src/main/java/fr/ird/observe/client/util/BeanDatePicker.java - − client-core/src/main/java/fr/ird/observe/client/util/BeanEnumEditor.java - − client-core/src/main/java/fr/ird/observe/client/util/BooleanEditor.java - client-core/src/main/java/fr/ird/observe/client/util/JaxxObjectInitializer.java - − client-core/src/main/java/fr/ird/observe/client/util/ObserveBooleanTableCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/util/ObserveKeyStrokesSupport.java - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-datasource-actions/pom.xml - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/RunObserveListener.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorLayerUI.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIInitializer.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentI18nReferentialUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/actions/BackToList.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/usage/UsageForDesactivateUI.jaxx - client-datasource-editor-common/pom.xml - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellEditor.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/TripUIHelper.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/trip/map/TripMapContentBuilder.java → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/trip/map/TripMapContentBuilderSupport.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/trip/map/TripMapUI.jaxx - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/trip/map/TripMapUIHandler.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/trip/map/actions/AddLogbook.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/trip/map/actions/AddObservations.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/CountryUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a81a3bf14fc20e96c8299692… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a81a3bf14fc20e96c8299692… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 19 commits: Add nice stream method
by Tony CHEMIT 31 Aug '20

31 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: da7dad68 by Tony Chemit at 2020-08-24T10:09:22+02:00 Add nice stream method - - - - - 8ca9a78d by Tony Chemit at 2020-08-29T12:58:14+02:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 Il manque des tables à supprimer. - - - - - 1bbf7b74 by Tony Chemit at 2020-08-29T13:38:11+02:00 Ajout référentiel PS Logbook WellsState - See #1300 Correction d'un id Ajout d'une entrée inconnue - - - - - 95231b94 by Tony Chemit at 2020-08-29T13:38:24+02:00 [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - Closes #1300 Il manque generalComment dans la migration. - - - - - d3651ef0 by Tony Chemit at 2020-08-29T13:51:56+02:00 Make more validators skipable - - - - - 70444186 by Tony Chemit at 2020-08-30T16:53:29+02:00 Make plugin more quiet - - - - - 16c5e115 by Tony Chemit at 2020-08-30T16:53:29+02:00 Introduce DtoPropertyModification (maybe should be in java-bean project ?) - - - - - c758fd96 by Tony Chemit at 2020-08-30T16:58:10+02:00 Make tests from more recent databases - - - - - d6e1abac by Tony Chemit at 2020-08-31T13:05:49+02:00 Improve SPI API (remove type in toDto and toReference methods) - - - - - db2de996 by Tony Chemit at 2020-08-31T13:45:10+02:00 Let's move stuff from services to common-dto, common-service or dto : in services module just services declaration with no logic. - - - - - cd5b1637 by Tony Chemit at 2020-08-31T13:57:27+02:00 * Generate PS Logbook domain (PMD for ever) * Adapt and review Activity Pairing API - - - - - 146e9bba by Tony Chemit at 2020-08-31T13:57:27+02:00 * Add Editor action PS Activity Pairing - - - - - 40c4f164 by Tony Chemit at 2020-08-31T13:57:27+02:00 La reprise sur erreur en mode serveur doit être revue - Closes #1596 - - - - - 421733f2 by Tony Chemit at 2020-08-31T14:19:22+02:00 Move module services to services-api - - - - - 2bf03bde by Tony Chemit at 2020-08-31T14:33:38+02:00 clean pom - - - - - bd6653d5 by Tony Chemit at 2020-08-31T14:34:23+02:00 increase apply security web service timeout (can be more than one minute) and realign the migrateData to same value (100 minutes instead of one thousand...) - - - - - 5e394867 by Tony Chemit at 2020-08-31T15:12:45+02:00 clean file headers - - - - - f9a044f5 by Tony Chemit at 2020-08-31T15:16:36+02:00 missing i18n key - - - - - a81a3bf1 by Tony Chemit at 2020-08-31T20:03:27+02:00 Use new topia extension API See ultreiaio/topia-extension#42 See ultreiaio/topia-extension#43 See ultreiaio/topia-extension#44 Which permits (done on 8.1 but need to do it also on previous migration files) Figer tous les lastUpdate et topiaCreateDate dans les scripts de migration - See #1593 - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/action/api/ActionWithSteps.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client-core/src/main/java/fr/ird/observe/client/util/ObserveKeyStrokesSupport.java - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-datasource-actions/pom.xml - client-datasource-actions/src/main/i18n/getters/java-enumeration.getter - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminStep.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/menu/AdminUIMenu.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/menu/actions/LaunchActivityLonglinePairingAction.java → client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/menu/actions/LaunchActivityLlPairingAction.java - + client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/menu/actions/LaunchActivityPsPairingAction.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingModel.java → client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/ActivityLlPairingModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingUI.jaxx → client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/ActivityLlPairingUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4a7ff31b3e98e200f4693b3a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4a7ff31b3e98e200f4693b3a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [V9] Sur le formulaire PS/Observations/Captures faune associée, champ "Origine...
by Tony CHEMIT 23 Aug '20

23 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8c8dfde3 by Tony Chemit at 2020-08-23T17:17:57+02:00 [V9] Sur le formulaire PS/Observations/Captures faune associée, champ "Origine de l'information" - See #1199 - - - - - 0fea3eec by Tony Chemit at 2020-08-23T17:19:06+02:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 (suppression des tables résiduelles) - - - - - 49e900d9 by Tony Chemit at 2020-08-23T17:19:08+02:00 Deplacer le réferentiel WeightCategory vers le schema ps_logbook - Closes #1594 - - - - - 21949e5b by Tony Chemit at 2020-08-23T17:19:08+02:00 Ajout référentiel PS Logbook WellsState - See #1300 - - - - - 4a7ff31b by Tony Chemit at 2020-08-23T17:50:35+02:00 [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - Closes #1300 - - - - - 30 changed files: - client-datasource-editor-api/src/main/i18n/getters/java.getter - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenu.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenuHandler.java - + client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/actions/SelectSeineLogbookReferentialAction.java - client-datasource-editor-ps/src/main/i18n/getters/java.getter - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/TripUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/TripUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/TripUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/TripUIModel.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/ReferentialHomeSeineLogbookUI.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/ReferentialHomeSeineLogbookUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/WeightCategoryUI.jaxx → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WeightCategoryUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/WeightCategoryUIHandler.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WeightCategoryUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/WeightCategoryUIModel.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WeightCategoryUIModel.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUI.jaxx - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUIHandler.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUIModel.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/InformationSourceUI.jaxx - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/InformationSourceUIHandler.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/InformationSourceUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/PsRootNavigationTreeNodeProvider.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/ref/ps/ReferentialListSeineLogbookNavigationTreeNode.java - dto/src/main/i18n/getters/eugene.getter - dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorServiceInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsLogbookModelDecoratorInitializer.java - dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsObservationModelDecoratorInitializer.java - dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/WeightCategoryHelper.java → dto/src/main/java/fr/ird/observe/dto/referential/ps/logbook/WeightCategoryHelper.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2f4955daf75fef4a16989e8c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2f4955daf75fef4a16989e8c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout référentiel PS Logbook WellsState - See #1300
by Tony CHEMIT 23 Aug '20

23 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2f4955da by Tony Chemit at 2020-08-23T14:28:13+02:00 Ajout référentiel PS Logbook WellsState - See #1300 - - - - - 25 changed files: - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUI.jaxx - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUIHandler.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUIModel.java - dto/src/main/i18n/getters/eugene.getter - dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsLogbookModelDecoratorInitializer.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-04-referential-ps-logbook.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/entities/Entities.java - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_1.java - persistence/src/main/models/Observe-04-referential-ps-logbook.model - + persistence/src/main/resources/db/migration/8.1/03_ps_logbook_add_referential_wellsState-common.sql - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java - test/src/main/resources/db/8.1/dataForTestLongline.sql.gz - test/src/main/resources/db/8.1/dataForTestSeine.sql.gz - test/src/main/resources/db/8.1/empty_h2.sql.gz - test/src/main/resources/db/8.1/empty_pg.sql.gz - test/src/main/resources/db/8.1/referentiel.sql.gz - test/src/main/resources/fixtures/count-referential-common.properties - test/src/main/resources/fixtures/count-referential-seine.properties - test/src/main/resources/fixtures/global.properties - test/src/main/resources/fixtures/validate-service-referential.properties - test/src/main/resources/fixtures/validate-service-seine-trips.properties Changes: ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUI.jaxx ===================================== @@ -0,0 +1,86 @@ + + +<fr.ird.observe.client.datasource.editor.content.ref.ContentI18nReferentialUI beanScope="bean" + i18n="fr.ird.observe.dto.referential.ps.logbook.WellsStateDto" + superGenericType='WellsStateDto, WellsStateReference, WellsStateUI'> + + <import> + fr.ird.observe.dto.reference.ReferentialDtoReference + fr.ird.observe.dto.referential.ps.logbook.WellsStateDto + fr.ird.observe.dto.referential.ps.logbook.WellsStateReference + fr.ird.observe.client.util.UIHelper + + io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox + org.nuiton.jaxx.widgets.text.NormalTextEditor + fr.ird.observe.client.util.BeanEnumEditor + fr.ird.observe.client.util.BeanCheckBox + + static fr.ird.observe.client.util.UIHelper.getStringValue + fr.ird.observe.dto.referential.ReferenceStatus + </import> + +  + <BeanValidator id='validator' autoField='true' + beanClass='fr.ird.observe.dto.referential.ps.logbook.WellsStateDto' + context='create' errorTableModel='{getErrorTableModel()}'> + <field name="enabled" component="status"/> + </BeanValidator> + +  + <WellsStateUIModel id='model' constructorParams='@override'/> + +  + <WellsStateDto id='bean'/> + + <Table id='editTable'> + +  + <row> + <cell anchor="west"> + <JLabel id='uriLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NormalTextEditor id='uri'/> + </cell> + </row> + +  + <row> + <cell anchor="west"> + <JLabel id='codeStatusLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> + <NormalTextEditor id='code' constraints='BorderLayout.WEST'/> + <BeanEnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + +  + <row> + <cell anchor='east' weightx="1" fill="both" columns="2"> + <BeanCheckBox id='needComment'/> + </cell> + </row> + </Table> + +</fr.ird.observe.client.datasource.editor.content.ref.ContentI18nReferentialUI> ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUIHandler.java ===================================== @@ -0,0 +1,39 @@ +package fr.ird.observe.client.datasource.editor.content.ref.ps.logbook; + +/*- + * #%L + * ObServe :: Client DataSource Editor PS + * %% + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.datasource.editor.content.ref.ContentReferentialUIHandler; +import fr.ird.observe.dto.referential.ps.logbook.WellsStateDto; +import fr.ird.observe.dto.referential.ps.logbook.WellsStateReference; +import org.nuiton.jaxx.runtime.spi.UIHandler; + +/** + * Created on 23/08/2020. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8.1.0 + */ +public class WellsStateUIHandler +extends ContentReferentialUIHandler<WellsStateDto, WellsStateReference, WellsStateUI> implements UIHandler<WellsStateUI> { + +} ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WellsStateUIModel.java ===================================== @@ -0,0 +1,41 @@ +package fr.ird.observe.client.datasource.editor.content.ref.ps.logbook; + +/*- + * #%L + * ObServe :: Client DataSource Editor PS + * %% + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.datasource.editor.content.ref.ContentReferentialUIModel; +import fr.ird.observe.dto.referential.ps.logbook.WellsStateDto; +import fr.ird.observe.dto.referential.ps.logbook.WellsStateReference; + +/** + * Created on 23/08/2020. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8.1.0 + */ +public class WellsStateUIModel extends ContentReferentialUIModel<WellsStateDto, WellsStateReference> { + + public WellsStateUIModel() { + super(WellsStateDto.class); + } + +} ===================================== dto/src/main/i18n/getters/eugene.getter ===================================== @@ -109,6 +109,7 @@ observe.referential.ps.common.TransmittingBuoyOwnership.type observe.referential.ps.common.TransmittingBuoyType.type observe.referential.ps.common.VesselActivity.type observe.referential.ps.logbook.WeightCategory.type +observe.referential.ps.logbook.WellsState.type observe.referential.ps.observation.DetectionMode.type observe.referential.ps.observation.InformationSource.type observe.referential.ps.observation.NonTargetCatchReleaseConformity.type ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsLogbookModelDecoratorInitializer.java ===================================== @@ -24,14 +24,16 @@ package fr.ird.observe.dto.decoration.init; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.referential.ps.logbook.WeightCategoryDto; +import fr.ird.observe.dto.referential.ps.logbook.WellsStateDto; import fr.ird.observe.dto.referential.ps.logbook.WeightCategoryReference; +import fr.ird.observe.dto.referential.ps.logbook.WellsStateReference; import fr.ird.observe.spi.model.initializer.ObserveReferentialPsLogbookModelInitializer; /** * Created on 23/08/2020. * * @author Tony Chemit - dev(a)tchemit.fr - * @since + * @since 8.1.0 */ public class ReferentialPsLogbookModelDecoratorInitializer extends ModelDecoratorInitializerSupport implements ObserveReferentialPsLogbookModelInitializer { public ReferentialPsLogbookModelDecoratorInitializer(DecoratorService decoratorService) { @@ -42,4 +44,8 @@ public class ReferentialPsLogbookModelDecoratorInitializer extends ModelDecorat public void initPsLogbookWeightCategoryDto() { registerDefaultReferentialAndReferentialReferenceDecorator(WeightCategoryDto.class, WeightCategoryReference.class, libelle); } + @Override + public void initPsLogbookWellsStateDto() { + registerDefaultReferentialAndReferentialReferenceDecorator(WellsStateDto.class, WellsStateReference.class, libelle); + } } ===================================== dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java ===================================== @@ -92,7 +92,8 @@ public class DtoModelClasses { fr.ird.observe.dto.referential.ps.observation.ObservedSystemDto.class ); public static final ImmutableSet<Class<? extends ReferentialDto>> SEINE_LOGBOOK_REFERENTIAL_TYPES = ImmutableSet.of( - fr.ird.observe.dto.referential.ps.logbook.WeightCategoryDto.class + fr.ird.observe.dto.referential.ps.logbook.WeightCategoryDto.class, + fr.ird.observe.dto.referential.ps.logbook.WellsStateDto.class ); public static final ImmutableSet<Class<? extends ReferentialDto>> SEINE_REFERENTIAL_TYPES = ImmutableSet.<Class<? extends ReferentialDto>>builder() ===================================== dto/src/main/models/Observe-04-referential-ps-logbook.model ===================================== @@ -2,3 +2,5 @@ package fr.ird.observe.dto.referential.ps.logbook | form=self packagePriority=4 referential.ps.logbook.WeightCategory > referential.I18nReferential >> reference.ReferentialDtoReferenceWithNoCodeAware | references=code,label,uri,species species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull + +referential.ps.logbook.WellsState > referential.I18nReferential ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1843,6 +1843,7 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too. observe.referential.ps.common.VesselActivity.allowFad=Allow Fad ? observe.referential.ps.common.VesselActivity.type=Vessel activity (Seine) observe.referential.ps.logbook.WeightCategory.type=Weight category +observe.referential.ps.logbook.WellsState.type=Wells state observe.referential.ps.observation.DetectionMode.type=Detection mode observe.referential.ps.observation.InformationSource.type=Information source observe.referential.ps.observation.NonTargetCatchReleaseConformity.type=Release conformity ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1843,6 +1843,7 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too. observe.referential.ps.common.VesselActivity.allowFad=Utilisation Object flottant ? \#TODO observe.referential.ps.common.VesselActivity.type=Actividad buque \#TODO-SP observe.referential.ps.logbook.WeightCategory.type=Categoría de peso +observe.referential.ps.logbook.WellsState.type=Wells state \#TODO observe.referential.ps.observation.DetectionMode.type=Modo de detección observe.referential.ps.observation.InformationSource.type=Information source \#TODO observe.referential.ps.observation.NonTargetCatchReleaseConformity.type=Conformidad en la liberacion de especies no objetivo ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1843,6 +1843,7 @@ observe.referential.ps.common.TransmittingBuoyTypeDto.validation.technology.too. observe.referential.ps.common.VesselActivity.allowFad=Utilisation Object flottant ? observe.referential.ps.common.VesselActivity.type=Activité bateau (Senne) observe.referential.ps.logbook.WeightCategory.type=Catégorie de poids +observe.referential.ps.logbook.WellsState.type=État de remplissage des cuves observe.referential.ps.observation.DetectionMode.type=Mode détection observe.referential.ps.observation.InformationSource.type=Origine de l'information observe.referential.ps.observation.NonTargetCatchReleaseConformity.type=Conformité à la libération ===================================== persistence/src/main/java/fr/ird/observe/entities/Entities.java ===================================== @@ -97,6 +97,7 @@ public class Entities { ObserveEntityEnum.ps_observation_ObservedSystem, ObserveEntityEnum.ps_logbook_WeightCategory, + ObserveEntityEnum.ps_logbook_WellsState, ObserveEntityEnum.ll_common_BaitSettingStatus, ObserveEntityEnum.ll_common_BaitType, ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_1.java ===================================== @@ -48,6 +48,7 @@ public class DataSourceMigrationForVersion_8_1 extends MigrationVersionResource executor.addScript("01","ps_observation_add_referential_InformationSource"); executor.addScript("02","ps_logbook_move_referential_weightCategory"); + executor.addScript("03","ps_logbook_add_referential_wellsState"); } } ===================================== persistence/src/main/models/Observe-04-referential-ps-logbook.model ===================================== @@ -2,3 +2,5 @@ package fr.ird.observe.entities.referential.ps.logbook | entity dbSchema=ps_logb referential.ps.logbook.WeightCategory > referential.I18nReferentialEntity | entity species {*:1} referential.common.Species | lazy=false + +referential.ps.logbook.WellsState > referential.I18nReferentialEntity | entity ===================================== persistence/src/main/resources/db/migration/8.1/03_ps_logbook_add_referential_wellsState-common.sql ===================================== @@ -0,0 +1,27 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +CREATE TABLE ps_logbook.WellsState(topiaId VARCHAR(255) NOT NULL,topiaVersion BIGINT NOT NULL, topiaCreateDate DATE, lastUpdateDate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), homeId VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255)); +ALTER TABLE ps_logbook.WellsState ADD CONSTRAINT PK_WellsState PRIMARY KEY(topiaid); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#2003', 0, '2020-08-23'::date, 'fr.ird.observe.entities.referentiel.ps.logbook.WellsState', '2020-08-23 10:57:53.455000'::timestamp); + +INSERT INTO ps_logbook.WellsState(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ps.logbook.WellsState#666#01' , 0, '2020-08-23'::date, '2020-08-23 10:57:53.455000'::timestamp, 1, false, '1', 'Wells empty' , 'Cuves vides' , 'Wells empty #TODO'); +INSERT INTO ps_logbook.WellsState(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ps.logbook.WellsState#666#02' , 0, '2020-08-23'::date, '2020-08-23 10:57:53.455000'::timestamp, 1, false, '2', ' Wells not empty' , 'Cuves non vides' , 'Wells not empty #TODO'); ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== @@ -51,6 +51,7 @@ public class ObserveFixtures { "fr.ird.observe.dto.referential.common.", "fr.ird.observe.dto.referential.ps.common.", "fr.ird.observe.dto.referential.ps.observation.", + "fr.ird.observe.dto.referential.ps.logbook.", "fr.ird.observe.dto.referential.ll.common.", "fr.ird.observe.dto.referential.ll.observation.", "fr.ird.observe.dto.referential.ll.logbook.", @@ -58,6 +59,7 @@ public class ObserveFixtures { "fr.ird.observe.dto.data.", "fr.ird.observe.dto.data.ps.common.", "fr.ird.observe.dto.data.ps.observation.", + "fr.ird.observe.dto.data.ps.logbook.", "fr.ird.observe.dto.data.ll.common.", "fr.ird.observe.dto.data.ll.observation.", "fr.ird.observe.dto.data.ll.logbook.", ===================================== test/src/main/resources/db/8.1/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/dataForTestLongline.sql.gz and b/test/src/main/resources/db/8.1/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/8.1/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/dataForTestSeine.sql.gz and b/test/src/main/resources/db/8.1/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/8.1/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/empty_h2.sql.gz and b/test/src/main/resources/db/8.1/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/8.1/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/empty_pg.sql.gz and b/test/src/main/resources/db/8.1/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/8.1/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.1/referentiel.sql.gz and b/test/src/main/resources/db/8.1/referentiel.sql.gz differ ===================================== test/src/main/resources/fixtures/count-referential-common.properties ===================================== @@ -27,7 +27,7 @@ common.gear_gearcharacteristic=29 common.gearcharacteristic=22 common.gearcharacteristictype=6 common.harbour=74 -common.lastupdatedate=123 +common.lastupdatedate=124 common.lengthlengthparameter=0 common.lengthmeasuremethod=4 common.lengthweightparameter=361 ===================================== test/src/main/resources/fixtures/count-referential-seine.properties ===================================== @@ -40,3 +40,4 @@ ps_observation.reasonfornullset=10 ps_observation.speciesstatus=4 ps_observation.surroundingactivity=8 ps_logbook.weightcategory=110 +ps_logbook.wellsstate=2 ===================================== test/src/main/resources/fixtures/global.properties ===================================== @@ -33,7 +33,7 @@ GEAR_USE_FEATURES_SEINE_ID_1=fr.ird.data.ps.common.GearUseFeatures#1440486230661 SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075 REFERENCE_DATA_COUNT=45 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3022 +REFERENTIAL_COUNT=3024 # was 59 DATA_FORM_COUNT=42 VALIDATORS_COUNT=46 @@ -44,11 +44,11 @@ VALIDATOR_UPDATE_REFERENTIAL_COUNT=3 VALIDATOR_UPDATE_ENTITY_DATA_COUNT=40 VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT=9 ENTITIES_LIMIT_SIZE=100 -ENTITY_BINDER_REFERENTIAL_COUNT=78 +ENTITY_BINDER_REFERENTIAL_COUNT=79 # was 130 VALIDATOR_CREATE_ENTITY_DATA_COUNT_REAL=45 # was 133 VALIDATOR_UPDATE_ENTITY_DATA_COUNT_REAL=45 -VALIDATOR_UPDATE_REFERENTIAL_COUNT_REAL=78 -VALIDATOR_CREATE_REFERENTIAL_COUNT_REAL=78 +VALIDATOR_UPDATE_REFERENTIAL_COUNT_REAL=79 +VALIDATOR_CREATE_REFERENTIAL_COUNT_REAL=79 ===================================== test/src/main/resources/fixtures/validate-service-referential.properties ===================================== @@ -19,83 +19,85 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -DataQualityDto=1 -SpeciesGroupReleaseModeDto=1 -SettingShapeDto=3 -BaitHaulingStatusDto=3 -ObservationMethodDto=1 -TransmittingBuoyOperationDto=3 +common.DataQualityDto=1 +common.SpeciesGroupReleaseModeDto=1 +ll.common.SettingShapeDto=3 +ll.observation.BaitHaulingStatusDto=3 +ll.common.ObservationMethodDto=1 +ps.common.TransmittingBuoyOperationDto=3 ps.logbook.WeightCategoryDto=3 -LengthMeasureMethodDto=1 -WeightMeasureMethodDto=1 -ReasonForNoFishingDto=3 -ObservedSystemDto=4 +common.LengthMeasureMethodDto=1 +common.WeightMeasureMethodDto=1 +ps.observation.ReasonForNoFishingDto=3 +ps.observation.ObservedSystemDto=4 #FIXME We were at 20 just before usage of application-context... -SpeciesDto=14 -PersonDto=4 -HookPositionDto=1 -HookTypeDto=1 -SpeciesListDto=2 -LightsticksColorDto=2 -BaitSettingStatusDto=1 -VesselTypeDto=3 -SexDto=2 -NonTargetCatchReleaseConformityDto=2 -MaturityStatusDto=3 -LengthWeightParameterDto=3 -NonTargetCatchReleaseStatusDto=2 -SurroundingActivityDto=3 -ItemVerticalPositionDto=1 -OceanDto=3 +common.SpeciesDto=14 +common.PersonDto=4 +ll.observation.HookPositionDto=1 +ll.common.HookTypeDto=1 +common.SpeciesListDto=2 +ll.common.LightsticksColorDto=2 +ll.common.BaitSettingStatusDto=1 +common.VesselTypeDto=3 +common.SexDto=2 +ps.observation.NonTargetCatchReleaseConformityDto=2 +ll.observation.MaturityStatusDto=3 +common.LengthWeightParameterDto=3 +ps.observation.NonTargetCatchReleaseStatusDto=2 +ps.observation.SurroundingActivityDto=3 +ll.observation.ItemVerticalPositionDto=1 +common.OceanDto=3 ps.common.VesselActivityDto=4 -HarbourDto=8 -HealthStatusDto=1 -ObjectOperationDto=2 -SensorDataFormatDto=1 -ObjectMaterialTypeDto=2 +common.HarbourDto=8 +ll.common.HealthStatusDto=1 +ps.common.ObjectOperationDto=2 +ll.observation.SensorDataFormatDto=1 +ps.common.ObjectMaterialTypeDto=2 #FIXME We were at 6 just before usage of application-context... -CountryDto=5 -ReasonForNullSetDto=3 -FpaZoneDto=5 -NonTargetCatchReleasingTimeDto=1 -EncounterTypeDto=1 -VesselDto=10 -MitigationTypeDto=1 -VesselSizeCategoryDto=1 -SizeMeasureTypeDto=3 -ShipOwnerDto=3 -CatchFateDto=1 -GearCharacteristicTypeDto=2 -GearCharacteristicDto=1 -ReasonForDiscardDto=3 -WeightMeasureTypeDto=1 -LightsticksTypeDto=1 +common.CountryDto=5 +ps.observation.ReasonForNullSetDto=3 +common.FpaZoneDto=5 +ps.observation.NonTargetCatchReleasingTimeDto=1 +ll.observation.EncounterTypeDto=1 +common.VesselDto=10 +ll.common.MitigationTypeDto=1 +common.VesselSizeCategoryDto=1 +common.SizeMeasureTypeDto=3 +common.ShipOwnerDto=3 +ll.common.CatchFateDto=1 +common.GearCharacteristicTypeDto=2 +common.GearCharacteristicDto=1 +ps.observation.ReasonForDiscardDto=3 +common.WeightMeasureTypeDto=1 +ll.common.LightsticksTypeDto=1 #FIXME Should be 0 when I18n will be ok -InformationSourceDto=1 -ItemHorizontalPositionDto=3 -OrganismDto=4 -GearDto=2 -DetectionModeDto=3 -HookSizeDto=3 -SensorBrandDto=1 -SensorTypeDto=3 -TransmittingBuoyTypeDto=3 -SpeciesFateDto=3 -WindDto=1 -SpeciesStatusDto=3 +ps.observation.InformationSourceDto=1 +#FIXME Should be 0 when I18n will be ok +ps.logbook.WellsStateDto=1 +ll.observation.ItemHorizontalPositionDto=3 +common.OrganismDto=4 +common.GearDto=2 +ps.observation.DetectionModeDto=3 +ll.common.HookSizeDto=3 +ll.observation.SensorBrandDto=1 +ll.observation.SensorTypeDto=3 +ps.common.TransmittingBuoyTypeDto=3 +ps.common.SpeciesFateDto=3 +common.WindDto=1 +ps.observation.SpeciesStatusDto=3 ll.common.VesselActivityDto=2 -ObjectMaterialDto=11 +ps.observation.ObjectMaterialDto=11 #FIXME We were at 3 just before usage of application-context... -LineTypeDto=2 +ll.common.LineTypeDto=2 #FIXME We were at 9 just before usage of application-context... -ProgramDto=8 -BaitTypeDto=3 -SpeciesGroupDto=2 -StomachFullnessDto=3 -ConservationDto=1 -OnBoardProcessingDto=1 -DataSourceDto=2 -TripTypeDto=1 -CompagniesDto=3 -SchoolTypeDto=1 -TransmittingBuoyOwnershipDto=2 +common.ProgramDto=8 +ll.common.BaitTypeDto=3 +common.SpeciesGroupDto=2 +ll.observation.StomachFullnessDto=3 +ll.landing.ConservationDto=1 +ll.common.OnBoardProcessingDto=1 +ll.landing.DataSourceDto=2 +ll.common.TripTypeDto=1 +ll.landing.CompagniesDto=3 +ps.common.SchoolTypeDto=1 +ps.common.TransmittingBuoyOwnershipDto=2 ===================================== test/src/main/resources/fixtures/validate-service-seine-trips.properties ===================================== @@ -19,12 +19,12 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -TripDto=5 -RouteDto=3 -ActivityDto=11 -TransmittingBuoyDto=2 -SetDto=3 -CatchDto=4 -SizeDto=2 -FloatingObjectDto=1 -FloatingObjectPartDto=1 +ps.common.TripDto=5 +ps.observation.RouteDto=3 +ps.observation.ActivityDto=11 +ps.observation.TransmittingBuoyDto=2 +ps.observation.SetDto=3 +ps.observation.CatchDto=4 +ps.observation.SizeDto=2 +ps.observation.FloatingObjectDto=1 +ps.observation.FloatingObjectPartDto=1 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2f4955daf75fef4a16989e8c0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2f4955daf75fef4a16989e8c0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: remove unused contract on model
by Tony CHEMIT 23 Aug '20

23 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1bef2201 by Tony Chemit at 2020-08-23T09:52:21+02:00 remove unused contract on model - - - - - 92ff0e91 by Tony Chemit at 2020-08-23T11:02:03+02:00 [V9] Sur le formulaire PS/Observations/Captures faune associée, champ "Origine de l'information" - See #1199 - - - - - 91014a5f by Tony Chemit at 2020-08-23T13:00:55+02:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 (suppression des tables résiduelles) - - - - - f03e0a1a by Tony Chemit at 2020-08-23T13:37:16+02:00 Deplacer le réferentiel WeightCategory vers le schema ps_logbook - Closes #1594 - - - - - 30 changed files: - client-datasource-editor-api/src/main/i18n/getters/java.getter - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenu.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenuHandler.java - + client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/actions/SelectSeineLogbookReferentialAction.java - client-datasource-editor-ps/src/main/i18n/getters/java.getter - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/ReferentialHomeSeineLogbookUI.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/ReferentialHomeSeineLogbookUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/WeightCategoryUI.jaxx → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WeightCategoryUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/WeightCategoryUIHandler.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WeightCategoryUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/WeightCategoryUIModel.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/logbook/WeightCategoryUIModel.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/InformationSourceUI.jaxx - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/InformationSourceUIHandler.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/InformationSourceUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/PsRootNavigationTreeNodeProvider.java - + client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/ref/ps/ReferentialListSeineLogbookNavigationTreeNode.java - dto/src/main/i18n/getters/eugene.getter - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorServiceInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsLogbookModelDecoratorInitializer.java - dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsObservationModelDecoratorInitializer.java - dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/WeightCategoryHelper.java → dto/src/main/java/fr/ird/observe/dto/referential/ps/logbook/WeightCategoryHelper.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-03-referential-ps-observation.model - + dto/src/main/models/Observe-04-referential-ps-logbook.model - dto/src/main/models/Observe-20-data-ps-observation.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/entities/Entities.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/870e2e738bd2867aeaa522c4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/870e2e738bd2867aeaa522c4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Generate getXXXSize method instead of sizeXXX ones + add isNotXXXEmpty
by Tony CHEMIT 22 Aug '20

22 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 870e2e73 by Tony Chemit at 2020-08-22T20:58:54+02:00 Generate getXXXSize method instead of sizeXXX ones + add isNotXXXEmpty Update pom - - - - - 30 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenu.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/actions/SelectSeineActivityAction.java → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/actions/SelectSeineObsActivityAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/actions/SelectSeineRouteAction.java → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/actions/SelectSeineObsRouteAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/selection/nodes/TripLonglineSelectionTreeNode.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/selection/nodes/TripSeineSelectionTreeNode.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SectionTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/common/TripLonglineNavigationTreeNode.java - client-datasource-editor-ps/src/main/i18n/getters/java.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/TripUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/TripUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SampleUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/actions/RouteUIMove.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/common/TripSeineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/ActivitySeineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/FloatingObjectSeineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/RouteSeineListNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/RouteSeineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/SetSeineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripDto.java - dto/src/main/java/fr/ird/observe/dto/data/ll/observation/LonglinePositionSetDto.java - dto/src/main/java/fr/ird/observe/dto/data/ll/observation/SectionWithTemplate.java - dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java - dto/src/main/java/fr/ird/observe/dto/data/ps/observation/RouteDto.java - dto/src/main/java/fr/ird/observe/navigation/model/edit/seine/ObserveSeineEditModel.java - dto/src/main/java/fr/ird/observe/navigation/model/edit/seine/node/ObserveSeineActivityEditNode.java → dto/src/main/java/fr/ird/observe/navigation/model/edit/seine/node/ObserveSeineObsActivityEditNode.java - dto/src/main/java/fr/ird/observe/navigation/model/edit/seine/node/ObserveSeineRouteEditNode.java → dto/src/main/java/fr/ird/observe/navigation/model/edit/seine/node/ObserveSeineObsRouteEditNode.java - dto/src/main/java/fr/ird/observe/navigation/model/edit/seine/node/ObserveSeineTripEditNode.java - dto/src/main/java/fr/ird/observe/navigation/model/select/seine/ObserveSeineSelectModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/870e2e738bd2867aeaa522c4a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/870e2e738bd2867aeaa522c4a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Generate getXXXSize method instead of sizeXXX ones + add isNotXXXEmpty
by Tony CHEMIT 22 Aug '20

22 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e2904205 by Tony Chemit at 2020-08-22T13:24:54+02:00 Generate getXXXSize method instead of sizeXXX ones + add isNotXXXEmpty Update pom - - - - - 30 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenu.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/actions/SelectSeineActivityAction.java → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/actions/SelectSeineObsActivityAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/actions/SelectSeineRouteAction.java → client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/actions/SelectSeineObsRouteAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/selection/nodes/TripLonglineSelectionTreeNode.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/selection/nodes/TripSeineSelectionTreeNode.java - client-datasource-editor-common/src/main/i18n/getters/java.getter - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SectionTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/common/TripLonglineNavigationTreeNode.java - client-datasource-editor-ps/src/main/i18n/getters/java.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/TripUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/TripUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SampleUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/actions/RouteUIMove.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/common/TripSeineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/ActivitySeineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/FloatingObjectSeineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/RouteSeineListNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/RouteSeineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/obs/SetSeineNavigationTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripDto.java - dto/src/main/java/fr/ird/observe/dto/data/ll/observation/LonglinePositionSetDto.java - dto/src/main/java/fr/ird/observe/dto/data/ll/observation/SectionWithTemplate.java - dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java - dto/src/main/java/fr/ird/observe/dto/data/ps/observation/RouteDto.java - dto/src/main/java/fr/ird/observe/navigation/model/edit/seine/ObserveSeineEditModel.java - dto/src/main/java/fr/ird/observe/navigation/model/edit/seine/node/ObserveSeineActivityEditNode.java → dto/src/main/java/fr/ird/observe/navigation/model/edit/seine/node/ObserveSeineObsActivityEditNode.java - dto/src/main/java/fr/ird/observe/navigation/model/edit/seine/node/ObserveSeineRouteEditNode.java → dto/src/main/java/fr/ird/observe/navigation/model/edit/seine/node/ObserveSeineObsRouteEditNode.java - dto/src/main/java/fr/ird/observe/navigation/model/edit/seine/node/ObserveSeineTripEditNode.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e2904205a6050415fbfa96c90… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e2904205a6050415fbfa96c90… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Réorganisation des données d’observation PS - Réorganisation des captures et...
by Tony CHEMIT 21 Aug '20

21 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 61fcc175 by Tony Chemit at 2020-08-21T13:38:00+02:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 - - - - - babc1e4c by Tony Chemit at 2020-08-21T13:38:01+02:00 Auto-chargement des rôles pour les utilisateurs de la base ciblées dans les assistants de création/mise à jour - Closes #1592 plus un peu de ménage sur ce très vieux code - - - - - 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/main/body/ClientConfigUI.java - client-datasource-actions/src/main/i18n/getters/jaxx.getter - 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/i18n/templates/dataSourceConnectionReport_en_GB.ftl - client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-datasource-editor-api/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl - client-datasource-editor-api/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl - client-datasource-editor-api/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl - client-datasource-editor-api/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/RolesTableModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/RolesUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/RolesUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/SecurityModel.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/sample/SampleUIHandler.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/sample/SampleUIModel.java - client-datasource-editor-ps/src/main/i18n/getters/java.getter - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUI.jaxx → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/CatchUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUI.jcss → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/CatchUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUIHandler.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/CatchUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetCatchUIModel.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/CatchUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUITableModel.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/CatchUITableModel.java - − client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetSampleImplHandler.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SampleImplHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetSampleUI.jaxx → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SampleUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetSampleUIHandler.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SampleUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fc1bdaef06a6ce48c9f2d408… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fc1bdaef06a6ce48c9f2d408… You're receiving this email because of your account on gitlab.com.

1 0