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

[Git][ultreiaio/ird-observe][develop] 3 commits: Auto-chargement des rôles pour les utilisateurs de la base ciblées dans les...
by Tony CHEMIT 21 Aug '20

21 Aug '20

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

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: [Référentiel] Corriger un nom de champ - Closes #495
by Tony CHEMIT 20 Aug '20

20 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1d9d544a by Tony Chemit at 2020-08-19T12:39:08+02:00 [Référentiel] Corriger un nom de champ - Closes #495 - - - - - 6b43b215 by Tony Chemit at 2020-08-20T15:07:13+02:00 update pom - - - - - 3e2a697b by Tony Chemit at 2020-08-20T17:12:15+02:00 Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - Closes #1254 - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIHandler.java - client-datasource-editor-common/src/main/i18n/getters/jaxx.getter - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellEditor.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellRenderer.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/sample/SampleUIHandler.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/sample/SampleUIModel.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicTypeUI.jaxx → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCharacteristicTypeUI.jaxx - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicTypeUIHandler.java → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCharacteristicTypeUIHandler.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicTypeUIModel.java → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCharacteristicTypeUIModel.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicUI.jaxx → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCharacteristicUI.jaxx - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicUIHandler.java → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCharacteristicUIHandler.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicUIModel.java → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCharacteristicUIModel.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearUI.jaxx - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearUI.jcss - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearUIHandler.java - client-datasource-editor-ll/src/main/i18n/getters/java.getter - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesMeasurementsTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUITableModel.java - client-datasource-editor-ps/src/main/i18n/getters/java.getter - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesMeasurementsTableModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesUITableModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUI.jaxx → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/CatchUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUI.jcss → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/CatchUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUIHandler.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/CatchUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetCatchUIModel.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/CatchUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a0c7090980557bad6bf77003… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a0c7090980557bad6bf77003… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [Référentiel] Corriger un nom de champ - Closes #495
by Tony CHEMIT 19 Aug '20

19 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a0c70909 by Tony Chemit at 2020-08-19T11:32:53+02:00 [Référentiel] Corriger un nom de champ - Closes #495 - - - - - 30 changed files: - client-datasource-editor-common/src/main/i18n/getters/jaxx.getter - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellEditor.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/GearUseFeatureMeasurementCellRenderer.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicTypeUI.jaxx → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCharacteristicTypeUI.jaxx - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicTypeUIHandler.java → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCharacteristicTypeUIHandler.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicTypeUIModel.java → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCharacteristicTypeUIModel.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicUI.jaxx → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCharacteristicUI.jaxx - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicUIHandler.java → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCharacteristicUIHandler.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCaracteristicUIModel.java → client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearCharacteristicUIModel.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearUI.jaxx - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearUI.jcss - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/GearUIHandler.java - client-datasource-editor-ll/src/main/i18n/getters/java.getter - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesMeasurementsTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUITableModel.java - client-datasource-editor-ps/src/main/i18n/getters/java.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesMeasurementsTableModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesUITableModel.java - dto/src/main/i18n/getters/eugene.getter - dto/src/main/i18n/getters/java.getter - dto/src/main/java/fr/ird/observe/dto/ProtectedIds.java - dto/src/main/java/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementDto.java - dto/src/main/java/fr/ird/observe/dto/data/ps/common/GearUseFeaturesMeasurementDto.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java → dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCharacteristicDtoDecorator.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java → dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCharacteristicReferenceDecorator.java - dto/src/main/java/fr/ird/observe/dto/decoration/init/DataLlCommonModelDecoratorInitializer.java - dto/src/main/java/fr/ird/observe/dto/decoration/init/DataPsCommonModelDecoratorInitializer.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a0c7090980557bad6bf77003f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a0c7090980557bad6bf77003f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Move to version 8.1.0 (we will change the db model)
by Tony CHEMIT 18 Aug '20

18 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6ed074a4 by Tony Chemit at 2020-08-18T14:59:15+02:00 Move to version 8.1.0 (we will change the db model) - - - - - 232e2a9b by Tony Chemit at 2020-08-18T16:07:28+02:00 Remplacer le moteur de scripting utilisé - Closes #1532 Cela engendre une migration de données (pour remplacer length() par length dans le javascript en base) - - - - - 3fa15cee by Tony Chemit at 2020-08-18T16:07:31+02:00 Make FloatingObjectPreset compaliant with last yamlbean API - - - - - 448d68c4 by Tony Chemit at 2020-08-18T16:50:59+02:00 Make Server beans compaliant with last yamlbean API and simplify them to death... - - - - - 53082ff5 by Tony Chemit at 2020-08-18T19:23:41+02:00 Make some updates for webmotion and others - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-datasource-actions/pom.xml - client-datasource-editor-api/pom.xml - client-datasource-editor-api/src/main/java/fr/ird/observe/client/RunObserveListener.java - client-datasource-editor-common/pom.xml - client-datasource-editor-ll/pom.xml - client-datasource-editor-ps/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-dto/src/main/java/fr/ird/observe/dto/ObserveUtil.java - common-dto/src/main/java/fr/ird/observe/dto/referential/FormulaHelper.java - common-dto/src/test/java/fr/ird/observe/dto/ScriptTest.java - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto-spi/pom.xml - dto/pom.xml - dto/src/main/java/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset.java - dto/src/main/java/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPresetStorage.java - observe-i18n/pom.xml - observe/pom.xml - persistence-spi/pom.xml - persistence/pom.xml - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/impl/ObserveWebDatabaseRoleBean.java → persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_1.java - + persistence/src/main/resources/db/migration/8.1/01_ps_observation_fix_object_material_validation-common.sql - pom.xml - server-configuration/pom.xml - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/ObserveWebDatabase.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/ObserveWebDatabaseRole.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ef9da7b2be85341e51106ce7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ef9da7b2be85341e51106ce7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] * Remove manyToManyTableName tag value from persistence model, since in v8...
by Tony CHEMIT 17 Aug '20

