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

[Git][ultreiaio/ird-observe][develop] update fixtures
by Tony CHEMIT (＠tchemit) 30 Sep '21

30 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a81441f7 by Tony Chemit at 2021-09-30T22:18:51+02:00 update fixtures - - - - - 2 changed files: - models/persistence/test-impl/src/main/resources/fixtures/persistence/table_count/referential.properties - tests/test/src/main/resources/fixtures/global.properties Changes: ===================================== models/persistence/test-impl/src/main/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -79,7 +79,7 @@ ll_observation.sensortype=4 ll_observation.stomachfullness=7 ps_common.objectmaterial=83 ps_common.objectmaterialtype=4 -ps_common.objectoperation=11 +ps_common.objectoperation=12 ps_common.observedsystem=61 ps_common.schooltype=3 ps_common.speciesfate=14 ===================================== tests/test/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=66 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=4106 +REFERENTIAL_COUNT=4107 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a81441f7853967c0414941fd0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a81441f7853967c0414941fd0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 26 commits: [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook -...
by Tony CHEMIT (＠tchemit) 30 Sep '21

30 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9f607e5f by Tony Chemit at 2021-09-30T14:41:22+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - See ultreiaio/ird-observe#1616 - - - - - 7f27a616 by Tony Chemit at 2021-09-30T14:41:22+02:00 add validation observe.data.ps.Route.validation.date.before.currentTrip.endDate - - - - - 645c8710 by Tony Chemit at 2021-09-30T14:41:22+02:00 we can reuse old way to render property (injected in component client properties) - - - - - 80bade1e by Tony Chemit at 2021-09-30T14:41:22+02:00 default init for DateEditor in DefaultUIInitializer - - - - - fe933a1b by Tony Chemit at 2021-09-30T14:41:22+02:00 Disable program node is program is disabled - - - - - 228d7408 by Tony Chemit at 2021-09-30T14:41:22+02:00 Disable trip create action if program is disabled - - - - - fb843830 by Tony Chemit at 2021-09-30T14:41:22+02:00 Do not load trip map on trip form opening - - - - - c5534f85 by Tony Chemit at 2021-09-30T14:41:22+02:00 Can't delete ps_logbook route with multiple activities (with well plan) - - - - - e314946d by Tony Chemit at 2021-09-30T14:41:22+02:00 ouverture api - - - - - 2090f75c by Tony Chemit at 2021-09-30T14:41:22+02:00 ne pas charger un data reference lits if noLoad tag - - - - - 67b551b0 by Tony Chemit at 2021-09-30T14:41:22+02:00 be able to fix dialog size - - - - - 7a8e70e4 by Tony Chemit at 2021-09-30T21:44:56+02:00 update pom - - - - - 1c798ad0 by Tony Chemit at 2021-09-30T21:44:56+02:00 Ajouter une info 'type d'échantillon' sur les échantillons de marché local - See ultreiaio/ird-observe#1978 - - - - - d93d215d by Tony Chemit at 2021-09-30T21:44:56+02:00 Mapping associations AVDTH - See #1864 - - - - - 2ca291c6 by Tony Chemit at 2021-09-30T21:44:56+02:00 Add default observed system if none found (avdth import) - - - - - d007c4a3 by Tony Chemit at 2021-09-30T21:44:56+02:00 Revue du code de migration avdth - - - - - 31c69410 by Tony Chemit at 2021-09-30T21:44:56+02:00 add niceTime in DefaultDecoratorRenderer - - - - - f10dfc63 by Tony Chemit at 2021-09-30T21:44:56+02:00 reduce avdth import dialog size - - - - - c925888f by Tony Chemit at 2021-09-30T21:44:56+02:00 review longline element decorator in table renderers (always used the one with only hauling identifier) - - - - - 751a447e by Tony Chemit at 2021-09-30T21:44:56+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - Closes #1616 - - - - - a18a0bd3 by Tony Chemit at 2021-09-30T21:44:56+02:00 improve activty layout - - - - - 907bf7a1 by Tony Chemit at 2021-09-30T21:44:56+02:00 Revue du code de migration avdth - - - - - f64da9b1 by Tony Chemit at 2021-09-30T21:44:56+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - Closes #1616 - - - - - 51a76b92 by Tony Chemit at 2021-09-30T21:44:56+02:00 Problème mapping ACTIVITE.C_TYP_OBJET vers ObservedSystem - Closes #2010 - - - - - 0e02ec09 by Tony Chemit at 2021-09-30T21:44:56+02:00 Problème mapping ACTIVITE.C_TYP_OBJET vers ObservedSystem - Closes #2010 - - - - - 046e6687 by Tony Chemit at 2021-09-30T21:44:56+02:00 update CHANGELOG [skip ci] - - - - - 30 changed files: - CHANGELOG.md - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/validation/ContentMessageTableRenderer.java - + client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/LonglinePositionAware.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetTdrUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetTdrUI.jcss - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/ObservePsKeyStrokes.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUIModelStates.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/LightActivityUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/LightActivityUI.jcss - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/LightActivityUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/de7d75e0f84dbb95f056ee23… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/de7d75e0f84dbb95f056ee23… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 43 commits: Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001
by Tony CHEMIT (＠tchemit) 29 Sep '21

29 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 35984888 by Tony Chemit at 2021-09-29T15:33:16+02:00 Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001 - - - - - a415b1a1 by Tony Chemit at 2021-09-29T15:33:16+02:00 Définition des reports PS logbooks tabulaires [sample] - See #1969 - - - - - 45281bd7 by Tony Chemit at 2021-09-29T15:33:16+02:00 update public api doc - - - - - a8ad70c8 by Tony Chemit at 2021-09-29T15:33:16+02:00 fix Survey decorator - - - - - e226a162 by Tony Chemit at 2021-09-29T15:33:16+02:00 Ajout d'une action nouvel import - Closes #2002 - - - - - f869c745 by Tony Chemit at 2021-09-29T15:33:16+02:00 Remplir les données depuis AVDTH - See #1866 ne pas conserver les échantillon marhcé local qui sont en fait vides. - - - - - e613ec25 by Tony Chemit at 2021-09-29T15:33:16+02:00 amélioration report psLogbookTrip - - - - - 712f60b0 by Tony Chemit at 2021-09-29T15:33:16+02:00 Amélioration du rendu visuel d'une activité - Closes #1610 et gestion de la nullité de ps_logbook.Activity.time - - - - - d9324916 by Tony Chemit at 2021-09-29T15:33:16+02:00 use tck db for more tests - - - - - 56ea3d8e by Tony Chemit at 2021-09-29T15:33:16+02:00 improve layout and reduce some actions texts - - - - - dea027d7 by Tony Chemit at 2021-09-29T15:33:16+02:00 fix log - - - - - 06c51b68 by Tony Chemit at 2021-09-29T15:33:16+02:00 La synchro simple de marées ne marche pas - See ultreiaio/ird-observe#2003 - - - - - 222dea70 by Tony Chemit at 2021-09-29T15:33:16+02:00 update pom - - - - - 041f373d by Tony Chemit at 2021-09-29T15:33:16+02:00 Add FIXME (See #1999) - - - - - e571666e by Tony Chemit at 2021-09-29T15:33:16+02:00 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004 - - - - - 54f87cf9 by Tony Chemit at 2021-09-29T15:33:16+02:00 [PS][Logbook] Champ nombre capturés - Closes ultreiaio/ird-observe#1796 - - - - - ec8a442e by Tony Chemit at 2021-09-29T15:33:16+02:00 Affichage des poids, Empêcher l'affichage en puissances de 10 - Closes #2006 - - - - - 1ccf6da1 by Tony Chemit at 2021-09-29T15:33:16+02:00 improve fixture api - - - - - 83941151 by Tony Chemit at 2021-09-29T15:33:16+02:00 remplacement de RouteStubDto par RouteReference - - - - - 69092b44 by Tony Chemit at 2021-09-29T15:33:16+02:00 ajout decoratoeur manquant (pour ps_observation.activityReference avec date de route) - - - - - c7bcb9d5 by Tony Chemit at 2021-09-29T15:33:16+02:00 Ne pas exposer le paramètre validationMode dans les services - See ultreiaio/ird-observe#2007 - - - - - f4c001ce by Tony Chemit at 2021-09-29T15:33:16+02:00 Ajout de plus de tests sur les réferentiels, toute l'api publique est testée, mais il faudrait définir plus de cas. - - - - - 758d0922 by Tony Chemit at 2021-09-29T15:33:16+02:00 Ne pas effectuer certaines validation si la configuration n'est pas connue (See #2008) - - - - - 5e79e1d8 by Tony Chemit at 2021-09-29T15:33:16+02:00 Bien libérer le validateur après validation - - - - - f9580c83 by Tony Chemit at 2021-09-29T15:33:16+02:00 Faire fonctionner la validation sur une grappe de données non persistées. - - - - - c3b0894c by Tony Chemit at 2021-09-29T15:33:16+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - See ultreiaio/ird-observe#1616 - - - - - 1ed9e57b by Tony Chemit at 2021-09-29T15:33:16+02:00 add validation observe.data.ps.Route.validation.date.before.currentTrip.endDate - - - - - 06853c7c by Tony Chemit at 2021-09-29T15:33:16+02:00 we can reuse old way to render property (injected in component client properties) - - - - - 039e4d81 by Tony Chemit at 2021-09-29T15:33:16+02:00 default init for DateEditor in DefaultUIInitializer - - - - - 68d08030 by Tony Chemit at 2021-09-29T15:33:16+02:00 Disable program node is program is disabled - - - - - 0fd0245f by Tony Chemit at 2021-09-29T15:33:16+02:00 Disable trip create action if program is disabled - - - - - bb6d5313 by Tony Chemit at 2021-09-29T15:33:16+02:00 Do not load trip map on trip form opening - - - - - 22e97f3f by Tony Chemit at 2021-09-29T15:33:16+02:00 Can't delete ps_logbook route with multiple activities (with well plan) - - - - - b47e40fe by Tony Chemit at 2021-09-29T15:33:16+02:00 ouverture api - - - - - fdf3287f by Tony Chemit at 2021-09-29T15:33:16+02:00 ne pas charger un data reference lits if noLoad tag - - - - - ff463d29 by Tony Chemit at 2021-09-29T15:33:16+02:00 be able to fix dialog size - - - - - 4988ef0c by Tony Chemit at 2021-09-29T15:41:48+02:00 update pom - - - - - 5195ecf3 by Tony Chemit at 2021-09-29T16:21:34+02:00 Ajouter une info 'type d'échantillon' sur les échantillons de marché local - See ultreiaio/ird-observe#1978 - - - - - c6afe28f by Tony Chemit at 2021-09-29T17:58:54+02:00 Mapping associations AVDTH - See #1864 - - - - - b9cdf39b by Tony Chemit at 2021-09-29T19:07:00+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - Closes #1616 - - - - - 182f20d2 by Tony Chemit at 2021-09-29T19:12:11+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - Closes #1616 - - - - - b59bab5c by Tony Chemit at 2021-09-29T19:13:24+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - Closes #1616 - - - - - de7d75e0 by Tony Chemit at 2021-09-29T19:13:41+02:00 Add default observed system if none found (avdth import) - - - - - 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/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/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/actions/Import.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/NewImport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ShowUsagesReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDeleteUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDesactivateUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDisplayUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsagePanel.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7d41cbb8021dd8d49e70eb69… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7d41cbb8021dd8d49e70eb69… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: update pom
by Tony CHEMIT (＠tchemit) 28 Sep '21

28 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1f41a89c by Tony Chemit at 2021-09-28T12:43:34+02:00 update pom - - - - - b76bcad5 by Tony Chemit at 2021-09-28T12:43:34+02:00 Add FIXME (See #1999) - - - - - 88dc959c by Tony Chemit at 2021-09-28T12:43:34+02:00 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004 - - - - - 2c9028fe by Tony Chemit at 2021-09-28T12:43:34+02:00 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004 - - - - - 7d41cbb8 by Tony Chemit at 2021-09-28T12:43:34+02:00 [PS][Logbook] Champ nombre capturés - Closes ultreiaio/ird-observe#1796 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ShowUsagesReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDeleteUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDesactivateUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDisplayUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsagePanel.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java - 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/logbook/ActivityCatchUI.jaxx - models/definition/src/main/models/Observe/dto/21-data-ps-logbook.model - models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties - models/definition/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties - models/definition/src/main/models/Observe/persistence/21-data-ps-logbook.model - models/dto/i18n/src/main/i18n/getters/labels.getter - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-PG.sql - pom.xml - services/client-impl/pom.xml - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/931568c8d63cd17f94c7788d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/931568c8d63cd17f94c7788d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS][Logbook] Champ nombre capturés - Closes ultreiaio/ird-observe#1796
by Tony CHEMIT (＠tchemit) 28 Sep '21

28 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 931568c8 by Tony Chemit at 2021-09-28T11:47:24+02:00 [PS][Logbook] Champ nombre capturés - Closes ultreiaio/ird-observe#1796 - - - - - 20 changed files: - 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/logbook/ActivityCatchUI.jaxx - models/definition/src/main/models/Observe/dto/21-data-ps-logbook.model - models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties - models/definition/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties - models/definition/src/main/models/Observe/persistence/21-data-ps-logbook.model - models/dto/i18n/src/main/i18n/getters/labels.getter - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-PG.sql - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties - services/i18n/src/main/i18n/translations/services_fr_FR.properties - services/validation/src/main/i18n/getters/eugene.getter Changes: ===================================== client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -151,6 +151,7 @@ observe.data.ps.logbook.Activity.setCount observe.data.ps.logbook.Activity.time observe.data.ps.logbook.Activity.totalWeight observe.data.ps.logbook.Activity.vmsDivergent +observe.data.ps.logbook.Catch.count observe.data.ps.logbook.Catch.weight observe.data.ps.logbook.FloatingObject.buoysTab observe.data.ps.logbook.FloatingObject.materialsTab ===================================== client/datasource/editor/ps/src/main/i18n/getters/navigation.getter ===================================== @@ -106,6 +106,8 @@ observe.data.ps.logbook.Activity.type observe.data.ps.logbook.Catch.action.create observe.data.ps.logbook.Catch.action.save observe.data.ps.logbook.Catch.action.save.tip +observe.data.ps.logbook.Catch.count +observe.data.ps.logbook.Catch.count.short observe.data.ps.logbook.Catch.speciesFate.short observe.data.ps.logbook.Catch.title observe.data.ps.logbook.Catch.type ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUI.jaxx ===================================== @@ -107,6 +107,15 @@ <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> </cell> </row> +  + <row> + <cell anchor='west'> + <JLabel id='countLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NormalTextEditor id='count'/> + </cell> + </row>  <row> <cell> ===================================== models/definition/src/main/models/Observe/dto/21-data-ps-logbook.model ===================================== @@ -43,6 +43,7 @@ number + {*:1} Integer data.ps.logbook.Catch > data.ContainerChild >> data.WellIdAware data.WithSimpleComment comment + {*:1} String weight + {*:1} Float +count + {*:1} Integer well + {*:1} String speciesFate {*:0..1} referential.ps.common.SpeciesFateReference species {*:1} referential.common.SpeciesReference ===================================== models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties ===================================== @@ -28,6 +28,7 @@ data.ps.localmarket.SampleSpeciesMeasure.attribute.sizeClass=true data.ps.localmarket.Survey.attribute.number=true data.ps.logbook.Activity.attribute.number=true data.ps.logbook.Activity.attribute.seaSurfaceTemperature=true +data.ps.logbook.Catch.attribute.count=true data.ps.logbook.Sample.attribute.number=true data.ps.logbook.SampleSpeciesMeasure.attribute.count=true data.ps.logbook.SampleSpeciesMeasure.attribute.sizeClass=true ===================================== models/definition/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties ===================================== @@ -40,7 +40,7 @@ data.ps.landing.Landing=species,weightCategory,weight,destination,fate,fateVesse data.ps.localmarket.Batch=species,packaging,count,weight data.ps.localmarket.SampleSpecies=species,sizeMeasureType,measuredCount,comment data.ps.localmarket.SurveyPart=species,proportion -data.ps.logbook.Catch=species,speciesFate,weightCategory,well,weight,comment +data.ps.logbook.Catch=species,speciesFate,weightCategory,well,weight,count,comment data.ps.logbook.SampleSpecies=subSampleNumber,species,sizeMeasureType,measuredCount,totalCount,comment data.ps.logbook.WellPlan=activity,well,species,weightCategory,weight data.ps.observation.Catch=species,speciesFate,reasonForDiscard,well,catchWeight,totalCount,meanWeight,meanLength,comment ===================================== models/definition/src/main/models/Observe/persistence/21-data-ps-logbook.model ===================================== @@ -36,6 +36,7 @@ species {*:1} referential.common.Species weightCategory {*:0..1} referential.ps.logbook.WeightCategory speciesFate {*:0..1} referential.ps.common.SpeciesFate weight + {*:1} Float +count + {*:1} Integer weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod well + {*:1} String ===================================== models/dto/i18n/src/main/i18n/getters/labels.getter ===================================== @@ -877,6 +877,7 @@ observe.data.ps.logbook.Activity.vmsDivergent observe.data.ps.logbook.Catch.action.create observe.data.ps.logbook.Catch.action.save observe.data.ps.logbook.Catch.action.save.tip +observe.data.ps.logbook.Catch.count.short observe.data.ps.logbook.Catch.speciesFate.short observe.data.ps.logbook.Catch.title observe.data.ps.logbook.Catch.type ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-H2.sql ===================================== @@ -22,7 +22,7 @@ CREATE SCHEMA ps_logbook; create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-PG.sql ===================================== @@ -22,7 +22,7 @@ CREATE SCHEMA ps_logbook; create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-H2.sql ===================================== @@ -22,7 +22,7 @@ CREATE SCHEMA ps_logbook; create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-PG.sql ===================================== @@ -22,7 +22,7 @@ CREATE SCHEMA ps_logbook; create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-H2.sql ===================================== @@ -155,7 +155,7 @@ create table ps_localmarket.survey (topiaId varchar(255) not null, topiaVersion create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, proportion integer not null, survey varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-PG.sql ===================================== @@ -155,7 +155,7 @@ create table ps_localmarket.survey (topiaId varchar(255) not null, topiaVersion create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, proportion integer not null, survey varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-H2.sql ===================================== @@ -155,7 +155,7 @@ create table ps_localmarket.survey (topiaId varchar(255) not null, topiaVersion create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, proportion integer not null, survey varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-PG.sql ===================================== @@ -155,7 +155,7 @@ create table ps_localmarket.survey (topiaId varchar(255) not null, topiaVersion create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, proportion integer not null, survey varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1053,6 +1053,8 @@ observe.data.ps.logbook.Activity.vmsDivergent=Vms divergent? observe.data.ps.logbook.Catch.action.create=Create a new catch observe.data.ps.logbook.Catch.action.save=Insert this catch observe.data.ps.logbook.Catch.action.save.tip=Insert this catch +observe.data.ps.logbook.Catch.count=Count +observe.data.ps.logbook.Catch.count.short=Count observe.data.ps.logbook.Catch.speciesFate.short=Species fate observe.data.ps.logbook.Catch.title=Catches observe.data.ps.logbook.Catch.type=Catch ===================================== services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1053,6 +1053,8 @@ observe.data.ps.logbook.Activity.vmsDivergent=Vms divergent?\#TODO observe.data.ps.logbook.Catch.action.create=Crear una captura observe.data.ps.logbook.Catch.action.save=Insertar captura observe.data.ps.logbook.Catch.action.save.tip=Insertar captura +observe.data.ps.logbook.Catch.count=Count +observe.data.ps.logbook.Catch.count.short=Count observe.data.ps.logbook.Catch.speciesFate.short=Devenir observe.data.ps.logbook.Catch.title=Captura observe.data.ps.logbook.Catch.type=Captura ===================================== services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1053,6 +1053,8 @@ observe.data.ps.logbook.Activity.vmsDivergent=Divergence Vms ? observe.data.ps.logbook.Catch.action.create=Nouvelle capture observe.data.ps.logbook.Catch.action.save=Insérer cette capture observe.data.ps.logbook.Catch.action.save.tip=Insérer cette capture +observe.data.ps.logbook.Catch.count=Nombre d'individus +observe.data.ps.logbook.Catch.count.short=Nombre observe.data.ps.logbook.Catch.speciesFate.short=Devenir observe.data.ps.logbook.Catch.title=Captures observe.data.ps.logbook.Catch.type=Captures ===================================== services/validation/src/main/i18n/getters/eugene.getter ===================================== @@ -256,6 +256,7 @@ observe.data.ps.logbook.Activity.floatingObjectEmpty observe.data.ps.logbook.Activity.number observe.data.ps.logbook.Activity.time observe.data.ps.logbook.Activity.totalWeight +observe.data.ps.logbook.Catch.count observe.data.ps.logbook.Catch.weight observe.data.ps.logbook.FloatingObject.materialsValid observe.data.ps.logbook.FloatingObjectPart.objectMaterial View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/931568c8d63cd17f94c7788dd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/931568c8d63cd17f94c7788dd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans...
by Tony CHEMIT (＠tchemit) 28 Sep '21

28 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 21c79565 by Tony Chemit at 2021-09-28T10:51:02+02:00 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004 - - - - - 3 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsagePanel.jaxx Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java ===================================== @@ -500,7 +500,7 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple public SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> getReferentialMap(SetMultimap<Class<? extends ReferentialDto>, String> referentialIds) { SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> result = LinkedHashMultimap.create(); - for (Class<? extends ReferentialDto> dtoType : referentialIds.keys()) { + for (Class<? extends ReferentialDto> dtoType : referentialIds.keySet()) { Set<String> ids = referentialIds.get(dtoType); Class<ReferentialDtoReference> referenceType = ObserveBusinessProject.get().getMapping().getReferenceType(dtoType); Set<ReferentialDtoReference> references = getReferentialReferenceSet(referenceType).subSet(ids).collect(Collectors.toSet()); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java ===================================== @@ -22,7 +22,6 @@ package fr.ird.observe.client.datasource.actions.actions; * #L% */ -import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.SetMultimap; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUIHandler; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsagePanel.jaxx ===================================== @@ -17,18 +17,14 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<Table fill="both" constraints="BorderLayout.CENTER"> +<JPanel id="usages" border='{new TitledBorder(t("observe.ui.usage.usageTitle"))}' layout="{new BorderLayout()}"> <import> static io.ultreia.java4all.i18n.I18n.t </import> - <row> - <cell weighty="1" weightx="1"> - <JPanel id="usages" border='{new TitledBorder(t("observe.ui.usage.usageTitle"))}' layout="{new BorderLayout()}"> - <JPanel id="usagesCount" constraints="BorderLayout.WEST" layout="{new GridLayout(0, 1)}"/> - <JScrollPane id="dataPane" constraints='BorderLayout.CENTER'> - <JList id="dataList" genericType="String"/> - </JScrollPane> - </JPanel> - </cell> - </row> -</Table> + <JScrollPane id="usagesPane" constraints='BorderLayout.WEST' horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}'> + <JPanel id="usagesCount" layout="{new GridLayout(0, 1)}"/> + </JScrollPane> + <JScrollPane id="dataPane" constraints='BorderLayout.CENTER'> + <JList id="dataList" genericType="String"/> + </JScrollPane> +</JPanel> \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/21c795653e122a9ef33851f56… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/21c795653e122a9ef33851f56… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: La synchro simple de marées ne marche pas - See ultreiaio/ird-observe#2003
by Tony CHEMIT (＠tchemit) 27 Sep '21

27 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 023def69 by Tony Chemit at 2021-09-27T11:49:33+02:00 La synchro simple de marées ne marche pas - See ultreiaio/ird-observe#2003 - - - - - 28457534 by Tony Chemit at 2021-09-27T11:49:33+02:00 force build - - - - - 0cb274a0 by Tony Chemit at 2021-09-27T11:49:33+02:00 Add FIXME (See #1999) - - - - - 62239db6 by Tony Chemit at 2021-09-27T14:00:57+02:00 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004 - - - - - b63a2a9d by Tony Chemit at 2021-09-27T14:56:14+02:00 update pom - - - - - 13 changed files: - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ShowUsagesReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDeleteUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDesactivateUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDisplayUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java - pom.xml - services/api-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceFixtures.java - services/client-impl/pom.xml - − services/client-impl/src/main/java/fr/ird/observe/services/client/referential/ReferentialServiceClient.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocalSupport.java Changes: ===================================== client/datasource/actions/src/main/i18n/getters/java.getter ===================================== @@ -26,7 +26,6 @@ observe.ui.action.goto.previous.stage observe.ui.action.goto.previous.stage.tip observe.ui.action.info.storage.tip observe.ui.choice.cancel -observe.ui.choice.confirm.insert observe.ui.choice.replace observe.ui.datasource.actions.config.data.sources.equals observe.ui.datasource.editor.actions.consolidate @@ -47,7 +46,6 @@ observe.ui.datasource.editor.actions.data.export.result observe.ui.datasource.editor.actions.data.import.add.missing.referential observe.ui.datasource.editor.actions.data.import.add.missing.referential.for.type observe.ui.datasource.editor.actions.data.import.result -observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential observe.ui.datasource.editor.actions.exportData observe.ui.datasource.editor.actions.exportData.description observe.ui.datasource.editor.actions.exportData.message.not.possible ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java ===================================== @@ -22,10 +22,9 @@ package fr.ird.observe.client.datasource.actions.actions; * #L% */ +import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.SetMultimap; -import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; -import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUI; import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUIHandler; import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.dto.ToolkitIdLabel; @@ -40,6 +39,7 @@ import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.spi.decoration.I18nDecoratorHelper; import fr.ird.observe.spi.referential.MissingReferentialRequest; import fr.ird.observe.spi.referential.MissingReferentialResult; +import fr.ird.observe.spi.referential.ReferentialIds; import io.ultreia.java4all.application.template.spi.GenerateTemplate; import io.ultreia.java4all.lang.Strings; import org.apache.commons.lang3.StringUtils; @@ -47,7 +47,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; -import javax.swing.JOptionPane; import java.util.Collection; import java.util.Objects; import java.util.Set; @@ -57,7 +56,7 @@ import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; /** - * Hi-level object to perform business data management (says: delete some trip, copy some trip) + * Hi-level object to perform business data management (says: delete some trip, copy some trip, insert missing referential, ...) * <p> * Created on 10/02/2021. * @@ -116,9 +115,13 @@ public class DataManager { public WizardState insertMissingReferential(Collection<String> idsToCopy) { progressModel.increments(); + //FIXME Review this code, if a referential synchro was just performed before + //FIXME We then have already resolved all ids that are only on incoming source + //FIXME From this ids, retains all that are in data to export (on incoming source) + //FIXME That's all, no need to call target source ReferentialService targetReferentialService = targetSource.getReferentialService(); - SetMultimap<Class<? extends ReferentialDto>, String> targetSourceReferential = targetReferentialService.getReferentialIds(); - MissingReferentialRequest missingReferentialRequest = MissingReferentialRequest.of(targetSourceReferential, idsToCopy.toArray(new String[0])); + ReferentialIds targetSourceReferential = targetReferentialService.getReferentialIds(); + MissingReferentialRequest missingReferentialRequest = MissingReferentialRequest.of(targetSourceReferential.getIds(), idsToCopy.toArray(new String[0])); MissingReferentialResult missingReferentialResult = incomingSource.getReferentialService().computeMissingReferential(missingReferentialRequest); progressModel.increments(); @@ -132,18 +135,9 @@ public class DataManager { SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> usages = incomingSource.getReferentialMap(missingReferentialResult.getMissingIds()); - UsageForDisplayUI usagesUI = UsageForDisplayUIHandler.showMissingReferential(getMessage(), usages); + boolean response = UsageForDisplayUIHandler.showMissingReferential(getMessage(), usages, getTargetSourceLabel()); - int response = ClientUIContext.askUser(null, - t("observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential", getTargetSourceLabel()), - usagesUI, - JOptionPane.WARNING_MESSAGE, - new Object[]{ - t("observe.ui.choice.confirm.insert"), - t("observe.ui.choice.cancel")}, - 0); - - if (response != 0) { + if (!response) { progressModel.increments(); return WizardState.CANCELED; } ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -186,6 +186,7 @@ observe.ui.action.storage.applyAction observe.ui.choice.cancel observe.ui.choice.cancel.tip observe.ui.choice.confirm.delete +observe.ui.choice.confirm.insert observe.ui.choice.confirm.move observe.ui.choice.confirm.replace observe.ui.choice.continue @@ -208,6 +209,7 @@ observe.ui.datasource.avdth.import observe.ui.datasource.avdth.import.tip observe.ui.datasource.avdth.newImport observe.ui.datasource.avdth.newImport.tip +observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential observe.ui.datasource.editor.content.map.action.exportPng observe.ui.datasource.editor.content.map.action.exportPng.tip observe.ui.datasource.editor.content.map.action.zoomIt ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ShowUsagesReferential.java ===================================== @@ -22,14 +22,11 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.actions; * #L% */ -import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; import fr.ird.observe.client.datasource.editor.api.content.actions.ConfigureMenuAction; import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUI; import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUIModel; -import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUI; import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUIHandler; -import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.ToolkitIdLabel; import fr.ird.observe.dto.UsageCount; import fr.ird.observe.dto.reference.ReferentialDtoReference; @@ -37,8 +34,6 @@ import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.ToolkitReferentialDtoBean; import fr.ird.observe.services.service.referential.UsageService; -import javax.swing.JOptionPane; -import java.awt.Dimension; import java.awt.event.ActionEvent; import static io.ultreia.java4all.i18n.I18n.t; @@ -72,18 +67,7 @@ public final class ShowUsagesReferential<D extends ReferentialDto, R extends Ref ToolkitIdLabel reference = bean.toLabel(); getDecoratorService().installToolkitIdLabelDecorator(request.getType(), reference); - UsageForDisplayUI usagesUI = UsageForDisplayUIHandler.showUsages(usageService, reference, request, usages); - - Object[] options = {t("observe.ui.choice.quit")}; - JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.INFORMATION_MESSAGE, - JOptionPane.DEFAULT_OPTION, null, - options, options[0]); - - Dimension size = getMainUI().getPreferredSize(); - Dimension thisSize = new Dimension((int) size.getWidth() - 20, (int) size.getHeight() - 20); - pane.setPreferredSize(thisSize); - pane.putClientProperty(UIHelper.NO_PACK, true); - ClientUIContext.askUser(pane, t("observe.ui.title.show.usage"), options); + UsageForDisplayUIHandler.showUsages(usageService, reference, request, usages); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDeleteUIHandler.java ===================================== @@ -23,8 +23,6 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.usage; */ import fr.ird.observe.client.ClientUIContext; -import fr.ird.observe.client.ClientUIContextApplicationComponent; -import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ToolkitIdLabel; @@ -39,7 +37,6 @@ import org.apache.commons.lang3.tuple.Pair; import javax.swing.JLabel; import javax.swing.JOptionPane; -import java.awt.Dimension; import java.util.Collection; import java.util.List; @@ -81,10 +78,7 @@ public class UsageForDeleteUIHandler extends UsageUIHandlerSupport<UsageForDelet usagesUI.getHandler().attachToOptionPane(pane, replaceText); - Dimension size = ClientUIContextApplicationComponent.value().getMainUI().getPreferredSize(); - Dimension thisSize = new Dimension((int) size.getWidth() - 20, (int) size.getHeight() - 20); - pane.setPreferredSize(thisSize); - pane.putClientProperty(UIHelper.NO_PACK, true); + usagesUI.getHandler().setUISize(pane); int response = ClientUIContext.askUser(pane, t("observe.ui.title.can.not.delete.referentiel"), options); if (response == 0) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDesactivateUIHandler.java ===================================== @@ -23,8 +23,6 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.usage; */ import fr.ird.observe.client.ClientUIContext; -import fr.ird.observe.client.ClientUIContextApplicationComponent; -import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ToolkitIdLabel; @@ -41,7 +39,6 @@ import org.apache.logging.log4j.Logger; import javax.swing.JLabel; import javax.swing.JOptionPane; -import java.awt.Dimension; import java.util.Collection; import java.util.List; @@ -87,10 +84,7 @@ public class UsageForDesactivateUIHandler extends UsageUIHandlerSupport<UsageFor JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.WARNING_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]); usagesUI.getHandler().attachToOptionPane(pane, replaceText); - Dimension size = ClientUIContextApplicationComponent.value().getMainUI().getPreferredSize(); - Dimension thisSize = new Dimension((int) size.getWidth() - 20, (int) size.getHeight() - 20); - pane.setPreferredSize(thisSize); - pane.putClientProperty(UIHelper.NO_PACK, true); + usagesUI.getHandler().setUISize(pane); int response = ClientUIContext.askUser(pane, t("observe.ui.title.need.confirm.to.desactivate.referentiel"), options); log.debug("response : " + response); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDisplayUIHandler.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.usage; */ import com.google.common.collect.SetMultimap; +import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.ToolkitIdLabel; import fr.ird.observe.dto.UsageCount; @@ -34,6 +35,7 @@ import io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox; import io.ultreia.java4all.util.SingletonSupplier; import javax.swing.JLabel; +import javax.swing.JOptionPane; import java.util.Collection; import static io.ultreia.java4all.i18n.I18n.t; @@ -46,10 +48,10 @@ import static io.ultreia.java4all.i18n.I18n.t; */ public class UsageForDisplayUIHandler extends UsageUIHandlerSupport<UsageForDisplayUI> { - public static UsageForDisplayUI showUsages(UsageService usageService, - ToolkitIdLabel reference, - ToolkitReferentialDtoBean request, - UsageCount usages) { + public static void showUsages(UsageService usageService, + ToolkitIdLabel reference, + ToolkitReferentialDtoBean request, + UsageCount usages) { //FIXME utiliser une template String type = I18nDecoratorHelper.getType(request.getType()); String message = t("observe.ui.message.show.usages", type, reference); @@ -64,10 +66,20 @@ public class UsageForDisplayUIHandler extends UsageUIHandlerSupport<UsageForDisp return SingletonSupplier.of(() -> usageService.find(request, dtoType)); } }; - return UsageForDisplayUI.build(message, getter); + UsageForDisplayUI usagesUI = UsageForDisplayUI.build(message, getter); + + Object[] options = {t("observe.ui.choice.quit")}; + JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.INFORMATION_MESSAGE, + JOptionPane.DEFAULT_OPTION, null, + options, options[0]); + + usagesUI.getHandler().setUISize(pane); + ClientUIContext.askUser(pane, t("observe.ui.title.show.usage"), options); } - public static UsageForDisplayUI showMissingReferential(String message, SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> usages) { + public static boolean showMissingReferential(String message, + SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> usages, + String targetSourceLabel) { UsageCount count = new UsageCount(); for (Class<? extends ReferentialDto> dtoType : usages.keys()) { count.put(dtoType, (long) usages.get(dtoType).size()); @@ -84,7 +96,18 @@ public class UsageForDisplayUIHandler extends UsageUIHandlerSupport<UsageForDisp return SingletonSupplier.of(() -> usages.get((Class<? extends ReferentialDto>) dtoType)); } }; - return UsageForDisplayUI.build(message, getter); + UsageForDisplayUI usagesUI = UsageForDisplayUI.build(message, getter); + + String[] options = { + t("observe.ui.choice.confirm.insert"), + t("observe.ui.choice.cancel")}; + JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.WARNING_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]); + + usagesUI.getHandler().setUISize(pane); + String title = t("observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential", targetSourceLabel); + int response = ClientUIContext.askUser(pane, title, options); + return response == 0; + } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java ===================================== @@ -22,8 +22,10 @@ package fr.ird.observe.client.datasource.editor.api.content.referential.usage; * #L% */ +import fr.ird.observe.client.ClientUIContextApplicationComponent; import fr.ird.observe.client.WithClientUIContext; import fr.ird.observe.client.util.DisabledItemSelectionModel; +import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.ToolkitIdLabel; import fr.ird.observe.dto.UsageCount; @@ -36,12 +38,14 @@ import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.ButtonGroup; import javax.swing.JButton; +import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JOptionPane; import javax.swing.JToggleButton; import java.awt.Component; import java.awt.Container; +import java.awt.Dimension; import java.util.Collection; import java.util.List; import java.util.Objects; @@ -97,6 +101,8 @@ public abstract class UsageUIHandlerSupport<U extends JAXXObject> implements UIH String message = ui.getContextValue(String.class); getMessage().setText(message); + Dimension preferredSize = getClientUIContext().getMainUI().getPreferredSize(); + ((JComponent) ui).setMaximumSize(preferredSize); UsagesGetter usagesGetter = Objects.requireNonNull(ui.getContextValue(UsagesGetter.class)); if (usagesGetter.isEmpty()) { @@ -146,6 +152,13 @@ public abstract class UsageUIHandlerSupport<U extends JAXXObject> implements UIH }); } + protected void setUISize(JOptionPane pane) { + Dimension size = ClientUIContextApplicationComponent.value().getMainUI().getPreferredSize(); + Dimension thisSize = new Dimension((int) size.getWidth() - 20, (int) size.getHeight() - 20); + pane.setPreferredSize(thisSize); + pane.putClientProperty(UIHelper.NO_PACK, true); + } + private <D extends BusinessDto> void buildUsagePanel(ButtonGroup buttonGroup, Class<D> dtoType, UsagesGetter usagesGetter) { long count = usagesGetter.getCount().get(dtoType); SingletonSupplier<Collection<ToolkitIdLabel>> factory = usagesGetter.getUsages(dtoType); ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.96</version> + <version>2021.98</version> </parent> <groupId>fr.ird.observe</groupId> @@ -161,7 +161,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - + <lib.version.toolkit>5.0.45-SNAPSHOT</lib.version.toolkit> <lib.version.ognl>3.1.29</lib.version.ognl>  @@ -172,8 +172,8 @@ <lib.version.graalvm>21.1.0</lib.version.graalvm>  -  -  + +    ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/referential/ReferentialServiceFixtures.java ===================================== @@ -24,17 +24,16 @@ package fr.ird.observe.services.service.referential; import com.google.common.collect.LinkedHashMultimap; -import com.google.common.collect.SetMultimap; import fr.ird.observe.dto.ToolkitIdLabel; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; -import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.common.ProgramDto; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.spi.referential.MissingReferentialRequest; import fr.ird.observe.spi.referential.MissingReferentialResult; +import fr.ird.observe.spi.referential.ReferentialIds; import org.junit.Assert; import java.util.Collections; @@ -105,7 +104,7 @@ public class ReferentialServiceFixtures extends GeneratedReferentialServiceFixtu @Override public void getReferentialIds(ObserveServicesProvider servicesProvider, ReferentialService service) { - SetMultimap<Class<? extends ReferentialDto>, String> actual = service.getReferentialIds(); + ReferentialIds actual = service.getReferentialIds(); Assert.assertNotNull(actual); Assert.assertEquals(getIntegerProperty("getReferentialIds.count"), actual.keySet().size()); Assert.assertEquals(REFERENTIAL_COUNT, actual.size()); ===================================== services/client-impl/pom.xml ===================================== @@ -113,10 +113,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> ===================================== services/client-impl/src/main/java/fr/ird/observe/services/client/referential/ReferentialServiceClient.java deleted ===================================== @@ -1,44 +0,0 @@ -package fr.ird.observe.services.client.referential; - -/*- - * #%L - * ObServe Services :: Client implementation - * %% - * Copyright (C) 2008 - 2021 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 com.google.common.collect.SetMultimap; -import com.google.gson.reflect.TypeToken; -import fr.ird.observe.dto.referential.ReferentialDto; -import org.apache.http.HttpStatus; - -import javax.annotation.Generated; -import java.util.concurrent.TimeUnit; - -@Generated(value = "io.ultreia.java4all.http.maven.plugin.GenerateHttpClientMojo", date = "Fri Sep 17 15:00:51 CEST 2021") -public class ReferentialServiceClient extends GeneratedReferentialServiceClient { - - //FIXME Generate this - @Override - public SetMultimap<Class<? extends ReferentialDto>, String> getReferentialIds() { - return executeRequest(create("getReferentialIds") - .addAuthToken() - .setTimeout(TimeUnit.MINUTES, 1) - .post(), HttpStatus.SC_OK).toJson(new TypeToken<SetMultimap<Class<? extends ReferentialDto>, String>>(){}.getType()); - } -} ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocalSupport.java ===================================== @@ -48,6 +48,7 @@ import fr.ird.observe.spi.module.ObserveBusinessProject; import fr.ird.observe.spi.referential.MissingReferentialIdsBuilder; import fr.ird.observe.spi.referential.MissingReferentialRequest; import fr.ird.observe.spi.referential.MissingReferentialResult; +import fr.ird.observe.spi.referential.ReferentialIds; import fr.ird.observe.spi.referential.sql.ReplaceSqlStatementGenerator; import fr.ird.observe.spi.referential.synchro.OneSideSqlRequest; import fr.ird.observe.spi.referential.synchro.OneSideSqlResult; @@ -244,14 +245,14 @@ class ReferentialServiceLocalSupport extends ObserveServiceLocal implements Refe } @Override - public SetMultimap<Class<? extends ReferentialDto>, String> getReferentialIds() { + public ReferentialIds getReferentialIds() { SetMultimap<Class<? extends ReferentialDto>, String> result = LinkedHashMultimap.create(); for (Class<? extends ReferentialDto> dtoType : ObserveBusinessProject.get().getReferentialTypes()) { ReferentialDtoEntityContext<?, ?, ?, ?> spi = ObservePersistenceBusinessProject.fromReferentialDto(dtoType); List<String> allIds = spi.getDao(getTopiaPersistenceContext()).findAllIds(); result.putAll(dtoType, allIds); } - return result; + return ReferentialIds.of(result); } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/359abaa9a5eb36a52516d787… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/359abaa9a5eb36a52516d787… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] force build
by Tony CHEMIT (＠tchemit) 26 Sep '21

26 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 359abaa9 by Tony Chemit at 2021-09-26T19:08:38+02:00 force build - - - - - 2 changed files: - pom.xml - services/client-impl/pom.xml Changes: ===================================== pom.xml ===================================== @@ -161,7 +161,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - + <lib.version.toolkit>5.0.45-SNAPSHOT</lib.version.toolkit> <lib.version.ognl>3.1.29</lib.version.ognl>  @@ -172,8 +172,8 @@ <lib.version.graalvm>21.1.0</lib.version.graalvm>  -  -  + <lib.version.java4all.topia>1.52-SNAPSHOT</lib.version.java4all.topia> + <lib.version.java4all.eugene>3.0-alpha-42-SNAPSHOT</lib.version.java4all.eugene>    ===================================== services/client-impl/pom.xml ===================================== @@ -113,10 +113,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/359abaa9a5eb36a52516d7871… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/359abaa9a5eb36a52516d7871… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 12 commits: Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001
by Tony CHEMIT (＠tchemit) 26 Sep '21

26 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 17fdef03 by Tony Chemit at 2021-09-26T05:44:35+02:00 Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001 - - - - - bf6e317b by Tony Chemit at 2021-09-26T17:00:47+02:00 Définition des reports PS logbooks tabulaires [sample] - See #1969 - - - - - f3e13a9d by Tony Chemit at 2021-09-26T17:00:47+02:00 update public api doc - - - - - 4af9749f by Tony Chemit at 2021-09-26T17:00:47+02:00 fix Survey decorator - - - - - 4298e31b by Tony Chemit at 2021-09-26T17:00:47+02:00 Ajout d'une action nouvel import - Closes #2002 - - - - - 99dc2c27 by Tony Chemit at 2021-09-26T17:00:47+02:00 Remplir les données depuis AVDTH - See #1866 ne pas conserver les échantillon marhcé local qui sont en fait vides. - - - - - 70f31063 by Tony Chemit at 2021-09-26T17:00:47+02:00 amélioration report psLogbookTrip - - - - - d4d757c3 by Tony Chemit at 2021-09-26T17:00:55+02:00 Amélioration du rendu visuel d'une activité - Closes #1610 - - - - - 548e8914 by Tony Chemit at 2021-09-26T17:00:55+02:00 use tck db for more tests - - - - - 8af34ccc by Tony Chemit at 2021-09-26T17:00:55+02:00 improve layout and reduce some actions texts - - - - - 5948c791 by Tony Chemit at 2021-09-26T17:00:55+02:00 fix log - - - - - 0b861db0 by Tony Chemit at 2021-09-26T19:03:35+02:00 La synchro simple de marées ne marche pas - See ultreiaio/ird-observe#2003 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/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/actions/Import.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/NewImport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/AddNewRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/DeleteSelectedRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ImportAvdthFileAction.java - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleSpeciesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleActivityTableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUI.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/SampleUIHandler.java - 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/logbook/TripWellPlanUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/TripWellPlanUITableModel.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/table/GenerateContentTableUITableModel.java - 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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b4e82c08837493b5809be30f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b4e82c08837493b5809be30f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001
by Tony CHEMIT (＠tchemit) 24 Sep '21

24 Sep '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: aac3e127 by Tony Chemit at 2021-09-24T16:56:55+02:00 Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001 - - - - - fb623280 by Tony Chemit at 2021-09-24T16:56:55+02:00 Définition des reports PS logbooks tabulaires [sample] - See #1969 - - - - - c448d20b by Tony Chemit at 2021-09-24T16:56:55+02:00 update public api doc - - - - - d9b55b30 by Tony Chemit at 2021-09-24T16:56:55+02:00 fix Survey decorator - - - - - e4c36acc by Tony Chemit at 2021-09-24T16:56:55+02:00 Ajout d'une action nouvel import - Closes #2002 - - - - - b4e82c08 by Tony Chemit at 2021-09-24T16:56:55+02:00 Remplir les données depuis AVDTH - See #1866 ne pas conserver les échantillon marhcé local qui sont en fait vides. - - - - - 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/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/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/actions/Import.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/NewImport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ImportAvdthFileAction.java - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jaxx - 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/21-data-ps-logbook.model - models/definition/src/main/models/Observe/dto/attribute/notNull.properties - models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties - models/definition/src/main/models/Observe/dto/class/decorator.properties - models/definition/src/main/models/Observe/dto/class/i18nLabels.properties - models/definition/src/main/models/Observe/dto/class/references.properties - models/definition/src/main/models/Observe/persistence/21-data-ps-logbook.model - models/definition/src/main/models/Observe/persistence/attribute/notNull.properties - models/definition/src/main/models/Observe/persistence/attribute/orderBy.properties - models/dto/i18n/src/main/i18n/getters/labels.getter - models/dto/java/src/main/resources/observe-reports.properties - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngine.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleWriter.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/SampleReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/SampleWriter.java - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-PG.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/234bde6420e73d542b42ddf9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/234bde6420e73d542b42ddf9… You're receiving this email because of your account on gitlab.com.

1 0