[Git][ultreiaio/ird-observe][develop] 4 commits: Persistence - Add ObservedSystem 110 (See #2429) - Observe-commits

1 Oct 2022


      Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
dc8c95fe by Tony Chemit at 2022-10-01T09:23:31+02:00
Persistence - Add ObservedSystem 110 (See #2429)

- - - - -
78599921 by Tony Chemit at 2022-10-01T09:23:31+02:00
Persistence - Modify AVDTH migration for vesselActivity 14 (See #2429)

- - - - -
ace26191 by Tony Chemit at 2022-10-01T09:23:31+02:00
Persistence - Remove generated resource

- - - - -
117f7b7c by Tony Chemit at 2022-10-01T09:23:45+02:00
Merge branch 'feature/issue_2429' into develop
Migration AVDTH des activités de type '14 - Chavire la poche' - Closes #2429

- - - - -


10 changed files:

- core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java
- core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java
- core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java
- core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java
- + core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_110-common.sql
- + core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_finalize-common.sql
- core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties
- model/src/main/resources/fixtures/global.properties
- − model/target/generated-sources/java/models/Observe/persistence.model
- src/site/markdown/avdth/referential.md


Changes:

=====================================
core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java
=====================================
@@ -134,6 +134,7 @@ public class ImportReferentialContext {
     private SpeciesCache speciesCache;
     private ObservedSystem observedSystem20;
     private ObservedSystem observedSystem103;
+    private ObservedSystem observedSystem110;
     private VesselActivity vesselActivity6;
     private SchoolType schoolType0;
     private SchoolType schoolType1;
@@ -205,6 +206,7 @@ public class ImportReferentialContext {
         observedSystem0 = observedSystem.get("0");
         observedSystem20 = observedSystem.get("20");
         observedSystem103 = observedSystem.get("103");
+        observedSystem110 = observedSystem.get("110");
 
         // dcp
         objectOperation = Maps.uniqueIndex(referential.getObjectOperation(), ObjectOperation::getCode);
@@ -476,6 +478,10 @@ public class ImportReferentialContext {
         return observedSystem103;
     }
 
+    public ObservedSystem getObservedSystem110() {
+        return observedSystem110;
+    }
+
     public ObservedSystem getObservedSystem20() {
         return observedSystem20;
     }


=====================================
core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java
=====================================
@@ -240,6 +240,12 @@ public class ActivityReader extends DataReader<Activity> {
                 // SetSuccessStatus=2 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091)
                 entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2());
                 break;
+            case "14": // (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2429)
+                // SetSuccessStatus=2
+                entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2());
+                // Add Observed system 110
+                entity.addObservedSystem(dataContext.getObservedSystem110());
+                break;
         }
         entity.setVesselActivity(dataContext.getVesselActivity(vesselActivityCode));
         Object setCount = resultSet.getObject(14);


=====================================
core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java
=====================================
@@ -77,7 +77,8 @@ public class VesselActivityInterceptor extends ReferentialInterceptor<VesselActi
             .put("11", "25")
             .put("12", "26")
             .put("13", "27")
-            .put("14", "28")
+            // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2429
+            .put("14", "6")
             .put("15", "0")
             .put("19", "29")
             .put("20", "30")


=====================================
core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java
=====================================
@@ -36,10 +36,12 @@ import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExec
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.stream.Stream;
 
 /**
  * Created on 19/01/2021.
@@ -175,6 +177,17 @@ public class DataSourceMigrationForVersion_9_0 extends ByMajorMigrationVersionRe
         migrateOneToOneComposition(executor, "ll_logbook", "activity", "sample", "_target.trip IS NULL");
         migrateOneToOneComposition(executor, "ps_observation", "activity", "set", null);
 
+        if (withIds) {
+            Map<String, String> scriptVariables = getScriptVariables();
+            // Add schoolType variables (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2115)
+            Set<Pair<String, String>> schoolTypedByCode = executor.findMultipleResultAstSet(SqlQuery.wrap(
+                    "SELECT code, topiaId FROM ps_common.SchoolType WHERE code IN " +
+                            "('0', '1', '2')", resultSet -> Pair.of(resultSet.getString(1), resultSet.getString(2))));
+            for (Pair<String, String> pair : schoolTypedByCode) {
+                scriptVariables.put("SchoolType_" + pair.getKey(), pair.getValue());
+            }
+            addObservedSystem(executor);
+        }
         executor.addScript("97", "change_nautical_length_types");
         executor.addScript("98_0", "finalize_migrate_oneToOne");
 
@@ -199,6 +212,19 @@ public class DataSourceMigrationForVersion_9_0 extends ByMajorMigrationVersionRe
         }
     }
 
+    private void addObservedSystem(MigrationVersionResourceExecutor executor) {
+        Set<String> existingCodes = executor.findMultipleResultAstSet(SqlQuery.wrap("SELECT CODE FROM ps_common.ObservedSystem", resultSet -> resultSet.getString(1)));
+        Set<String> newCodes = new LinkedHashSet<>();
+        Stream.of("110").forEach(code -> {
+            if (!existingCodes.contains(code)) {
+                executor.addScript("96", "add_referential_ps_common_ObservedSystem_" + code);
+                newCodes.add(code);
+            }
+        });
+        if (!newCodes.isEmpty()) {
+            executor.addScript("96", "add_referential_ps_common_ObservedSystem_finalize");
+        }
+    }
     static class Sample {
         String topiaId;
         long topiaVersion;


=====================================
core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_110-common.sql
=====================================
@@ -0,0 +1,23 @@
+---
+-- #%L
+-- ObServe Core :: Persistence :: Resources
+-- %%
+-- Copyright (C) 2008 - 2022 IRD, 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%
+---
+-- See https://gitlab.com/ultreiaio/ird-observe/-/issues/2070
+INSERT INTO ps_common.ObservedSystem(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, schoolType, allowObservation, allowLogbook, label1, label2, label3)VALUES ('fr.ird.referential.common.ObservedSystem#${REFERENTIAL_PREFIX}110', 0, '110', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, '${SchoolType_0}', FALSE, TRUE, 'Chavirage de la poche TODO', 'Chavirage de la poche', 'Chavirage de la poche TODO');


=====================================
core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_finalize-common.sql
=====================================
@@ -0,0 +1,22 @@
+---
+-- #%L
+-- ObServe Core :: Persistence :: Resources
+-- %%
+-- Copyright (C) 2008 - 2022 IRD, 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%
+---
+UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.common.ObservedSystem';


=====================================
core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties
=====================================
@@ -79,7 +79,7 @@ ps_common.acquisitionStatus=9
 ps_common.objectMaterial=91
 ps_common.objectMaterialType=5
 ps_common.objectOperation=12
-ps_common.observedSystem=63
+ps_common.observedSystem=64
 ps_common.program=17
 ps_common.reasonForNoFishing=16
 ps_common.reasonForNullSet=10


=====================================
model/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.DifferentialModelTest
-REFERENTIAL_COUNT=4090
+REFERENTIAL_COUNT=4091


=====================================
model/target/generated-sources/java/models/Observe/persistence.model deleted
=====================================
@@ -1,1270 +0,0 @@
-
-
-model Observe | generatePropertyChangeSupport
-model Observe | generateForeignKeyNames
-model Observe | notGenerateToString
-model Observe | indexForeignKeys
-model Observe | useEnumerationName=false
-model Observe | attributeType.Boolean=java.lang.Boolean
-model Observe | attributeType.Float=java.lang.Float
-model Observe | attributeType.Integer=java.lang.Integer
-model Observe | attributeType.Long=java.lang.Long
-model Observe | attributeType.String=java.lang.String
-model Observe | version=9.0
-model Observe | defaultPackage=fr.ird.observe.entities
-model Observe | useRelativeName
-model Observe | relativeNameExcludes=referential,data
-model Observe | daoSuperClass=org.nuiton.topia.persistence.internal.AbstractTopiaDao
-model Observe | persistenceContextSuperClass=fr.ird.observe.entities.ToolkitTopiaPersistenceContextSupport
-
-package fr.ird.observe.entities
-
-abstract Entity >> fr.ird.observe.dto.reference.DtoReferenceAware
-lastUpdateDate Date
-
-LastUpdateDate > Entity
-type String
-
-abstract data.DataEntity > Entity
-homeId String
-
-abstract data.RootOpenableEntity > data.DataEntity
-
-interface data.DataFileAware
-
-interface data.WithProportion
-
-interface data.GearFeaturesAware > fr.ird.observe.entities.data.DataEntity
-
-interface data.TripEntityAware > fr.ird.observe.entities.data.RootOpenableEntity
-
-package fr.ird.observe.entities.referential.common
-
-enum !fr.ird.observe.dto.referential.ReferenceStatus
-
-abstract referential.ReferentialEntity > Entity >> fr.ird.observe.dto.reference.ReferentialDtoReferenceAware
-code String
-uri String
-homeId String
-needComment boolean
-status !fr.ird.observe.dto.referential.ReferenceStatus
-isEnabled() boolean
-isDisabled() boolean
-
-abstract referential.I18nReferentialEntity > referential.ReferentialEntity
-label1 String
-label2 String
-label3 String
-label4 String
-label5 String
-label6 String
-label7 String
-label8 String
-getLabel(referentialLocale !fr.ird.observe.dto.referential.ReferentialLocale) String
-
-referential.common.Country > referential.I18nReferentialEntity
-iso2Code String
-iso3Code String
-
-referential.common.DataQuality > referential.I18nReferentialEntity
-
-referential.common.FpaZone > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
-startDate Date
-endDate Date
-
-referential.common.Gear > referential.I18nReferentialEntity
-gearCharacteristic {*:*} referential.common.GearCharacteristic
-
-referential.common.GearCharacteristic > referential.I18nReferentialEntity
-unit String
-gearCharacteristicType {*:1} referential.common.GearCharacteristicType
-
-referential.common.GearCharacteristicType > referential.I18nReferentialEntity
-
-referential.common.Harbour > referential.I18nReferentialEntity
-country {*:1} referential.common.Country
-locode String
-latitude Float
-longitude Float
-
-referential.common.LengthLengthParameter > referential.ReferentialEntity >> fr.ird.observe.dto.referential.WithFormula fr.ird.observe.dto.referential.ReferentialDtoReferenceWithNoCodeAware
-ocean {*:0..1} referential.common.Ocean
-species {*:1} referential.common.Species
-sex {*:1} referential.common.Sex
-inputSizeMeasureType {*:1} referential.common.SizeMeasureType
-outputSizeMeasureType {*:1} referential.common.SizeMeasureType
-startDate Date
-endDate Date
-coefficients String
-source String
-inputOutputFormula String
-outputInputFormula String
-
-referential.common.LengthWeightParameter > referential.ReferentialEntity >> fr.ird.observe.dto.referential.WithFormula fr.ird.observe.dto.referential.ReferentialDtoReferenceWithNoCodeAware
-ocean {*:0..1} referential.common.Ocean
-species {*:1} referential.common.Species
-sex {*:1} referential.common.Sex
-sizeMeasureType {*:0..1} referential.common.SizeMeasureType
-startDate Date
-endDate Date
-coefficients String
-source String
-lengthWeightFormula String
-weightLengthFormula String
-meanLength Float
-meanWeight Float
-
-referential.common.LengthMeasureMethod > referential.I18nReferentialEntity
-
-referential.common.WeightMeasureMethod > referential.I18nReferentialEntity
-
-referential.common.Ocean > referential.I18nReferentialEntity
-northEastAllowed boolean
-southEastAllowed boolean
-southWestAllowed boolean
-northWestAllowed boolean
-
-referential.common.Organism > referential.I18nReferentialEntity
-country {*:1} referential.common.Country
-description String
-
-referential.common.Person > referential.ReferentialEntity >> fr.ird.observe.dto.referential.ReferentialDtoReferenceWithNoCodeAware
-lastName String
-firstName String
-observer boolean
-captain boolean
-dataEntryOperator boolean
-dataSource boolean
-psSampler boolean
-country {*:0..1} referential.common.Country
-getLabel() String
-
-referential.common.Sex > referential.I18nReferentialEntity
-
-referential.common.ShipOwner > referential.ReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
-label String
-startDate Date
-endDate Date
-country {*:0..1} referential.common.Country
-
-referential.common.SizeMeasureType > referential.I18nReferentialEntity
-
-referential.common.Species > referential.I18nReferentialEntity >> fr.ird.observe.dto.referential.ReferentialDtoReferenceWithNoCodeAware
-speciesGroup {*:0..1} referential.common.SpeciesGroup
-ocean {*:*} referential.common.Ocean
-faoCode String
-scientificLabel String
-wormsId Long
-minLength Float
-maxLength Float
-minWeight Float
-maxWeight Float
-sizeMeasureType {*:0..1} referential.common.SizeMeasureType
-weightMeasureType {*:0..1} referential.common.WeightMeasureType
-
-referential.common.SpeciesGroup > referential.I18nReferentialEntity
-speciesGroupReleaseMode {*:*} referential.common.SpeciesGroupReleaseMode
-
-referential.common.SpeciesGroupReleaseMode > referential.I18nReferentialEntity
-
-referential.common.SpeciesList > referential.I18nReferentialEntity
-species {*:+} referential.common.Species
-
-referential.common.Vessel > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
-vesselSizeCategory {*:1} referential.common.VesselSizeCategory
-vesselType {*:1} referential.common.VesselType
-flagCountry {*:1} referential.common.Country
-keelCode Integer
-fleetCountry {*:1} referential.common.Country
-changeDate Date
-yearService Integer
-length Float
-capacity Float
-powerCv Integer
-powerKW Integer
-searchMaximum Float
-comment String
-iccat String
-iotcId String
-nationalId String
-comId String
-tuviId String
-imoId String
-radioCallSignId String
-lloydId String
-wellRegex String
-startDate Date
-endDate Date
-shipOwner {*:0..1} referential.common.ShipOwner
-
-referential.common.VesselSizeCategory > referential.ReferentialEntity
-capacityLabel String
-gaugeLabel String
-
-referential.common.VesselType > referential.I18nReferentialEntity
-
-referential.common.WeightMeasureType > referential.I18nReferentialEntity
-
-referential.common.Wind > referential.I18nReferentialEntity >> fr.ird.observe.dto.referential.common.WindAware
-minSpeed Integer
-maxSpeed Integer
-minSwellHeight Float
-maxSwellHeight Float
-
-package fr.ird.observe.entities.referential.ps.common
-
-referential.ps.common.AcquisitionStatus > referential.I18nReferentialEntity
-observation boolean
-logbook boolean
-landing boolean
-targetWellsSampling boolean
-localMarket boolean
-localMarketWellsSampling boolean
-localMarketSurveySampling boolean
-advancedSampling boolean
-fieldEnabler boolean
-
-referential.ps.common.ObjectMaterialType > referential.I18nReferentialEntity
-
-referential.ps.common.ObjectMaterial > referential.I18nReferentialEntity
-legacyCode String
-standardCode String
-biodegradable Boolean
-nonEntangling Boolean
-childrenMultiSelectable boolean
-childSelectionMandatory boolean
-parent {*:0..1} referential.ps.common.ObjectMaterial
-objectMaterialType {*:1} referential.ps.common.ObjectMaterialType
-validation String
-getSimplifiedObjectMaterial() referential.ps.common.ObjectMaterial
-getSimplifiedParentObjectMaterial() referential.ps.common.ObjectMaterial
-
-referential.ps.common.ObjectOperation > referential.I18nReferentialEntity
-whenArriving boolean
-whenLeaving boolean
-
-referential.ps.common.ObservedSystem > referential.I18nReferentialEntity
-schoolType {*:1} referential.ps.common.SchoolType
-allowObservation boolean
-allowLogbook boolean
-
-referential.ps.common.Program > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
-organism {*:1} referential.common.Organism
-startDate Date
-endDate Date
-comment String
-observation boolean
-logbook boolean
-
-referential.ps.common.ReasonForNoFishing > referential.I18nReferentialEntity
-
-referential.ps.common.ReasonForNullSet > referential.I18nReferentialEntity
-
-referential.ps.common.SampleType > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
-localMarket boolean
-logbook boolean
-startDate Date
-endDate Date
-
-referential.ps.common.SchoolType > referential.I18nReferentialEntity
-
-referential.ps.common.SpeciesFate > referential.I18nReferentialEntity
-discard Boolean
-
-referential.ps.common.TransmittingBuoyOperation > referential.I18nReferentialEntity
-
-referential.ps.common.TransmittingBuoyOwnership > referential.I18nReferentialEntity
-
-referential.ps.common.TransmittingBuoyType > referential.I18nReferentialEntity
-technology String
-
-referential.ps.common.VesselActivity > referential.I18nReferentialEntity
-allowFad boolean
-
-referential.ps.common.WeightCategory > referential.I18nReferentialEntity
-species {*:1} referential.common.Species
-minWeight Float
-maxWeight Float
-meanWeight Float
-allowLanding boolean
-allowLogbook boolean
-allowWellPlan boolean
-
-package fr.ird.observe.entities.referential.ps.observation
-
-enum !fr.ird.observe.dto.data.ps.NonTargetCatchReleaseStatus
-
-referential.ps.observation.DetectionMode > referential.I18nReferentialEntity
-
-referential.ps.observation.InformationSource > referential.I18nReferentialEntity
-
-referential.ps.observation.NonTargetCatchReleaseConformity > referential.I18nReferentialEntity
-
-referential.ps.observation.NonTargetCatchReleaseStatus > referential.I18nReferentialEntity
-
-referential.ps.observation.NonTargetCatchReleasingTime > referential.I18nReferentialEntity
-
-referential.ps.observation.ReasonForDiscard > referential.I18nReferentialEntity
-
-referential.ps.observation.SpeciesStatus > referential.I18nReferentialEntity
-
-referential.ps.observation.SurroundingActivity > referential.I18nReferentialEntity
-
-
-package fr.ird.observe.entities.referential.ps.logbook 
-
-referential.ps.logbook.InformationSource > referential.I18nReferentialEntity
-
-referential.ps.logbook.SampleQuality > referential.I18nReferentialEntity
-
-referential.ps.logbook.SetSuccessStatus > referential.I18nReferentialEntity
-
-referential.ps.logbook.WellContentStatus > referential.I18nReferentialEntity
-
-referential.ps.logbook.WellSamplingConformity > referential.I18nReferentialEntity
-
-referential.ps.logbook.WellSamplingStatus > referential.I18nReferentialEntity
-
-
-package fr.ird.observe.entities.referential.ps.landing
-
-referential.ps.landing.Destination > referential.I18nReferentialEntity
-
-referential.ps.landing.Fate > referential.I18nReferentialEntity
-discard boolean
-
-
-
-package fr.ird.observe.entities.referential.ps.localmarket
-
-referential.ps.localmarket.BatchComposition > referential.I18nReferentialEntity
-
-referential.ps.localmarket.BatchWeightType > referential.I18nReferentialEntity
-
-referential.ps.localmarket.Packaging > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
-batchComposition {*:1} referential.ps.localmarket.BatchComposition
-batchWeightType {*:1} referential.ps.localmarket.BatchWeightType
-startDate Date
-endDate Date
-meanWeight Float
-harbour {*:0..1} referential.common.Harbour
-acceptHarbour(harbour referential.common.Harbour) boolean
-
-package fr.ird.observe.entities.referential.ll.common
-
-referential.ll.common.BaitSettingStatus > referential.I18nReferentialEntity
-
-referential.ll.common.BaitType > referential.I18nReferentialEntity
-
-referential.ll.common.CatchFate > referential.I18nReferentialEntity
-
-referential.ll.common.HealthStatus > referential.I18nReferentialEntity
-
-referential.ll.common.HookSize > referential.I18nReferentialEntity
-
-referential.ll.common.HookType > referential.I18nReferentialEntity
-
-referential.ll.common.LightsticksColor > referential.I18nReferentialEntity
-
-referential.ll.common.LightsticksType > referential.I18nReferentialEntity
-
-referential.ll.common.LineType > referential.I18nReferentialEntity
-
-referential.ll.common.MitigationType > referential.I18nReferentialEntity
-
-referential.ll.common.ObservationMethod > referential.I18nReferentialEntity
-
-referential.ll.common.OnBoardProcessing > referential.I18nReferentialEntity
-
-referential.ll.common.Program > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
-organism {*:1} referential.common.Organism
-startDate Date
-endDate Date
-comment String
-observation boolean
-logbook boolean
-
-referential.ll.common.SettingShape > referential.I18nReferentialEntity
-
-referential.ll.common.TripType > referential.I18nReferentialEntity
-
-referential.ll.common.VesselActivity > referential.I18nReferentialEntity
-
-referential.ll.common.WeightDeterminationMethod > referential.I18nReferentialEntity
-
-
-package fr.ird.observe.entities.referential.ll.observation
-
-referential.ll.observation.BaitHaulingStatus > referential.I18nReferentialEntity
-
-referential.ll.observation.EncounterType > referential.I18nReferentialEntity
-
-referential.ll.observation.HookPosition > referential.I18nReferentialEntity
-
-referential.ll.observation.ItemHorizontalPosition > referential.I18nReferentialEntity
-
-referential.ll.observation.ItemVerticalPosition > referential.I18nReferentialEntity
-
-referential.ll.observation.MaturityStatus > referential.I18nReferentialEntity
-lowerValue String
-upperValue String
-
-referential.ll.observation.SensorBrand > referential.ReferentialEntity
-brandName String
-
-referential.ll.observation.SensorDataFormat > referential.I18nReferentialEntity
-
-referential.ll.observation.SensorType > referential.I18nReferentialEntity
-
-referential.ll.observation.StomachFullness > referential.I18nReferentialEntity
-
-
-
-
-
-package fr.ird.observe.entities.referential.ll.landing
-
-referential.ll.landing.Company > referential.I18nReferentialEntity
-
-referential.ll.landing.Conservation > referential.I18nReferentialEntity
-
-referential.ll.landing.DataSource > referential.I18nReferentialEntity
-
-
-package fr.ird.observe.entities.data.ps.observation
-
-interface data.ps.observation.LengthWeightComputableAware > fr.ird.observe.entities.data.DataEntity
-
-enum !fr.ird.observe.dto.data.ps.CatchComputedValueSource
-
-enum !fr.ird.observe.dto.data.ps.NonTargetCatchReleaseStatus
-
-enum !fr.ird.observe.dto.data.ps.TypeTransmittingBuoyOperation
-
-enum !fr.ird.observe.dto.data.ps.DcpComputedValue
-
-data.ps.observation.Activity > data.DataEntity
-comment String
-time Date
-latitude Float
-longitude Float
-vesselSpeed Float
-seaSurfaceTemperature Float
-observedSystemDistance Float
-ersId String
-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.common.ReasonForNoFishing
-set + {0..1} data.ps.observation.Set
-floatingObject + {*} data.ps.observation.FloatingObject
-observedSystem {*:*} referential.ps.common.ObservedSystem
-currentFpaZone {*:0..1} referential.common.FpaZone
-previousFpaZone {*:0..1} referential.common.FpaZone
-nextFpaZone {*:0..1} referential.common.FpaZone
-dataQuality {*:0..1} referential.common.DataQuality
-getSchoolTypeId() String
-isActivityEndOfSearching() boolean
-getDate() Date
-
-data.ps.observation.FloatingObject > data.DataEntity
-comment String
-objectSchoolEstimate + {*} data.ps.observation.ObjectSchoolEstimate
-objectObservedSpecies + {*} data.ps.observation.ObjectObservedSpecies
-objectOperation {*:1} referential.ps.common.ObjectOperation
-supportVesselName String
-transmittingBuoy + {*} data.ps.observation.TransmittingBuoy
-floatingObjectPart + {*} data.ps.observation.FloatingObjectPart
-computedWhenArrivingBiodegradable !fr.ird.observe.dto.data.ps.DcpComputedValue
-computedWhenArrivingNonEntangling !fr.ird.observe.dto.data.ps.DcpComputedValue
-computedWhenArrivingSimplifiedObjectType String
-computedWhenLeavingBiodegradable !fr.ird.observe.dto.data.ps.DcpComputedValue
-computedWhenLeavingNonEntangling !fr.ird.observe.dto.data.ps.DcpComputedValue
-computedWhenLeavingSimplifiedObjectType String
-
-data.ps.observation.FloatingObjectPart > data.DataEntity
-whenArriving String
-whenLeaving String
-objectMaterial {*:1} referential.ps.common.ObjectMaterial
-
-data.ps.observation.NonTargetCatchRelease > data.DataEntity
-comment String
-length Float
-count Integer
-acquisitionMode int
-species {*:1} referential.common.Species
-status {*:1} referential.ps.observation.NonTargetCatchReleaseStatus
-sex {*:1} referential.common.Sex
-speciesGroupReleaseMode {*:1} referential.common.SpeciesGroupReleaseMode
-conformity {*:1} referential.ps.observation.NonTargetCatchReleaseConformity
-releasingTime {*:1} referential.ps.observation.NonTargetCatchReleasingTime
-lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethod
-
-data.ps.observation.ObjectObservedSpecies > data.DataEntity
-count Integer
-species {*:1} referential.common.Species
-speciesStatus {*:1} referential.ps.observation.SpeciesStatus
-
-data.ps.observation.ObjectSchoolEstimate > data.DataEntity
-totalWeight Integer
-species {*:1} referential.common.Species
-weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
-
-data.ps.observation.Route > data.DataEntity
-comment String
-date Date
-startLogValue Float
-endLogValue Float
-activity + {*} data.ps.observation.Activity
-
-data.ps.observation.SchoolEstimate > data.DataEntity
-totalWeight Integer
-meanWeight Integer
-species {*:1} referential.common.Species
-weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
-
-data.ps.observation.Set > data.DataEntity
-comment String
-startTime Date
-haulingStartTimeStamp Date
-haulingEndTimeStamp Date
-endTimeStamp Date
-maxGearDepth Integer
-currentSpeed Float
-currentDirection Integer
-schoolTopDepth Integer
-schoolMeanDepth Integer
-schoolThickness Integer
-supportVesselName String
-currentMeasureDepth Integer
-schoolType {*:1} referential.ps.common.SchoolType
-reasonForNullSet {*:0..1} referential.ps.common.ReasonForNullSet
-schoolEstimate + {*} data.ps.observation.SchoolEstimate
-catches + {*} data.ps.observation.Catch
-sample + {*} data.ps.observation.Sample
-nonTargetCatchRelease + {*} data.ps.observation.NonTargetCatchRelease
-hasCatch() boolean
-canUseSample() boolean
-canUseNonTargetCatchRelease() boolean
-isFreeSchoolType() boolean
-isSchoolObjectType() boolean
-isUnknownSchoolType() boolean
-getSampleMeasureSize() int
-
-data.ps.observation.TransmittingBuoy > data.DataEntity
-comment String
-code String
-transmittingBuoyOwnership {*:1} referential.ps.common.TransmittingBuoyOwnership
-transmittingBuoyType {*:1} referential.ps.common.TransmittingBuoyType
-transmittingBuoyOperation {*:1} referential.ps.common.TransmittingBuoyOperation
-country {*:1} referential.common.Country
-vessel {*:1} referential.common.Vessel
-latitude Float
-longitude Float
-
-data.ps.observation.Catch > data.DataEntity >> data.ps.observation.LengthWeightComputableAware fr.ird.observe.dto.data.WellIdAware
-comment String
-catchWeight Float
-catchWeightComputedSource !fr.ird.observe.dto.data.ps.CatchComputedValueSource
-meanWeight Float
-meanWeightComputedSource !fr.ird.observe.dto.data.ps.CatchComputedValueSource
-meanLength Float
-meanLengthComputedSource !fr.ird.observe.dto.data.ps.CatchComputedValueSource
-totalCount Integer
-totalCountComputedSource !fr.ird.observe.dto.data.ps.CatchComputedValueSource
-well String
-reasonForDiscard {*:0..1} referential.ps.observation.ReasonForDiscard
-informationSource {*:0..1} referential.ps.observation.InformationSource
-species {*:1} referential.common.Species
-weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
-lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethod
-speciesFate {*:0..1} referential.ps.common.SpeciesFate
-isCatchWeightComputed() boolean
-isMeanWeightComputed() boolean
-isTotalCountComputed() boolean
-isMeanLengthComputed() boolean
-
-data.ps.observation.Sample > data.DataEntity
-comment String
-sampleMeasure + {*} data.ps.observation.SampleMeasure
-
-data.ps.observation.SampleMeasure > data.DataEntity >> data.ps.observation.LengthWeightComputableAware
-length Float
-isLengthComputed boolean
-picturesReferences String
-weight Float
-isWeightComputed boolean
-count Integer
-acquisitionMode int
-tagNumber String
-species {*:1} referential.common.Species
-sex {*:1} referential.common.Sex
-speciesFate {*:0..1} referential.ps.common.SpeciesFate
-sizeMeasureType {*:1} referential.common.SizeMeasureType
-weightMeasureType {*:0..1} referential.common.WeightMeasureType
-weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
-lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethod
-
-
-package fr.ird.observe.entities.data.ps.logbook
-
-data.ps.logbook.Activity > data.DataEntity
-comment String
-time Date
-latitude Float
-longitude Float
-latitudeOriginal Float
-longitudeOriginal Float
-originalDataModified boolean
-vmsDivergent boolean
-positionCorrected boolean
-number int
-setCount Integer
-seaSurfaceTemperature Float
-windDirection Integer
-vesselActivity {*:1} referential.ps.common.VesselActivity
-wind {*:0..1} referential.common.Wind
-totalWeight Float
-currentSpeed Float
-currentDirection Integer
-schoolType {*:1} referential.ps.common.SchoolType
-relatedObservedActivity {0..1} data.ps.observation.Activity
-catches + {*} data.ps.logbook.Catch
-floatingObject + {*} data.ps.logbook.FloatingObject
-observedSystem {*:*} referential.ps.common.ObservedSystem
-fpaZone {*:0..1} referential.common.FpaZone
-dataQuality {*:0..1} referential.common.DataQuality
-informationSource {*:0..1} referential.ps.logbook.InformationSource
-reasonForNoFishing {*:0..1} referential.ps.common.ReasonForNoFishing
-setSuccessStatus   {*:0..1} referential.ps.logbook.SetSuccessStatus
-reasonForNullSet {*:0..1} referential.ps.common.ReasonForNullSet
-getSchoolTypeId() String
-getDate() Date
-
-data.ps.logbook.Catch > data.DataEntity >> fr.ird.observe.dto.data.WellIdAware
-comment String
-species {*:1} referential.common.Species
-weightCategory {*:0..1} referential.ps.common.WeightCategory
-speciesFate {*:0..1} referential.ps.common.SpeciesFate
-weight Float
-count Integer
-weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
-well String
-
-data.ps.logbook.FloatingObject > data.DataEntity
-comment String
-objectOperation {*:1} referential.ps.common.ObjectOperation
-supportVesselName String
-transmittingBuoy + {*} data.ps.logbook.TransmittingBuoy
-floatingObjectPart + {*} data.ps.logbook.FloatingObjectPart
-computedWhenArrivingBiodegradable !fr.ird.observe.dto.data.ps.DcpComputedValue
-computedWhenArrivingNonEntangling !fr.ird.observe.dto.data.ps.DcpComputedValue
-computedWhenArrivingSimplifiedObjectType String
-computedWhenLeavingBiodegradable !fr.ird.observe.dto.data.ps.DcpComputedValue
-computedWhenLeavingNonEntangling !fr.ird.observe.dto.data.ps.DcpComputedValue
-computedWhenLeavingSimplifiedObjectType String
-
-data.ps.logbook.FloatingObjectPart > data.DataEntity
-whenArriving String
-whenLeaving String
-objectMaterial {*:1} referential.ps.common.ObjectMaterial
-
-data.ps.logbook.Route > data.DataEntity
-comment String
-date Date
-timeAtSea Integer
-fishingTime Integer
-activity + {*} data.ps.logbook.Activity
-
-data.ps.logbook.TransmittingBuoy > data.DataEntity
-comment String
-code String
-transmittingBuoyOwnership {*:1} referential.ps.common.TransmittingBuoyOwnership
-transmittingBuoyType {*:1} referential.ps.common.TransmittingBuoyType
-transmittingBuoyOperation {*:1} referential.ps.common.TransmittingBuoyOperation
-country {*:1} referential.common.Country
-vessel {*:1} referential.common.Vessel
-latitude Float
-longitude Float
-
-data.ps.logbook.Sample > data.DataEntity >> fr.ird.observe.dto.data.WellIdAware
-number Integer
-comment String
-well String
-sampleType {*:0..1} referential.ps.common.SampleType
-sampleQuality {*:0..1} referential.ps.logbook.SampleQuality
-superSample boolean
-smallsWeight Float
-bigsWeight Float
-totalWeight Float
-person {*:*} referential.common.Person
-sampleActivity + {*} data.ps.logbook.SampleActivity
-sampleSpecies + {*} data.ps.logbook.SampleSpecies
-
-data.ps.logbook.SampleActivity > data.DataEntity >> fr.ird.observe.dto.data.ps.logbook.ActivityLabelAware
-activity {*:1} data.ps.logbook.Activity
-weightedWeight Float
-
-data.ps.logbook.SampleSpecies > data.DataEntity
-comment String
-startTime Date
-endTime Date
-subSampleNumber Integer
-measuredCount Integer
-totalCount Integer
-species {*:1} referential.common.Species
-sizeMeasureType {*:0..1} referential.common.SizeMeasureType
-sampleSpeciesMeasure + {*} data.ps.logbook.SampleSpeciesMeasure
-
-data.ps.logbook.SampleSpeciesMeasure > data.DataEntity
-sizeClass Float
-count Integer
-
-data.ps.logbook.WellPlan > data.DataEntity >> fr.ird.observe.dto.data.WellIdAware
-activity {*:1} data.ps.logbook.Activity
-well String
-species {*:1} referential.common.Species
-weightCategory {*:1} referential.ps.common.WeightCategory
-weight Float
-wellSamplingConformity {*:1} referential.ps.logbook.WellSamplingConformity
-wellSamplingStatus {*:1} referential.ps.logbook.WellSamplingStatus
-
-
-package fr.ird.observe.entities.data.ps.landing
-
-data.ps.landing.Landing > data.DataEntity
-date Date
-species {*:1} referential.common.Species
-weightCategory {*:1} referential.ps.common.WeightCategory
-destination {*:1} referential.ps.landing.Destination
-fate {*:1} referential.ps.landing.Fate
-fateVessel {*:0..1} referential.common.Vessel
-weight Float
-
-
-package fr.ird.observe.entities.data.ps.localmarket
-
-enum !fr.ird.observe.dto.data.ps.localmarket.BatchWeightComputedValueSource
-
-data.ps.localmarket.Batch > data.DataEntity
-date Date
-species {*:1} referential.common.Species
-packaging {*:1} referential.ps.localmarket.Packaging
-count Integer
-weight Float
-weightComputedSource !fr.ird.observe.dto.data.ps.localmarket.BatchWeightComputedValueSource
-survey {*:0..1} data.ps.localmarket.Survey
-origin String
-comment String
-
-data.ps.localmarket.Survey > data.DataEntity
-comment String
-date Date
-number Integer
-surveyPart + {*} data.ps.localmarket.SurveyPart
-
-data.ps.localmarket.SurveyPart > data.DataEntity >> data.WithProportion
-species {*:1} referential.common.Species
-proportion Integer
-
-data.ps.localmarket.Sample > data.DataEntity >> fr.ird.observe.dto.data.WellIdsAware
-number String
-date Date
-comment String
-sampleType {*:0..1} referential.ps.common.SampleType
-sampleSpecies + {*} data.ps.localmarket.SampleSpecies
-well + {*:*} String
-
-data.ps.localmarket.SampleSpecies > data.DataEntity
-comment String
-measuredCount Integer
-species {*:1} referential.common.Species
-sizeMeasureType {*:1} referential.common.SizeMeasureType
-sampleSpeciesMeasure + {*} data.ps.localmarket.SampleSpeciesMeasure
-
-data.ps.localmarket.SampleSpeciesMeasure > data.DataEntity
-count Integer
-sizeClass Float
-
-
-package fr.ird.observe.entities.data.ps.common
-
-data.ps.common.GearUseFeatures > data.DataEntity
-comment String
-number Integer
-usedInTrip Boolean
-gear {*:1} referential.common.Gear
-gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement
-
-data.ps.common.GearUseFeaturesMeasurement > data.DataEntity
-measurementValue String
-gearCharacteristic {*:1} referential.common.GearCharacteristic
-
-data.ps.common.Trip > data.RootOpenableEntity >> data.TripEntityAware
-startDate Date
-endDate Date
-formsUrl String
-reportsUrl String
-historicalData boolean
-ersId String
-ocean {*:0..1} referential.common.Ocean
-timeAtSea Integer
-fishingTime Integer
-landingTotalWeight Float
-localMarketTotalWeight Float
-loch Integer
-generalComment String
-observationsComment String
-logbookComment String
-gearUseFeatures + {*} data.ps.common.GearUseFeatures
-routeObs + {*} data.ps.observation.Route
-routeLogbook + {*} data.ps.logbook.Route
-wellPlan + {*} data.ps.logbook.WellPlan
-sample + {*} data.ps.logbook.Sample
-landing + {*} data.ps.landing.Landing
-localmarketBatch + {*} data.ps.localmarket.Batch
-localmarketSurvey + {*} data.ps.localmarket.Survey
-localmarketSample + {*} data.ps.localmarket.Sample
-vessel {*:1} referential.common.Vessel
-observationsProgram {*:1} referential.ps.common.Program
-logbookProgram {*:1} referential.ps.common.Program
-observer {*:0..1} referential.common.Person
-captain {*:0..1} referential.common.Person
-observationsDataEntryOperator {*:0..1} referential.common.Person
-logbookDataEntryOperator {*:0..1} referential.common.Person
-departureHarbour {*:0..1} referential.common.Harbour
-landingHarbour {*:0..1} referential.common.Harbour
-observationsDataQuality {*:0..1} referential.common.DataQuality
-logbookDataQuality {*:0..1} referential.common.DataQuality
-departureWellContentStatus {*:1} referential.ps.logbook.WellContentStatus
-landingWellContentStatus {*:1} referential.ps.logbook.WellContentStatus
-observationsAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
-logbookAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
-targetWellsSamplingAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
-landingAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
-localMarketAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
-localMarketWellsSamplingAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
-localMarketSurveySamplingAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
-advancedSamplingAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
-isObservationsFilled() boolean
-isLogbookFilled() boolean
-isTargetWellsSamplingFilled() boolean
-isLandingFilled() boolean
-isLocalmarketFilled() boolean
-isLocalmarketWellsSamplingFilled() boolean
-isLocalmarketSurveySamplingFilled() boolean
-isAdvancedSamplingFilled() boolean
-
-package fr.ird.observe.entities.data.ll.observation
-
-data.ll.observation.Activity > data.DataEntity
-comment String
-timeStamp Date
-latitude Float
-longitude Float
-seaSurfaceTemperature Float
-set + {0..1} data.ll.observation.Set
-encounter + {*} data.ll.observation.Encounter
-vesselActivity {*:1} referential.ll.common.VesselActivity
-dataQuality {*:0..1} referential.common.DataQuality
-sensorUsed + {*} data.ll.observation.SensorUsed
-fpaZone {*:1} referential.common.FpaZone
-
-data.ll.observation.BaitsComposition > data.DataEntity >> data.WithProportion
-proportion Integer
-individualSize Integer
-individualWeight Float
-baitSettingStatus {*:1} referential.ll.common.BaitSettingStatus
-baitType {*:1} referential.ll.common.BaitType
-
-data.ll.observation.Basket > data.DataEntity >> fr.ird.observe.dto.DtoParentAware
-settingIdentifier Integer
-haulingIdentifier Integer
-floatline1Length Float
-floatline2Length Float
-branchline + {*} data.ll.observation.Branchline
-
-data.ll.observation.Branchline > data.DataEntity >> fr.ird.observe.dto.DtoParentAware
-comment String
-settingIdentifier Integer
-haulingIdentifier Integer
-depthRecorder Boolean
-timer Boolean
-timeSinceContact Integer
-hookOffset Integer
-branchlineLength Float
-weightedSwivel Boolean
-timerTimeOnBoard Date
-weightedSnap Boolean
-swivelWeight Float
-snapWeight Float
-tracelineLength Float
-hookLost Boolean
-traceCutOff Boolean
-hookType {*:0..1} referential.ll.common.HookType
-baitType {*:0..1} referential.ll.common.BaitType
-topType {*:0..1} referential.ll.common.LineType
-tracelineType {*:0..1} referential.ll.common.LineType
-baitSettingStatus {*:0..1} referential.ll.common.BaitSettingStatus
-baitHaulingStatus {*:0..1} referential.ll.observation.BaitHaulingStatus
-hookSize {*:0..1} referential.ll.common.HookSize
-
-data.ll.observation.BranchlinesComposition > data.DataEntity >> data.WithProportion
-length Float
-proportion Integer
-tracelineLength Float
-topType {*:0..1} referential.ll.common.LineType
-tracelineType {*:0..1} referential.ll.common.LineType
-
-data.ll.observation.Catch > data.DataEntity
-comment String
-count Integer
-totalWeight Float
-hookWhenDiscarded Boolean
-depredated Boolean
-beatDiameter Float
-gonadeWeight Float
-photoReferences String
-number Integer
-acquisitionMode int
-tagNumber String
-section {*:0..1} data.ll.observation.Section
-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
-species {*:1} referential.common.Species
-predator {*:*} referential.common.Species
-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
-catchHealthStatus {*:1} referential.ll.common.HealthStatus
-sex {*:0..1} referential.common.Sex
-weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
-
-data.ll.observation.Encounter > data.DataEntity
-distance Float
-count Integer
-encounterType {*:1} referential.ll.observation.EncounterType
-species {*:1} referential.common.Species
-
-data.ll.observation.FloatlinesComposition > data.DataEntity >> data.WithProportion
-length Float
-proportion Integer
-lineType {*:1} referential.ll.common.LineType
-
-data.ll.observation.HooksComposition > data.DataEntity >> data.WithProportion
-proportion Integer
-hookOffset Integer
-hookType {*:1} referential.ll.common.HookType
-hookSize {*:1} referential.ll.common.HookSize
-
-data.ll.observation.Section > data.DataEntity >> fr.ird.observe.dto.DtoParentAware
-settingIdentifier Integer
-haulingIdentifier Integer
-basket + {*} data.ll.observation.Basket
-
-data.ll.observation.SensorUsed > data.DataEntity >> data.DataFileAware
-data !java.sql.Blob
-dataFilename String
-dataLocation String
-sensorSerialNo String
-sensorType {*:1} referential.ll.observation.SensorType
-sensorDataFormat {*:0..1} referential.ll.observation.SensorDataFormat
-sensorBrand {*:1} referential.ll.observation.SensorBrand
-
-data.ll.observation.Set > data.DataEntity
-comment String
-number Integer
-basketsPerSectionCount Integer
-branchlinesPerBasketCount Integer
-totalSectionsCount Integer
-totalBasketsCount Integer
-totalHooksCount Integer
-weightedSnap Boolean
-snapWeight Float
-weightedSwivel Boolean
-swivelWeight Float
-lightsticksPerBasketCount Integer
-timeBetweenHooks Long
-shooterUsed Boolean
-shooterSpeed Float
-maxDepthTargeted Float
-settingStartTimeStamp Date
-settingStartLatitude Float
-settingStartLongitude Float
-settingEndTimeStamp Date
-settingEndLatitude Float
-settingEndLongitude Float
-settingVesselSpeed Float
-haulingDirectionSameAsSetting Boolean
-haulingStartTimeStamp Date
-haulingStartLatitude Float
-haulingStartLongitude Float
-haulingEndTimeStamp Date
-haulingEndLatitude Float
-haulingEndLongitude Float
-haulingBreaks Integer
-monitored Boolean
-baitsComposition + {*} data.ll.observation.BaitsComposition
-floatlinesComposition + {*} data.ll.observation.FloatlinesComposition
-hooksComposition + {*} data.ll.observation.HooksComposition
-settingShape {*:1} referential.ll.common.SettingShape
-section + {*} data.ll.observation.Section
-catches + {*} data.ll.observation.Catch
-tdr + {*} data.ll.observation.Tdr
-lineType {*:0..1} referential.ll.common.LineType
-lightsticksType {*:0..1} referential.ll.common.LightsticksType
-lightsticksColor {*:0..1} referential.ll.common.LightsticksColor
-mitigationType {*:*} referential.ll.common.MitigationType
-branchlinesComposition + {*} data.ll.observation.BranchlinesComposition
-
-data.ll.observation.SizeMeasure > data.DataEntity
-size Float
-sizeMeasureType {*:1} referential.common.SizeMeasureType
-
-data.ll.observation.Tdr > data.DataEntity >> data.DataFileAware
-floatline1Length Float
-floatline2Length Float
-serialNo String
-data !java.sql.Blob
-dataFilename String
-dataLocation String
-deploymentStart Date
-deploymentEnd Date
-fishingStart Date
-fishingEnd Date
-fishingStartDepth Float
-fishingEndDepth Float
-meanDeploymentDepth Float
-medianDeploymentDepth Float
-minFishingDepth Float
-maxFishingDepth Float
-meanFishingDepth Float
-medianFishingDepth Float
-section {*:0..1} data.ll.observation.Section
-basket {*:0..1} data.ll.observation.Basket
-branchline {*:0..1} data.ll.observation.Branchline
-sensorBrand {*:0..1} referential.ll.observation.SensorBrand
-species {*:*} referential.common.Species
-itemHorizontalPosition {*:0..1} referential.ll.observation.ItemHorizontalPosition
-itemVerticalPosition {*:0..1} referential.ll.observation.ItemVerticalPosition
-
-data.ll.observation.WeightMeasure > data.DataEntity
-weight Float
-weightMeasureType {*:1} referential.common.WeightMeasureType
-
-
-package fr.ird.observe.entities.data.ll.logbook
-
-data.ll.logbook.Activity > data.DataEntity
-comment String
-startTimeStamp Date
-endTimeStamp Date
-latitude Float
-longitude Float
-seaSurfaceTemperature Float
-wind {*:1} referential.common.Wind
-windDirection Integer
-currentSpeed Float
-currentDirection Integer
-vesselActivity {*:1} referential.ll.common.VesselActivity
-dataQuality {*:0..1} referential.common.DataQuality
-fpaZone {*:1} referential.common.FpaZone
-relatedObservedActivity {0..1} data.ll.observation.Activity
-set + {0..1} data.ll.logbook.Set
-sample + {0..1} data.ll.logbook.Sample
-
-data.ll.logbook.Set > data.DataEntity
-comment String
-number Integer
-basketsPerSectionCount Integer
-branchlinesPerBasketCount Integer
-totalSectionsCount Integer
-totalBasketsCount Integer
-totalHooksCount Integer
-lightsticksPerBasketCount Integer
-totalLightsticksCount Integer
-weightedSnap Boolean
-snapWeight Float
-weightedSwivel Boolean
-swivelWeight Float
-timeBetweenHooks Long
-shooterUsed Boolean
-shooterSpeed Float
-maxDepthTargeted Float
-settingStartTimeStamp Date
-settingStartLatitude Float
-settingStartLongitude Float
-settingEndTimeStamp Date
-settingEndLatitude Float
-settingEndLongitude Float
-settingVesselSpeed Float
-haulingDirectionSameAsSetting Boolean
-haulingStartTimeStamp Date
-haulingStartLatitude Float
-haulingStartLongitude Float
-haulingEndTimeStamp Date
-haulingEndLatitude Float
-haulingEndLongitude Float
-haulingBreaks Integer
-monitored Boolean
-totalLineLength Float
-basketLineLength Float
-lengthBetweenBranchlines Float
-baitsComposition + {*} data.ll.logbook.BaitsComposition
-floatlinesComposition + {*} data.ll.logbook.FloatlinesComposition
-hooksComposition + {*} data.ll.logbook.HooksComposition
-settingShape {*:1} referential.ll.common.SettingShape
-catches + {*} data.ll.logbook.Catch
-lineType {*:0..1} referential.ll.common.LineType
-lightsticksUsed Boolean
-lightsticksType {*:0..1} referential.ll.common.LightsticksType
-lightsticksColor {*:0..1} referential.ll.common.LightsticksColor
-mitigationType {*:*} referential.ll.common.MitigationType
-branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition
-
-data.ll.logbook.Catch > data.DataEntity
-comment String
-count Integer
-totalWeight Float
-hookWhenDiscarded Boolean
-depredated Boolean
-beatDiameter Float
-photoReferences String
-number Integer
-acquisitionMode int
-countDepredated Integer
-depredatedProportion Integer
-tagNumber String
-catchFate {*:1} referential.ll.common.CatchFate
-discardHealthStatus {*:1} referential.ll.common.HealthStatus
-species {*:1} referential.common.Species
-predator {*:*} referential.common.Species
-catchHealthStatus {*:1} referential.ll.common.HealthStatus
-onBoardProcessing {*:1} referential.ll.common.OnBoardProcessing
-weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
-
-data.ll.logbook.BaitsComposition > data.DataEntity >> data.WithProportion
-proportion Integer
-individualSize Integer
-individualWeight Float
-baitSettingStatus {*:1} referential.ll.common.BaitSettingStatus
-baitType {*:1} referential.ll.common.BaitType
-
-data.ll.logbook.BranchlinesComposition > data.DataEntity >> data.WithProportion
-length Float
-proportion Integer
-tracelineLength Float
-topType {*:0..1} referential.ll.common.LineType
-tracelineType {*:0..1} referential.ll.common.LineType
-
-data.ll.logbook.FloatlinesComposition > data.DataEntity >> data.WithProportion
-length Float
-proportion Integer
-lineType {*:1} referential.ll.common.LineType
-
-data.ll.logbook.HooksComposition > data.DataEntity >> data.WithProportion
-proportion Integer
-hookOffset Integer
-hookType {*:1} referential.ll.common.HookType
-hookSize {*:1} referential.ll.common.HookSize
-
-data.ll.logbook.SamplePart > data.DataEntity
-length Float
-weight Float
-count Integer
-acquisitionMode int
-tagNumber String
-species {*:1} referential.common.Species
-sex {*:1} referential.common.Sex
-sizeMeasureType {*:0..1} referential.common.SizeMeasureType
-lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethod
-weightMeasureType {*:0..1} referential.common.WeightMeasureType
-weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
-
-data.ll.logbook.Sample > data.DataEntity
-comment String
-timeStamp Date
-latitude Float
-longitude Float
-samplePart + {*} data.ll.logbook.SamplePart
-getCoordinateStr() String
-
-package fr.ird.observe.entities.data.ll.landing
-
-data.ll.landing.Landing > data.DataEntity
-comment String
-startDate Date
-endDate Date
-latitude Float
-longitude Float
-dataSource {*:1} referential.ll.landing.DataSource
-processingCompany {*:1} referential.ll.landing.Company
-shippingCompany {*:1} referential.ll.landing.Company
-brokerageCompany {*:1} referential.ll.landing.Company
-person {*:1} referential.common.Person
-harbour {*:0..1} referential.common.Harbour
-vessel {*:0..1} referential.common.Vessel
-landingPart + {*} data.ll.landing.LandingPart
-
-data.ll.landing.LandingPart > data.DataEntity
-species {*:1} referential.common.Species
-dataQuality {*:0..1} referential.common.DataQuality
-categoryMin Float
-categoryMax Float
-onBoardProcessing {*:1} referential.ll.common.OnBoardProcessing
-conservation {*:1} referential.ll.landing.Conservation
-count Integer
-weight Float
-weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
-
-
-package fr.ird.observe.entities.data.ll.common
-
-data.ll.common.GearUseFeatures > data.DataEntity
-comment String
-number Integer
-usedInTrip Boolean
-gear {*:1} referential.common.Gear
-gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement
-
-data.ll.common.GearUseFeaturesMeasurement > data.DataEntity
-measurementValue String
-gearCharacteristic {*:1} referential.common.GearCharacteristic
-
-data.ll.common.Trip > data.RootOpenableEntity >> data.TripEntityAware
-startDate Date
-endDate Date
-noOfCrewMembers Integer
-ersId String
-gearUseFeatures + {*} data.ll.common.GearUseFeatures
-activityObs + {*} data.ll.observation.Activity
-activityLogbook + {*} data.ll.logbook.Activity
-landing + {*} data.ll.landing.Landing
-sample + {*} data.ll.logbook.Sample
-tripType {*:1} referential.ll.common.TripType
-observationMethod {*:1} referential.ll.common.ObservationMethod
-observer {*:1} referential.common.Person
-vessel {*:1} referential.common.Vessel
-observationsProgram {*:1} referential.ll.common.Program
-logbookProgram {*:1} referential.ll.common.Program
-captain {*:1} referential.common.Person
-observationsDataEntryOperator {*:1} referential.common.Person
-logbookDataEntryOperator {*:1} referential.common.Person
-sampleDataEntryOperator {*:1} referential.common.Person
-landingDataEntryOperator {*:1} referential.common.Person
-ocean {*:1} referential.common.Ocean
-departureHarbour {*:0..1} referential.common.Harbour
-landingHarbour {*:0..1} referential.common.Harbour
-observationsDataQuality {*:0..1} referential.common.DataQuality
-logbookDataQuality {*:0..1} referential.common.DataQuality
-generalComment String
-observationsComment String
-logbookComment String
-species {*:*} referential.common.Species
-observationsAvailability boolean
-logbookAvailability boolean
\ No newline at end of file


=====================================
src/site/markdown/avdth/referential.md
=====================================
@@ -144,41 +144,43 @@ TODO
 
 Mapping type d'activité
 
-|**ACTIVITY.C_OPERA**| **ps_common.VesselActivity.code**|
-|:---                | :---                             |
-| 0                  | 6                                |
-| 1                  | 6                                |
-| 2                  | 6                                |
-| 3                  | 2                                |
-| 4                  | 1                                |
-| 5                  | 13                               |
-| 6                  | 13                               |
-| 22                 | 13                               |
-| 23                 | 13                               |
-| 24                 | 13                               |
-| 25                 | 13                               |
-| 26                 | 13                               |
-| 29                 | 13                               |
-| 30                 | 13                               |
-| 31                 | 13                               |
-| 32                 | 13                               |
-| 33                 | 13                               |
-| 34                 | 13                               |
-| 7                  | 22                               |
-| 8                  | 10                               |
-| 9                  | 23                               |
-| 10                 | 24                               |
-| 11                 | 25                               |
-| 12                 | 26                               |
-| 13                 | 27                               |
-| 14                 | 28                               |
-| 15                 | 0                                |
-| 19                 | 29                               |
-| 20                 | 30                               |
-| 35                 | 31                               |
-| 36                 | 99  **FIXME**                    |
-
-**Seule une activité de code 13 permet la création de DCP**.
+|**ACTIVITY.C_OPERA**| **ps_common.VesselActivity.code** |
+|:---                |:----------------------------------|
+| 0                  | 6   (1)                           |
+| 1                  | 6   (1)                           |
+| 2                  | 6   (1)                           |
+| 14                 | 6   (1) (3)                       |
+| 3                  | 2                                 |
+| 4                  | 1                                 |
+| 5                  | 13  (2)                           |
+| 6                  | 13  (2)                           |
+| 22                 | 13  (2)                           |
+| 23                 | 13  (2)                           |
+| 24                 | 13  (2)                           |
+| 25                 | 13  (2)                           |
+| 26                 | 13  (2)                           |
+| 29                 | 13  (2)                           |
+| 30                 | 13  (2)                           |
+| 31                 | 13  (2)                           |
+| 32                 | 13  (2)                           |
+| 33                 | 13  (2)                           |
+| 34                 | 13  (2)                           |
+| 7                  | 22                                |
+| 8                  | 10                                |
+| 9                  | 23                                |
+| 10                 | 24                                |
+| 11                 | 25                                |
+| 12                 | 26                                |
+| 13                 | 27                                |
+| 15                 | 0                                 |
+| 19                 | 29                                |
+| 20                 | 30                                |
+| 35                 | 31                                |
+| 36                 | 99  **FIXME**                     |
+
+1. **Seule une activité de code 6 permet la création de captures**.
+2. **Seule une activité de code 13 permet la création de DCP**..
+3. On ajoute en plus un système observé **110** et **setSuccessStatus** à **2**.
 
 ### REF_SCHOOL_TYPE
 
@@ -216,7 +218,7 @@ Mapping conformité d'échantillonnage de cuve
 
 À partir de **CUVE.C_DEST**, on déduit **ps_logbook.WellSamplingConformity.code**
 
-|**CUVE.C_DEST**| **WellSamplingConformity.code**|                                                    |
+|**CUVE.C_DEST**| **WellSamplingConformity.code**|
 |:---           | :---                           |
 | 1             | 9                              |
 | 2             | 9                              |
@@ -245,7 +247,7 @@ Mapping status d'échantillonnage de cuve
 
 À partir de **CUVE_DEST**, on déduit **ps_logbook.WellSamplingStatus.code**
 
-|**CUVE.C_DEST**| **WellSamplingStatus.code** |                                                    |
+|**CUVE.C_DEST**| **WellSamplingStatus.code** |
 |:---           | :---                        |
 | 1             | 9                           |
 | 2             | 9                           |



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9cc0a572126fe8db44cba7710...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9cc0a572126fe8db44cba7710...
You're receiving this email because of your account on gitlab.com.

    

[Git][ultreiaio/ird-observe][develop] 4 commits: Persistence - Add ObservedSystem 110 (See #2429)

Tony CHEMIT (＠tchemit)

tags

participants (1)