17 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ef9da7b2 by Tony Chemit at 2020-08-17T18:41:28+02:00 * Remove manyToManyTableName tag value from persistence model, since in v8 entity names are db table names - - - - - 4 changed files: - persistence/src/main/models/Observe-20-data-ps-observation.model - persistence/src/main/models/Observe-30-data-ll-observation.model - persistence/src/main/models/Observe-31-data-ll-logbook.model - persistence/src/main/models/Observe-35-data-ll-common.model Changes: ===================================== persistence/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -25,7 +25,7 @@ wind {*:0..1} referential.common.Wind detectionMode {*:0..1} referential.ps.observation.DetectionMode reasonForNoFishing {*:0..1} referential.ps.observation.ReasonForNoFishing floatingObject + {*} data.ps.observation.FloatingObject | unique -observedSystem {*:*} referential.ps.observation.ObservedSystem | unique manyToManyTableName=activity_observedSystem +observedSystem {*:*} referential.ps.observation.ObservedSystem | unique set + {0..1} data.ps.observation.Set currentFpaZone {*:0..1} referential.common.FpaZone previousFpaZone {*:0..1} referential.common.FpaZone ===================================== persistence/src/main/models/Observe-30-data-ll-observation.model ===================================== @@ -108,7 +108,7 @@ catchFate {*:1} referential.ll.common.CatchFate discardHealthStatus {*:1} referential.ll.common.HealthStatus sizeMeasure + {*} data.ll.observation.SizeMeasure | orderBy=topiaCreateDate speciesCatch {*:1} referential.common.Species -predator {*:*} referential.common.Species | manyToManyTableName=catch_predator +predator {*:*} referential.common.Species section {*:0..1} data.ll.observation.Section maturityStatus {*:0..1} referential.ll.observation.MaturityStatus stomachFullness {*:0..1} referential.ll.observation.StomachFullness @@ -195,7 +195,7 @@ catches + {*} data.ll.observation.Catch | ordered lineType {*:0..1} referential.ll.common.LineType lightsticksType {*:0..1} referential.ll.common.LightsticksType lightsticksColor {*:0..1} referential.ll.common.LightsticksColor -mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set +mitigationType:set {*:*} referential.ll.common.MitigationType branchlinesComposition + {*} data.ll.observation.BranchlinesComposition | orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date @@ -256,7 +256,7 @@ meanFishingDepth + {*:1} Float medianFishingDepth + {*:1} Float branchline {*:0..1} data.ll.observation.Branchline sensorBrand {*:0..1} referential.ll.observation.SensorBrand -species {*:*} referential.common.Species | manyToManyTableName=species_tdr +species {*:*} referential.common.Species section {*:0..1} data.ll.observation.Section basket {*:0..1} data.ll.observation.Basket itemHorizontalPosition {*:0..1} referential.ll.observation.ItemHorizontalPosition ===================================== persistence/src/main/models/Observe-31-data-ll-logbook.model ===================================== @@ -67,7 +67,7 @@ lineType {*:0..1} referential.ll.common.LineType lightsticksUsed + {*:1} Boolean lightsticksType {*:0..1} referential.ll.common.LightsticksType lightsticksColor {*:0..1} referential.ll.common.LightsticksColor -mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set +mitigationType:set {*:*} referential.ll.common.MitigationType branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition | orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date @@ -118,7 +118,7 @@ tagNumber + {*:1} String catchFate {*:1} referential.ll.common.CatchFate discardHealthStatus {*:1} referential.ll.common.HealthStatus speciesCatch {*:1} referential.common.Species -predator {*:*} referential.common.Species | manyToManyTableName=catch_predator +predator {*:*} referential.common.Species catchHealthStatus {*:1} referential.ll.common.HealthStatus onBoardProcessing {*:1} referential.ll.common.OnBoardProcessing weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod ===================================== persistence/src/main/models/Observe-35-data-ll-common.model ===================================== @@ -35,7 +35,7 @@ logbookDataQuality {*:0..1} referential.common.DataQuality generalComment + {*:1} String | hibernateAttributeType=text observationsComment + {*:1} String | hibernateAttributeType=text logbookComment + {*:1} String | hibernateAttributeType=text -species {*:*} referential.common.Species | manyToManyTableName=species_trip +species {*:*} referential.common.Species observationsAvailability + {*:1} boolean logbookAvailability + {*:1} boolean gearUseFeatures + {*} data.ll.common.GearUseFeatures | unique orderBy=topiaCreateDate View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ef9da7b2be85341e51106ce7e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ef9da7b2be85341e51106ce7e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: * Remove dbName tag value from persistence model, since in v8 entity names are db table names
by Tony CHEMIT 17 Aug '20

17 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cb1085bd by Tony Chemit at 2020-08-17T17:58:12+02:00 * Remove dbName tag value from persistence model, since in v8 entity names are db table names - - - - - 38e6fa93 by Tony Chemit at 2020-08-17T18:13:51+02:00 * Remove reverseDbName tag value from persistence model, since in v8 entity names are db table names - - - - - 8 changed files: - persistence/src/main/models/Observe-02-referential-ps-common.model - persistence/src/main/models/Observe-03-referential-ps-observation.model - persistence/src/main/models/Observe-20-data-ps-observation.model - persistence/src/main/models/Observe-25-data-ps-common.model - persistence/src/main/models/Observe-30-data-ll-observation.model - persistence/src/main/models/Observe-31-data-ll-logbook.model - persistence/src/main/models/Observe-32-data-ll-landing.model - persistence/src/main/models/Observe-35-data-ll-common.model Changes: ===================================== persistence/src/main/models/Observe-02-referential-ps-common.model ===================================== @@ -18,5 +18,5 @@ referential.ps.common.TransmittingBuoyOwnership > referential.I18nReferentialEnt referential.ps.common.TransmittingBuoyType > referential.I18nReferentialEntity | entity technology + {*:1} String | hibernateAttributeType=text -referential.ps.common.VesselActivity > referential.I18nReferentialEntity | entity dbName=VesselActivity +referential.ps.common.VesselActivity > referential.I18nReferentialEntity | entity allowFad + {*:1} boolean ===================================== persistence/src/main/models/Observe-03-referential-ps-observation.model ===================================== @@ -36,5 +36,5 @@ referential.ps.observation.SpeciesStatus > referential.I18nReferentialEntity | e referential.ps.observation.SurroundingActivity > referential.I18nReferentialEntity | entity -referential.ps.observation.WeightCategory > referential.I18nReferentialEntity | entity dbName=WeightCategory +referential.ps.observation.WeightCategory > referential.I18nReferentialEntity | entity species {*:1} referential.common.Species | lazy=false ===================================== persistence/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -10,7 +10,7 @@ enum !fr.ird.observe.dto.data.ps.TypeTransmittingBuoyOperation enum !fr.ird.observe.dto.data.ps.DcpComputedValue -data.ps.observation.Activity > data.DataEntity >> data.ActivityAware | entity dbName=Activity +data.ps.observation.Activity > data.DataEntity >> data.ActivityAware | entity comment + {*:1} String | hibernateAttributeType=text time + {*:1} Date | hibernateAttributeType.java.util.Date=time latitude + {*:1} Float | sqlType=numeric @@ -19,14 +19,14 @@ vesselSpeed + {*:1} Float | sqlType=numeric seaSurfaceTemperature + {*:1} Float | sqlType=numeric observedSystemDistance + {*:1} Float | sqlType=numeric ersId + {*:1} String -vesselActivity {*:1} referential.ps.common.VesselActivity | dbName=vesselActivity +vesselActivity {*:1} referential.ps.common.VesselActivity surroundingActivity {*:0..1} referential.ps.observation.SurroundingActivity wind {*:0..1} referential.common.Wind detectionMode {*:0..1} referential.ps.observation.DetectionMode reasonForNoFishing {*:0..1} referential.ps.observation.ReasonForNoFishing -floatingObject + {*} data.ps.observation.FloatingObject | unique reverseDbName=activity -observedSystem {*:*} referential.ps.observation.ObservedSystem | unique manyToManyTableName=activity_observedSystem reverseDbName=activity -set + {0..1} data.ps.observation.Set | dbName=set +floatingObject + {*} data.ps.observation.FloatingObject | unique +observedSystem {*:*} referential.ps.observation.ObservedSystem | unique manyToManyTableName=activity_observedSystem +set + {0..1} data.ps.observation.Set currentFpaZone {*:0..1} referential.common.FpaZone previousFpaZone {*:0..1} referential.common.FpaZone nextFpaZone {*:0..1} referential.common.FpaZone @@ -137,11 +137,11 @@ activity + {*} data.ps.observation.Activity | unique orderBy=time data.ps.observation.SchoolEstimate > data.DataEntity | naturalIdMutable entity totalWeight + {*:1} Integer meanWeight + {*:1} Integer -set {*:1} data.ps.observation.Set | naturalId dbName=set +set {*:1} data.ps.observation.Set | naturalId species {*:1} referential.common.Species | naturalId weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod -data.ps.observation.Set > data.DataEntity >> data.SetAware | entity dbName=Set constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime +data.ps.observation.Set > data.DataEntity >> data.SetAware | entity constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime comment + {*:1} String | hibernateAttributeType=text startTime + {*:1} Date | hibernateAttributeType.java.util.Date=time endPursingTimeStamp + {*:1} Date @@ -157,13 +157,13 @@ currentMeasureDepth + {*:1} Integer schoolType {*:1} referential.ps.common.SchoolType targetCatchCompositionEstimatedByObserver + {*:1} boolean targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean -nonTargetCatch + {*} data.ps.observation.NonTargetCatch | ordered reverseDbName=set +nonTargetCatch + {*} data.ps.observation.NonTargetCatch | ordered reasonForNullSet {*:0..1} referential.ps.observation.ReasonForNullSet -nonTargetSample + {*} data.ps.observation.NonTargetSample | unique reverseDbName=set -targetSample + {*} data.ps.observation.TargetSample | unique reverseDbName=set -targetCatch + {*} data.ps.observation.TargetCatch | ordered reverseDbName=set -schoolEstimate + {*} data.ps.observation.SchoolEstimate | reverseDbName=set orderBy=topiaCreateDate -nonTargetCatchRelease + {*} data.ps.observation.NonTargetCatchRelease | ordered reverseDbName=set +nonTargetSample + {*} data.ps.observation.NonTargetSample | unique +targetSample + {*} data.ps.observation.TargetSample | unique +targetCatch + {*} data.ps.observation.TargetCatch | ordered +schoolEstimate + {*} data.ps.observation.SchoolEstimate | orderBy=topiaCreateDate +nonTargetCatchRelease + {*} data.ps.observation.NonTargetCatchRelease | ordered hasTargetCatch() boolean hasRejetThon() boolean canUseTargetSample(discarded boolean) boolean @@ -187,7 +187,7 @@ catchWeight + {*:1} Float | sqlType=numeric well + {*:1} String | naturalId notNull=false broughtOnDeck + {*:1} Boolean discarded + {*:1} boolean | naturalId -set {*:1} data.ps.observation.Set | naturalId dbName=set +set {*:1} data.ps.observation.Set | naturalId weightCategory {*:1} referential.ps.observation.WeightCategory | naturalId reasonForDiscard {*:0..1} referential.ps.observation.ReasonForDiscard | naturalId notNull=false weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod ===================================== persistence/src/main/models/Observe-25-data-ps-common.model ===================================== @@ -1,18 +1,18 @@ package fr.ird.observe.entities.data.ps.common| entity dbSchema=ps_common -data.ps.common.GearUseFeaturesMeasurement > data.DataEntity | entity dbName=GearUseFeaturesMeasurement +data.ps.common.GearUseFeaturesMeasurement > data.DataEntity | entity measurementValue + {*:1} String gearCaracteristic {*:1} referential.common.GearCaracteristic | notNull -data.ps.common.GearUseFeatures > data.DataEntity | entity dbName=GearUseFeatures +data.ps.common.GearUseFeatures > data.DataEntity | entity comment + {*:1} String | hibernateAttributeType=text number + {*:1} Integer usedInTrip + {*:1} Boolean gear {*:1} referential.common.Gear -gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement | orderBy=topiaCreateDate reverseDbName=gearUseFeatures +gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement | orderBy=topiaCreateDate getMeasurementsAsString() String -data.ps.common.Trip > data.DataEntity >> data.TripAware | entity dbName=Trip entryPoint +data.ps.common.Trip > data.DataEntity >> data.TripAware | entity entryPoint comment + {*:1} String | hibernateAttributeType=text startDate + {*:1} Date | hibernateAttributeType.java.util.Date=date endDate + {*:1} Date | hibernateAttributeType.java.util.Date=date @@ -22,7 +22,7 @@ reportsUrl + {*:1} String historicalData + {*:1} boolean ersId + {*:1} String ocean {*:0..1} referential.common.Ocean -route + {*} data.ps.observation.Route | unique orderBy=date reverseDbName=trip +route + {*} data.ps.observation.Route | unique orderBy=date vessel {*:1} referential.common.Vessel program {*:1} referential.common.Program observer {*:0..1} referential.common.Person @@ -31,6 +31,6 @@ dataEntryOperator {*:0..1} referential.common.Person departureHarbour {*:0..1} referential.common.Harbour landingHarbour {*:0..1} referential.common.Harbour dataQuality {*:0..1} referential.common.DataQuality -gearUseFeatures + {*} data.ps.common.GearUseFeatures | unique orderBy=topiaCreateDate reverseDbName=trip +gearUseFeatures + {*} data.ps.common.GearUseFeatures | unique orderBy=topiaCreateDate getObserverLabel() String getRouteCount() int ===================================== persistence/src/main/models/Observe-30-data-ll-observation.model ===================================== @@ -20,11 +20,11 @@ timeStamp + {*:1} Date latitude + {*:1} Float longitude + {*:1} Float seaSurfaceTemperature + {*:1} Float -set + {0..1} data.ll.observation.Set | dbName=set -encounter + {*} data.ll.observation.Encounter | reverseDbName=activity orderBy=topiaCreateDate +set + {0..1} data.ll.observation.Set +encounter + {*} data.ll.observation.Encounter | orderBy=topiaCreateDate vesselActivity {*:1} referential.ll.common.VesselActivity | lazy=false dataQuality {*:0..1} referential.common.DataQuality -sensorUsed + {*} data.ll.observation.SensorUsed | reverseDbName=activity orderBy=topiaCreateDate +sensorUsed + {*} data.ll.observation.SensorUsed | orderBy=topiaCreateDate fpaZone {*:1} referential.common.FpaZone getDate() Date getTime() Date @@ -43,10 +43,10 @@ settingIdentifier + {*:1} Integer | notNull haulingIdentifier + {*:1} Integer floatline1Length + {*:1} Float floatline2Length + {*:1} Float -branchline + {*} data.ll.observation.Branchline | unique orderBy=settingIdentifier reverseDbName=basket -catches {*} data.ll.observation.Catch | reverseDbName=basket -tdr {*} data.ll.observation.Tdr | reverseDbName=basket -set {*:1} data.ll.observation.Set | dbName=set +branchline + {*} data.ll.observation.Branchline | unique orderBy=settingIdentifier +catches {*} data.ll.observation.Catch +tdr {*} data.ll.observation.Tdr +set {*:1} data.ll.observation.Set getSection() data.ll.observation.Section setSection(section data.ll.observation.Section) @@ -68,8 +68,8 @@ tracelineLength + {*:1} Float | sqlType=numeric hookLost + {*:1} Boolean traceCutOff + {*:1} Boolean hookType {*:0..1} referential.ll.common.HookType -tdr {*} data.ll.observation.Tdr | reverseDbName=branchline -catches {*} data.ll.observation.Catch | reverseDbName=branchline +tdr {*} data.ll.observation.Tdr +catches {*} data.ll.observation.Catch baitType {*:0..1} referential.ll.common.BaitType topType {*:0..1} referential.ll.common.LineType tracelineType {*:0..1} referential.ll.common.LineType @@ -106,14 +106,14 @@ basket {*:0..1} data.ll.observation.Basket branchline {*:0..1} data.ll.observation.Branchline catchFate {*:1} referential.ll.common.CatchFate discardHealthStatus {*:1} referential.ll.common.HealthStatus -sizeMeasure + {*} data.ll.observation.SizeMeasure | reverseDbName=catch orderBy=topiaCreateDate +sizeMeasure + {*} data.ll.observation.SizeMeasure | orderBy=topiaCreateDate speciesCatch {*:1} referential.common.Species -predator {*:*} referential.common.Species | manyToManyTableName=catch_predator reverseDbName=catch +predator {*:*} referential.common.Species | manyToManyTableName=catch_predator section {*:0..1} data.ll.observation.Section maturityStatus {*:0..1} referential.ll.observation.MaturityStatus stomachFullness {*:0..1} referential.ll.observation.StomachFullness hookPosition {*:0..1} referential.ll.observation.HookPosition -weightMeasure + {*} data.ll.observation.WeightMeasure | reverseDbName=catch orderBy=topiaCreateDate +weightMeasure + {*} data.ll.observation.WeightMeasure | orderBy=topiaCreateDate catchHealthStatus {*:1} referential.ll.common.HealthStatus sex {*:0..1} referential.common.Sex weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod @@ -138,10 +138,10 @@ hookSize {*:1} referential.ll.common.HookSize data.ll.observation.Section > data.DataEntity >> data.ll.observation.LonglineCompositionAware | entity settingIdentifier + {*:1} Integer | notNull haulingIdentifier + {*:1} Integer -set {*:1} data.ll.observation.Set | dbName=set -basket + {*} data.ll.observation.Basket | unique orderBy=settingIdentifier | reverseDbName=section -tdr {*} data.ll.observation.Tdr | reverseDbName=section -catches {*} data.ll.observation.Catch | reverseDbName=section +set {*:1} data.ll.observation.Set +basket + {*} data.ll.observation.Basket | unique orderBy=settingIdentifier +tdr {*} data.ll.observation.Tdr +catches {*} data.ll.observation.Catch data.ll.observation.SensorUsed > data.DataEntity | entity data + {*:1} !java.sql.Blob @@ -185,18 +185,18 @@ haulingEndLatitude + {*:1} Float | sqlType=numeric haulingEndLongitude + {*:1} Float | sqlType=numeric haulingBreaks + {*:1} Integer monitored + {*:1} Boolean -baitsComposition + {*} data.ll.observation.BaitsComposition | reverseDbName=set orderBy=topiaCreateDate -floatlinesComposition + {*} data.ll.observation.FloatlinesComposition | reverseDbName=set orderBy=topiaCreateDate -hooksComposition + {*} data.ll.observation.HooksComposition | reverseDbName=set orderBy=topiaCreateDate -section + {*} data.ll.observation.Section | unique orderBy=settingIdentifier reverseDbName=set +baitsComposition + {*} data.ll.observation.BaitsComposition | orderBy=topiaCreateDate +floatlinesComposition + {*} data.ll.observation.FloatlinesComposition | orderBy=topiaCreateDate +hooksComposition + {*} data.ll.observation.HooksComposition | orderBy=topiaCreateDate +section + {*} data.ll.observation.Section | unique orderBy=settingIdentifier settingShape {*:1} referential.ll.common.SettingShape -tdr + {*} data.ll.observation.Tdr | reverseDbName=set orderBy=topiaCreateDate -catches + {*} data.ll.observation.Catch | ordered reverseDbName=set +tdr + {*} data.ll.observation.Tdr | orderBy=topiaCreateDate +catches + {*} data.ll.observation.Catch | ordered lineType {*:0..1} referential.ll.common.LineType lightsticksType {*:0..1} referential.ll.common.LightsticksType lightsticksColor {*:0..1} referential.ll.common.LightsticksColor -mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set reverseDbName=set -branchlinesComposition + {*} data.ll.observation.BranchlinesComposition | reverseDbName=set orderBy=topiaCreateDate +mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set +branchlinesComposition + {*} data.ll.observation.BranchlinesComposition | orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date setSettingStartDate(date Date) @@ -256,7 +256,7 @@ meanFishingDepth + {*:1} Float medianFishingDepth + {*:1} Float branchline {*:0..1} data.ll.observation.Branchline sensorBrand {*:0..1} referential.ll.observation.SensorBrand -species {*:*} referential.common.Species | manyToManyTableName=species_tdr reverseDbName=tdr +species {*:*} referential.common.Species | manyToManyTableName=species_tdr section {*:0..1} data.ll.observation.Section basket {*:0..1} data.ll.observation.Basket itemHorizontalPosition {*:0..1} referential.ll.observation.ItemHorizontalPosition ===================================== persistence/src/main/models/Observe-31-data-ll-logbook.model ===================================== @@ -14,7 +14,7 @@ currentDirection + {*:1} Integer vesselActivity {*:1} referential.ll.common.VesselActivity | lazy=false dataQuality {*:0..1} referential.common.DataQuality fpaZone {*:1} referential.common.FpaZone -relatedObservedActivity + {0..1} data.ll.observation.Activity | reverseDbName=activity +relatedObservedActivity + {0..1} data.ll.observation.Activity set + {0..1} data.ll.logbook.Set sample + {0..1} data.ll.logbook.Sample getStartDate() Date @@ -58,17 +58,17 @@ monitored + {*:1} Boolean totalLineLength + {*:1} Integer basketLineLength + {*:1} Integer lengthBetweenBranchlines + {*:1} Integer -baitsComposition + {*} data.ll.logbook.BaitsComposition | reverseDbName=set orderBy=topiaCreateDate -floatlinesComposition + {*} data.ll.logbook.FloatlinesComposition | reverseDbName=set orderBy=topiaCreateDate -hooksComposition + {*} data.ll.logbook.HooksComposition | reverseDbName=set orderBy=topiaCreateDate +baitsComposition + {*} data.ll.logbook.BaitsComposition | orderBy=topiaCreateDate +floatlinesComposition + {*} data.ll.logbook.FloatlinesComposition | orderBy=topiaCreateDate +hooksComposition + {*} data.ll.logbook.HooksComposition | orderBy=topiaCreateDate settingShape {*:1} referential.ll.common.SettingShape -catches + {*} data.ll.logbook.Catch | ordered reverseDbName=set +catches + {*} data.ll.logbook.Catch | ordered lineType {*:0..1} referential.ll.common.LineType lightsticksUsed + {*:1} Boolean lightsticksType {*:0..1} referential.ll.common.LightsticksType lightsticksColor {*:0..1} referential.ll.common.LightsticksColor -mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set reverseDbName=set -branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition | reverseDbName=set orderBy=topiaCreateDate +mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set +branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition | orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date setSettingStartDate(date Date) @@ -118,7 +118,7 @@ tagNumber + {*:1} String catchFate {*:1} referential.ll.common.CatchFate discardHealthStatus {*:1} referential.ll.common.HealthStatus speciesCatch {*:1} referential.common.Species -predator {*:*} referential.common.Species | manyToManyTableName=catch_predator reverseDbName=catch +predator {*:*} referential.common.Species | manyToManyTableName=catch_predator catchHealthStatus {*:1} referential.ll.common.HealthStatus onBoardProcessing {*:1} referential.ll.common.OnBoardProcessing weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod @@ -166,6 +166,6 @@ comment + {*:1} String | hibernateAttributeType=text timeStamp + {*:1} Date latitude + {*:1} Float | sqlType=numeric longitude + {*:1} Float | sqlType=numeric -samplePart + {*} data.ll.logbook.SamplePart | ordered dbName=samplePart reverseDbName=sample +samplePart + {*} data.ll.logbook.SamplePart | ordered getQuadrant() Integer setQuadrant(quadrant Integer) ===================================== persistence/src/main/models/Observe-32-data-ll-landing.model ===================================== @@ -9,7 +9,7 @@ compagnies {*:1} referential.ll.landing.Compagnies person {*:1} referential.common.Person harbour {*:0..1} referential.common.Harbour vessel {*:0..1} referential.common.Vessel -landingPart + {*} data.ll.landing.LandingPart | reverseDbName=landing orderBy=topiaCreateDate +landingPart + {*} data.ll.landing.LandingPart | orderBy=topiaCreateDate data.ll.landing.LandingPart > data.DataEntity | entity species {*:1} referential.common.Species ===================================== persistence/src/main/models/Observe-35-data-ll-common.model ===================================== @@ -4,7 +4,7 @@ data.ll.common.GearUseFeatures > data.DataEntity | entity comment + {*:1} String | hibernateAttributeType=text number + {*:1} Integer usedInTrip + {*:1} Boolean -gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement | unique orderBy=topiaCreateDate reverseDbName=gearUseFeatures +gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement | unique orderBy=topiaCreateDate gear {*:1} referential.common.Gear getMeasurementsAsString() String @@ -17,8 +17,8 @@ startDate + {*:1} Date endDate + {*:1} Date noOfCrewMembers + {*:1} Integer ersId + {*:1} String -activityObs + {*} data.ll.observation.Activity | unique reverseDbName=trip -activityLogbook + {*} data.ll.logbook.Activity | unique reverseDbName=trip +activityObs + {*} data.ll.observation.Activity | unique +activityLogbook + {*} data.ll.logbook.Activity | unique tripType {*:1} referential.ll.common.TripType observationMethod {*:1} referential.ll.common.ObservationMethod observer {*:1} referential.common.Person @@ -35,12 +35,12 @@ logbookDataQuality {*:0..1} referential.common.DataQuality generalComment + {*:1} String | hibernateAttributeType=text observationsComment + {*:1} String | hibernateAttributeType=text logbookComment + {*:1} String | hibernateAttributeType=text -species {*:*} referential.common.Species | manyToManyTableName=species_trip reverseDbName=trip +species {*:*} referential.common.Species | manyToManyTableName=species_trip observationsAvailability + {*:1} boolean logbookAvailability + {*:1} boolean -gearUseFeatures + {*} data.ll.common.GearUseFeatures | unique orderBy=topiaCreateDate reverseDbName=trip -landing + {*} data.ll.landing.Landing | unique orderBy=startDate reverseDbName=trip -sample + {*} data.ll.logbook.Sample | unique orderBy=timeStamp reverseDbName=trip +gearUseFeatures + {*} data.ll.common.GearUseFeatures | unique orderBy=topiaCreateDate +landing + {*} data.ll.landing.Landing | unique orderBy=startDate +sample + {*} data.ll.logbook.Sample | unique orderBy=timeStamp getActivityObsCount() int getActivityLogbookCount() int getSampleCount() int View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/75b2792a9e728ed67f960b20… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/75b2792a9e728ed67f960b20… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Improve DeleteSqlScriptProducerRequest builder API
by Tony CHEMIT 17 Aug '20

17 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7f7f1802 by Tony Chemit at 2020-08-17T15:43:02+02:00 Improve DeleteSqlScriptProducerRequest builder API - - - - - 75b2792a by Tony Chemit at 2020-08-17T17:27:23+02:00 * Generate lastUpdateDate sql scripts * Use last topia extension API * Improve persistence API - - - - - 30 changed files: - common-persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContextSupport.java - − common-persistence/src/main/java/fr/ird/observe/entities/UpdateEntityScript.java - + common-persistence/src/main/java/fr/ird/observe/entities/UpdateLastUpdateDateFieldScript.java - + common-persistence/src/main/java/fr/ird/observe/entities/UpdateLastUpdateDateTableScript.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContext.java - common-persistence/src/main/java/fr/ird/observe/spi/context/ReferentialDtoEntityContext.java - common-service/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java - persistence/pom.xml - persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - − persistence/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Activity-update.sql - − persistence/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Set-update.sql - − persistence/src/main/resources/fr/ird/observe/entities/data/ll/observation/Activity-update.sql - − persistence/src/main/resources/fr/ird/observe/entities/data/ll/observation/Set-update.sql - − persistence/src/main/resources/fr/ird/observe/entities/data/ps/observation/Activity-update.sql - − persistence/src/main/resources/fr/ird/observe/entities/data/ps/observation/FloatingObject-update.sql - − persistence/src/main/resources/fr/ird/observe/entities/data/ps/observation/Route-update.sql - − persistence/src/main/resources/fr/ird/observe/entities/data/ps/observation/Set-update.sql - persistence/src/test/java/fr/ird/observe/entities/ObserveTopiaApplicationContextTest.java - + persistence/src/test/java/fr/ird/observe/entities/UpdateLastUpdateDateFieldScriptTest.java - + persistence/src/test/java/fr/ird/observe/entities/UpdateLastUpdateDateTableScriptTest.java - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/ObserveServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/TripManagementServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/common/TripServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/pairing/ActivityPairingServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - toolbox-maven-plugin/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8deb907ac31f891bd4400d8a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8deb907ac31f891bd4400d8a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Impossible ouverture LL observation captures - Closes #1589
by Tony CHEMIT 16 Aug '20

16 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8deb907a by Tony Chemit at 2020-08-16T18:39:59+02:00 Impossible ouverture LL observation captures - Closes #1589 - - - - - 1 changed file: - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/LonglinePositionSetDtoHelper.java Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/LonglinePositionSetDtoHelper.java ===================================== @@ -22,7 +22,9 @@ package fr.ird.observe.services.local.service.data.ll.observation; * #L% */ +import fr.ird.observe.dto.data.ll.observation.BasketDto; import fr.ird.observe.dto.data.ll.observation.BasketReference; +import fr.ird.observe.dto.data.ll.observation.BranchlineDto; import fr.ird.observe.dto.data.ll.observation.BranchlineReference; import fr.ird.observe.dto.data.ll.observation.LonglinePositionAwareDto; import fr.ird.observe.dto.data.ll.observation.LonglinePositionSetDto; @@ -46,11 +48,15 @@ class LonglinePositionSetDtoHelper { target.addSections(sectionReference); for (Basket basket : section.getBasket()) { basket.setSection(section); - BasketReference basketReference = basket.toReference(referentialLocale); + BasketDto basketDto = basket.toDto(referentialLocale); + basketDto.setSection(sectionReference); + BasketReference basketReference = basketDto.toReference(referentialLocale); target.addBaskets(basketReference); for (Branchline branchline : basket.getBranchline()) { branchline.setBasket(basket); - BranchlineReference branchlineReference = branchline.toReference(referentialLocale); + BranchlineDto branchlineDto = branchline.toDto(referentialLocale); + branchlineDto.setBasket(basketReference); + BranchlineReference branchlineReference = branchlineDto.toReference(referentialLocale); target.addBranchlines(branchlineReference); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8deb907ac31f891bd4400d8aa… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8deb907ac31f891bd4400d8aa… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Impossible d'enregister une caléee ll observation - Closes #1588
by Tony CHEMIT 16 Aug '20

16 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0315ab30 by Tony Chemit at 2020-08-16T17:59:08+02:00 Impossible d'enregister une caléee ll observation - Closes #1588 - - - - - 2 changed files: - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/logbook/ActivityLonglineLogbookNavigationTreeNode.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/obs/ActivityLonglineObsNavigationTreeNode.java Changes: ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/logbook/ActivityLonglineLogbookNavigationTreeNode.java ===================================== @@ -111,6 +111,10 @@ public class ActivityLonglineLogbookNavigationTreeNode extends ReferenceNavigati @Override public int getNewPosition(DtoReference<?, ?> beanReference) { + if (beanReference.isNotPersisted()) { + // not persisted, always at bottom + return getChildCount(); + } if (beanReference instanceof SetReference) { return 0; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/obs/ActivityLonglineObsNavigationTreeNode.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.dto.data.ll.observation.ActivityDto; import fr.ird.observe.dto.data.ll.observation.ActivityReference; import fr.ird.observe.dto.data.ll.observation.SetDto; import fr.ird.observe.dto.data.ll.observation.SetReference; +import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.navigation.model.edit.longline.node.ObserveLonglineObsActivityEditNode; import fr.ird.observe.navigation.model.select.longline.node.ObserveLonglineObsActivitySelectNode; import fr.ird.observe.navigation.tree.SingleReferenceContainerNode; @@ -102,4 +103,17 @@ public class ActivityLonglineObsNavigationTreeNode extends ReferenceNavigationTr public SetLonglineObsNavigationTreeNode newSingleChildNode(String parentId) { return newSingleChildNode(new SetReference(getClientUIContext().getDecoratorService().getReferentialLocale())); } + + + @Override + public int getNewPosition(DtoReference<?, ?> beanReference) { + if (beanReference.isNotPersisted()) { + // not persisted, always at bottom + return getChildCount(); + } + if (beanReference instanceof SetReference) { + return 0; + } + return super.getNewPosition(beanReference); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0315ab3089ae93b65f0286d4b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0315ab3089ae93b65f0286d4b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Stash with a lots of improvements to be continued
by Tony CHEMIT 16 Aug '20

16 Aug '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0350df7e by Tony Chemit at 2020-08-16T15:49:33+02:00 Stash with a lots of improvements to be continued - - - - - 30 changed files: - common-persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContextSupport.java - common-persistence/src/main/java/fr/ird/observe/entities/UpdateEntityScript.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContext.java - common-persistence/src/main/java/fr/ird/observe/spi/context/ReferentialDtoEntityContext.java - persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - + persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaMetadataModelSupport.java - persistence/src/main/models/Observe-25-data-ps-common.model - persistence/src/main/models/Observe-35-data-ll-common.model - − persistence/src/main/resources/fr/ird/observe/entities/data/ll/common/Trip-update.sql - − persistence/src/main/resources/fr/ird/observe/entities/data/ps/common/Trip-update.sql - persistence/src/test/java/fr/ird/observe/entities/ObserveTopiaApplicationContextTest.java - + persistence/src/test/java/fr/ird/observe/entities/ObserveTopiaMetadataModelSupportTest.java - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/ObserveServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/common/TripGearUseFeaturesServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/common/TripServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/landing/LandingServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivitySampleServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetCatchServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetGlobalCompositionServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/TripSampleServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/BranchlineServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/pairing/ActivityPairingServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripGearUseFeaturesServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/NonTargetSampleServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/TargetSampleServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0350df7ef8562054bf91d7a1d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0350df7ef8562054bf91d7a1d… You're receiving this email because of your account on gitlab.com.

1 0