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

Commits:

10 changed files:

Changes:

  • core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java
    ... ... @@ -134,6 +134,7 @@ public class ImportReferentialContext {
    134 134 
         private SpeciesCache speciesCache;
    135 135 
         private ObservedSystem observedSystem20;
    136 136 
         private ObservedSystem observedSystem103;
    137 
    +    private ObservedSystem observedSystem110;
    137 138 
         private VesselActivity vesselActivity6;
    138 139 
         private SchoolType schoolType0;
    139 140 
         private SchoolType schoolType1;
    ... ... @@ -205,6 +206,7 @@ public class ImportReferentialContext {
    205 206 
             observedSystem0 = observedSystem.get("0");
    206 207 
             observedSystem20 = observedSystem.get("20");
    207 208 
             observedSystem103 = observedSystem.get("103");
    209 
    +        observedSystem110 = observedSystem.get("110");
    208 210
    209 211 
             // dcp
    210 212 
             objectOperation = Maps.uniqueIndex(referential.getObjectOperation(), ObjectOperation::getCode);
    ... ... @@ -476,6 +478,10 @@ public class ImportReferentialContext {
    476 478 
             return observedSystem103;
    477 479 
         }
    478 480
    481 
    +    public ObservedSystem getObservedSystem110() {
    482 
    +        return observedSystem110;
    483 
    +    }
    484 
    +
    479 485 
         public ObservedSystem getObservedSystem20() {
    480 486 
             return observedSystem20;
    481 487 
         }

  • 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> {
    240 240 
                     // SetSuccessStatus=2 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091)
    241 241 
                     entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2());
    242 242 
                     break;
    243 
    +            case "14": // (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2429)
    244 
    +                // SetSuccessStatus=2
    245 
    +                entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2());
    246 
    +                // Add Observed system 110
    247 
    +                entity.addObservedSystem(dataContext.getObservedSystem110());
    248 
    +                break;
    243 249 
             }
    244 250 
             entity.setVesselActivity(dataContext.getVesselActivity(vesselActivityCode));
    245 251 
             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
    77 77 
                 .put("11", "25")
    78 78 
                 .put("12", "26")
    79 79 
                 .put("13", "27")
    80 
    -            .put("14", "28")
    80 
    +            // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2429
    81 
    +            .put("14", "6")
    81 82 
                 .put("15", "0")
    82 83 
                 .put("19", "29")
    83 84 
                 .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
    36 36 
     import java.sql.ResultSet;
    37 37 
     import java.sql.SQLException;
    38 38 
     import java.sql.Timestamp;
    39 
    +import java.util.LinkedHashSet;
    39 40 
     import java.util.List;
    40 41 
     import java.util.Map;
    41 42 
     import java.util.Set;
    42 43 
     import java.util.TreeMap;
    44 
    +import java.util.stream.Stream;
    43 45
    44 46 
     /**
    45 47 
      * Created on 19/01/2021.
    ... ... @@ -175,6 +177,17 @@ public class DataSourceMigrationForVersion_9_0 extends ByMajorMigrationVersionRe
    175 177 
             migrateOneToOneComposition(executor, "ll_logbook", "activity", "sample", "_target.trip IS NULL");
    176 178 
             migrateOneToOneComposition(executor, "ps_observation", "activity", "set", null);
    177 179
    180 
    +        if (withIds) {
    181 
    +            Map<String, String> scriptVariables = getScriptVariables();
    182 
    +            // Add schoolType variables (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2115)
    183 
    +            Set<Pair<String, String>> schoolTypedByCode = executor.findMultipleResultAstSet(SqlQuery.wrap(
    184 
    +                    "SELECT code, topiaId FROM ps_common.SchoolType WHERE code IN " +
    185 
    +                            "('0', '1', '2')", resultSet -> Pair.of(resultSet.getString(1), resultSet.getString(2))));
    186 
    +            for (Pair<String, String> pair : schoolTypedByCode) {
    187 
    +                scriptVariables.put("SchoolType_" + pair.getKey(), pair.getValue());
    188 
    +            }
    189 
    +            addObservedSystem(executor);
    190 
    +        }
    178 191 
             executor.addScript("97", "change_nautical_length_types");
    179 192 
             executor.addScript("98_0", "finalize_migrate_oneToOne");
    180 193
    ... ... @@ -199,6 +212,19 @@ public class DataSourceMigrationForVersion_9_0 extends ByMajorMigrationVersionRe
    199 212 
             }
    200 213 
         }
    201 214
    215 
    +    private void addObservedSystem(MigrationVersionResourceExecutor executor) {
    216 
    +        Set<String> existingCodes = executor.findMultipleResultAstSet(SqlQuery.wrap("SELECT CODE FROM ps_common.ObservedSystem", resultSet -> resultSet.getString(1)));
    217 
    +        Set<String> newCodes = new LinkedHashSet<>();
    218 
    +        Stream.of("110").forEach(code -> {
    219 
    +            if (!existingCodes.contains(code)) {
    220 
    +                executor.addScript("96", "add_referential_ps_common_ObservedSystem_" + code);
    221 
    +                newCodes.add(code);
    222 
    +            }
    223 
    +        });
    224 
    +        if (!newCodes.isEmpty()) {
    225 
    +            executor.addScript("96", "add_referential_ps_common_ObservedSystem_finalize");
    226 
    +        }
    227 
    +    }
    202 228 
         static class Sample {
    203 229 
             String topiaId;
    204 230 
             long topiaVersion;

  • core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_110-common.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe Core :: Persistence :: Resources
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2022 IRD, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU General Public License as
    9 
    +-- published by the Free Software Foundation, either version 3 of the
    10 
    +-- License, or (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU General Public
    18 
    +-- License along with this program.  If not, see
    19 
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +-- #L%
    21 
    +---
    22 
    +-- See https://gitlab.com/ultreiaio/ird-observe/-/issues/2070
    23 
    +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
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe Core :: Persistence :: Resources
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2022 IRD, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU General Public License as
    9 
    +-- published by the Free Software Foundation, either version 3 of the
    10 
    +-- License, or (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU General Public
    18 
    +-- License along with this program.  If not, see
    19 
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +-- #L%
    21 
    +---
    22 
    +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
    79 79 
     ps_common.objectMaterial=91
    80 80 
     ps_common.objectMaterialType=5
    81 81 
     ps_common.objectOperation=12
    82 
    -ps_common.observedSystem=63
    82 
    +ps_common.observedSystem=64
    83 83 
     ps_common.program=17
    84 84 
     ps_common.reasonForNoFishing=16
    85 85 
     ps_common.reasonForNullSet=10

  • model/src/main/resources/fixtures/global.properties
    ... ... @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=66
    25 25 
     ENTITIES_LIMIT_SIZE=100
    26 26 
     # fr.ird.observe.services.service.referential.ReferentialService
    27 27 
     # fr.ird.observe.services.local.service.referential.DifferentialModelTest
    28 
    -REFERENTIAL_COUNT=4090
    28 
    +REFERENTIAL_COUNT=4091

  • model/target/generated-sources/java/models/Observe/persistence.model deleted
    1 
    -
    2 
    -
    3 
    -model Observe | generatePropertyChangeSupport
    4 
    -model Observe | generateForeignKeyNames
    5 
    -model Observe | notGenerateToString
    6 
    -model Observe | indexForeignKeys
    7 
    -model Observe | useEnumerationName=false
    8 
    -model Observe | attributeType.Boolean=java.lang.Boolean
    9 
    -model Observe | attributeType.Float=java.lang.Float
    10 
    -model Observe | attributeType.Integer=java.lang.Integer
    11 
    -model Observe | attributeType.Long=java.lang.Long
    12 
    -model Observe | attributeType.String=java.lang.String
    13 
    -model Observe | version=9.0
    14 
    -model Observe | defaultPackage=fr.ird.observe.entities
    15 
    -model Observe | useRelativeName
    16 
    -model Observe | relativeNameExcludes=referential,data
    17 
    -model Observe | daoSuperClass=org.nuiton.topia.persistence.internal.AbstractTopiaDao
    18 
    -model Observe | persistenceContextSuperClass=fr.ird.observe.entities.ToolkitTopiaPersistenceContextSupport
    19 
    -
    20 
    -package fr.ird.observe.entities
    21 
    -
    22 
    -abstract Entity >> fr.ird.observe.dto.reference.DtoReferenceAware
    23 
    -lastUpdateDate Date
    24 
    -
    25 
    -LastUpdateDate > Entity
    26 
    -type String
    27 
    -
    28 
    -abstract data.DataEntity > Entity
    29 
    -homeId String
    30 
    -
    31 
    -abstract data.RootOpenableEntity > data.DataEntity
    32 
    -
    33 
    -interface data.DataFileAware
    34 
    -
    35 
    -interface data.WithProportion
    36 
    -
    37 
    -interface data.GearFeaturesAware > fr.ird.observe.entities.data.DataEntity
    38 
    -
    39 
    -interface data.TripEntityAware > fr.ird.observe.entities.data.RootOpenableEntity
    40 
    -
    41 
    -package fr.ird.observe.entities.referential.common
    42 
    -
    43 
    -enum !fr.ird.observe.dto.referential.ReferenceStatus
    44 
    -
    45 
    -abstract referential.ReferentialEntity > Entity >> fr.ird.observe.dto.reference.ReferentialDtoReferenceAware
    46 
    -code String
    47 
    -uri String
    48 
    -homeId String
    49 
    -needComment boolean
    50 
    -status !fr.ird.observe.dto.referential.ReferenceStatus
    51 
    -isEnabled() boolean
    52 
    -isDisabled() boolean
    53 
    -
    54 
    -abstract referential.I18nReferentialEntity > referential.ReferentialEntity
    55 
    -label1 String
    56 
    -label2 String
    57 
    -label3 String
    58 
    -label4 String
    59 
    -label5 String
    60 
    -label6 String
    61 
    -label7 String
    62 
    -label8 String
    63 
    -getLabel(referentialLocale !fr.ird.observe.dto.referential.ReferentialLocale) String
    64 
    -
    65 
    -referential.common.Country > referential.I18nReferentialEntity
    66 
    -iso2Code String
    67 
    -iso3Code String
    68 
    -
    69 
    -referential.common.DataQuality > referential.I18nReferentialEntity
    70 
    -
    71 
    -referential.common.FpaZone > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
    72 
    -startDate Date
    73 
    -endDate Date
    74 
    -
    75 
    -referential.common.Gear > referential.I18nReferentialEntity
    76 
    -gearCharacteristic {*:*} referential.common.GearCharacteristic
    77 
    -
    78 
    -referential.common.GearCharacteristic > referential.I18nReferentialEntity
    79 
    -unit String
    80 
    -gearCharacteristicType {*:1} referential.common.GearCharacteristicType
    81 
    -
    82 
    -referential.common.GearCharacteristicType > referential.I18nReferentialEntity
    83 
    -
    84 
    -referential.common.Harbour > referential.I18nReferentialEntity
    85 
    -country {*:1} referential.common.Country
    86 
    -locode String
    87 
    -latitude Float
    88 
    -longitude Float
    89 
    -
    90 
    -referential.common.LengthLengthParameter > referential.ReferentialEntity >> fr.ird.observe.dto.referential.WithFormula fr.ird.observe.dto.referential.ReferentialDtoReferenceWithNoCodeAware
    91 
    -ocean {*:0..1} referential.common.Ocean
    92 
    -species {*:1} referential.common.Species
    93 
    -sex {*:1} referential.common.Sex
    94 
    -inputSizeMeasureType {*:1} referential.common.SizeMeasureType
    95 
    -outputSizeMeasureType {*:1} referential.common.SizeMeasureType
    96 
    -startDate Date
    97 
    -endDate Date
    98 
    -coefficients String
    99 
    -source String
    100 
    -inputOutputFormula String
    101 
    -outputInputFormula String
    102 
    -
    103 
    -referential.common.LengthWeightParameter > referential.ReferentialEntity >> fr.ird.observe.dto.referential.WithFormula fr.ird.observe.dto.referential.ReferentialDtoReferenceWithNoCodeAware
    104 
    -ocean {*:0..1} referential.common.Ocean
    105 
    -species {*:1} referential.common.Species
    106 
    -sex {*:1} referential.common.Sex
    107 
    -sizeMeasureType {*:0..1} referential.common.SizeMeasureType
    108 
    -startDate Date
    109 
    -endDate Date
    110 
    -coefficients String
    111 
    -source String
    112 
    -lengthWeightFormula String
    113 
    -weightLengthFormula String
    114 
    -meanLength Float
    115 
    -meanWeight Float
    116 
    -
    117 
    -referential.common.LengthMeasureMethod > referential.I18nReferentialEntity
    118 
    -
    119 
    -referential.common.WeightMeasureMethod > referential.I18nReferentialEntity
    120 
    -
    121 
    -referential.common.Ocean > referential.I18nReferentialEntity
    122 
    -northEastAllowed boolean
    123 
    -southEastAllowed boolean
    124 
    -southWestAllowed boolean
    125 
    -northWestAllowed boolean
    126 
    -
    127 
    -referential.common.Organism > referential.I18nReferentialEntity
    128 
    -country {*:1} referential.common.Country
    129 
    -description String
    130 
    -
    131 
    -referential.common.Person > referential.ReferentialEntity >> fr.ird.observe.dto.referential.ReferentialDtoReferenceWithNoCodeAware
    132 
    -lastName String
    133 
    -firstName String
    134 
    -observer boolean
    135 
    -captain boolean
    136 
    -dataEntryOperator boolean
    137 
    -dataSource boolean
    138 
    -psSampler boolean
    139 
    -country {*:0..1} referential.common.Country
    140 
    -getLabel() String
    141 
    -
    142 
    -referential.common.Sex > referential.I18nReferentialEntity
    143 
    -
    144 
    -referential.common.ShipOwner > referential.ReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
    145 
    -label String
    146 
    -startDate Date
    147 
    -endDate Date
    148 
    -country {*:0..1} referential.common.Country
    149 
    -
    150 
    -referential.common.SizeMeasureType > referential.I18nReferentialEntity
    151 
    -
    152 
    -referential.common.Species > referential.I18nReferentialEntity >> fr.ird.observe.dto.referential.ReferentialDtoReferenceWithNoCodeAware
    153 
    -speciesGroup {*:0..1} referential.common.SpeciesGroup
    154 
    -ocean {*:*} referential.common.Ocean
    155 
    -faoCode String
    156 
    -scientificLabel String
    157 
    -wormsId Long
    158 
    -minLength Float
    159 
    -maxLength Float
    160 
    -minWeight Float
    161 
    -maxWeight Float
    162 
    -sizeMeasureType {*:0..1} referential.common.SizeMeasureType
    163 
    -weightMeasureType {*:0..1} referential.common.WeightMeasureType
    164 
    -
    165 
    -referential.common.SpeciesGroup > referential.I18nReferentialEntity
    166 
    -speciesGroupReleaseMode {*:*} referential.common.SpeciesGroupReleaseMode
    167 
    -
    168 
    -referential.common.SpeciesGroupReleaseMode > referential.I18nReferentialEntity
    169 
    -
    170 
    -referential.common.SpeciesList > referential.I18nReferentialEntity
    171 
    -species {*:+} referential.common.Species
    172 
    -
    173 
    -referential.common.Vessel > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
    174 
    -vesselSizeCategory {*:1} referential.common.VesselSizeCategory
    175 
    -vesselType {*:1} referential.common.VesselType
    176 
    -flagCountry {*:1} referential.common.Country
    177 
    -keelCode Integer
    178 
    -fleetCountry {*:1} referential.common.Country
    179 
    -changeDate Date
    180 
    -yearService Integer
    181 
    -length Float
    182 
    -capacity Float
    183 
    -powerCv Integer
    184 
    -powerKW Integer
    185 
    -searchMaximum Float
    186 
    -comment String
    187 
    -iccat String
    188 
    -iotcId String
    189 
    -nationalId String
    190 
    -comId String
    191 
    -tuviId String
    192 
    -imoId String
    193 
    -radioCallSignId String
    194 
    -lloydId String
    195 
    -wellRegex String
    196 
    -startDate Date
    197 
    -endDate Date
    198 
    -shipOwner {*:0..1} referential.common.ShipOwner
    199 
    -
    200 
    -referential.common.VesselSizeCategory > referential.ReferentialEntity
    201 
    -capacityLabel String
    202 
    -gaugeLabel String
    203 
    -
    204 
    -referential.common.VesselType > referential.I18nReferentialEntity
    205 
    -
    206 
    -referential.common.WeightMeasureType > referential.I18nReferentialEntity
    207 
    -
    208 
    -referential.common.Wind > referential.I18nReferentialEntity >> fr.ird.observe.dto.referential.common.WindAware
    209 
    -minSpeed Integer
    210 
    -maxSpeed Integer
    211 
    -minSwellHeight Float
    212 
    -maxSwellHeight Float
    213 
    -
    214 
    -package fr.ird.observe.entities.referential.ps.common
    215 
    -
    216 
    -referential.ps.common.AcquisitionStatus > referential.I18nReferentialEntity
    217 
    -observation boolean
    218 
    -logbook boolean
    219 
    -landing boolean
    220 
    -targetWellsSampling boolean
    221 
    -localMarket boolean
    222 
    -localMarketWellsSampling boolean
    223 
    -localMarketSurveySampling boolean
    224 
    -advancedSampling boolean
    225 
    -fieldEnabler boolean
    226 
    -
    227 
    -referential.ps.common.ObjectMaterialType > referential.I18nReferentialEntity
    228 
    -
    229 
    -referential.ps.common.ObjectMaterial > referential.I18nReferentialEntity
    230 
    -legacyCode String
    231 
    -standardCode String
    232 
    -biodegradable Boolean
    233 
    -nonEntangling Boolean
    234 
    -childrenMultiSelectable boolean
    235 
    -childSelectionMandatory boolean
    236 
    -parent {*:0..1} referential.ps.common.ObjectMaterial
    237 
    -objectMaterialType {*:1} referential.ps.common.ObjectMaterialType
    238 
    -validation String
    239 
    -getSimplifiedObjectMaterial() referential.ps.common.ObjectMaterial
    240 
    -getSimplifiedParentObjectMaterial() referential.ps.common.ObjectMaterial
    241 
    -
    242 
    -referential.ps.common.ObjectOperation > referential.I18nReferentialEntity
    243 
    -whenArriving boolean
    244 
    -whenLeaving boolean
    245 
    -
    246 
    -referential.ps.common.ObservedSystem > referential.I18nReferentialEntity
    247 
    -schoolType {*:1} referential.ps.common.SchoolType
    248 
    -allowObservation boolean
    249 
    -allowLogbook boolean
    250 
    -
    251 
    -referential.ps.common.Program > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
    252 
    -organism {*:1} referential.common.Organism
    253 
    -startDate Date
    254 
    -endDate Date
    255 
    -comment String
    256 
    -observation boolean
    257 
    -logbook boolean
    258 
    -
    259 
    -referential.ps.common.ReasonForNoFishing > referential.I18nReferentialEntity
    260 
    -
    261 
    -referential.ps.common.ReasonForNullSet > referential.I18nReferentialEntity
    262 
    -
    263 
    -referential.ps.common.SampleType > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
    264 
    -localMarket boolean
    265 
    -logbook boolean
    266 
    -startDate Date
    267 
    -endDate Date
    268 
    -
    269 
    -referential.ps.common.SchoolType > referential.I18nReferentialEntity
    270 
    -
    271 
    -referential.ps.common.SpeciesFate > referential.I18nReferentialEntity
    272 
    -discard Boolean
    273 
    -
    274 
    -referential.ps.common.TransmittingBuoyOperation > referential.I18nReferentialEntity
    275 
    -
    276 
    -referential.ps.common.TransmittingBuoyOwnership > referential.I18nReferentialEntity
    277 
    -
    278 
    -referential.ps.common.TransmittingBuoyType > referential.I18nReferentialEntity
    279 
    -technology String
    280 
    -
    281 
    -referential.ps.common.VesselActivity > referential.I18nReferentialEntity
    282 
    -allowFad boolean
    283 
    -
    284 
    -referential.ps.common.WeightCategory > referential.I18nReferentialEntity
    285 
    -species {*:1} referential.common.Species
    286 
    -minWeight Float
    287 
    -maxWeight Float
    288 
    -meanWeight Float
    289 
    -allowLanding boolean
    290 
    -allowLogbook boolean
    291 
    -allowWellPlan boolean
    292 
    -
    293 
    -package fr.ird.observe.entities.referential.ps.observation
    294 
    -
    295 
    -enum !fr.ird.observe.dto.data.ps.NonTargetCatchReleaseStatus
    296 
    -
    297 
    -referential.ps.observation.DetectionMode > referential.I18nReferentialEntity
    298 
    -
    299 
    -referential.ps.observation.InformationSource > referential.I18nReferentialEntity
    300 
    -
    301 
    -referential.ps.observation.NonTargetCatchReleaseConformity > referential.I18nReferentialEntity
    302 
    -
    303 
    -referential.ps.observation.NonTargetCatchReleaseStatus > referential.I18nReferentialEntity
    304 
    -
    305 
    -referential.ps.observation.NonTargetCatchReleasingTime > referential.I18nReferentialEntity
    306 
    -
    307 
    -referential.ps.observation.ReasonForDiscard > referential.I18nReferentialEntity
    308 
    -
    309 
    -referential.ps.observation.SpeciesStatus > referential.I18nReferentialEntity
    310 
    -
    311 
    -referential.ps.observation.SurroundingActivity > referential.I18nReferentialEntity
    312 
    -
    313 
    -
    314 
    -package fr.ird.observe.entities.referential.ps.logbook
    315 
    -
    316 
    -referential.ps.logbook.InformationSource > referential.I18nReferentialEntity
    317 
    -
    318 
    -referential.ps.logbook.SampleQuality > referential.I18nReferentialEntity
    319 
    -
    320 
    -referential.ps.logbook.SetSuccessStatus > referential.I18nReferentialEntity
    321 
    -
    322 
    -referential.ps.logbook.WellContentStatus > referential.I18nReferentialEntity
    323 
    -
    324 
    -referential.ps.logbook.WellSamplingConformity > referential.I18nReferentialEntity
    325 
    -
    326 
    -referential.ps.logbook.WellSamplingStatus > referential.I18nReferentialEntity
    327 
    -
    328 
    -
    329 
    -package fr.ird.observe.entities.referential.ps.landing
    330 
    -
    331 
    -referential.ps.landing.Destination > referential.I18nReferentialEntity
    332 
    -
    333 
    -referential.ps.landing.Fate > referential.I18nReferentialEntity
    334 
    -discard boolean
    335 
    -
    336 
    -
    337 
    -
    338 
    -package fr.ird.observe.entities.referential.ps.localmarket
    339 
    -
    340 
    -referential.ps.localmarket.BatchComposition > referential.I18nReferentialEntity
    341 
    -
    342 
    -referential.ps.localmarket.BatchWeightType > referential.I18nReferentialEntity
    343 
    -
    344 
    -referential.ps.localmarket.Packaging > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
    345 
    -batchComposition {*:1} referential.ps.localmarket.BatchComposition
    346 
    -batchWeightType {*:1} referential.ps.localmarket.BatchWeightType
    347 
    -startDate Date
    348 
    -endDate Date
    349 
    -meanWeight Float
    350 
    -harbour {*:0..1} referential.common.Harbour
    351 
    -acceptHarbour(harbour referential.common.Harbour) boolean
    352 
    -
    353 
    -package fr.ird.observe.entities.referential.ll.common
    354 
    -
    355 
    -referential.ll.common.BaitSettingStatus > referential.I18nReferentialEntity
    356 
    -
    357 
    -referential.ll.common.BaitType > referential.I18nReferentialEntity
    358 
    -
    359 
    -referential.ll.common.CatchFate > referential.I18nReferentialEntity
    360 
    -
    361 
    -referential.ll.common.HealthStatus > referential.I18nReferentialEntity
    362 
    -
    363 
    -referential.ll.common.HookSize > referential.I18nReferentialEntity
    364 
    -
    365 
    -referential.ll.common.HookType > referential.I18nReferentialEntity
    366 
    -
    367 
    -referential.ll.common.LightsticksColor > referential.I18nReferentialEntity
    368 
    -
    369 
    -referential.ll.common.LightsticksType > referential.I18nReferentialEntity
    370 
    -
    371 
    -referential.ll.common.LineType > referential.I18nReferentialEntity
    372 
    -
    373 
    -referential.ll.common.MitigationType > referential.I18nReferentialEntity
    374 
    -
    375 
    -referential.ll.common.ObservationMethod > referential.I18nReferentialEntity
    376 
    -
    377 
    -referential.ll.common.OnBoardProcessing > referential.I18nReferentialEntity
    378 
    -
    379 
    -referential.ll.common.Program > referential.I18nReferentialEntity >> fr.ird.observe.dto.WithStartEndDate
    380 
    -organism {*:1} referential.common.Organism
    381 
    -startDate Date
    382 
    -endDate Date
    383 
    -comment String
    384 
    -observation boolean
    385 
    -logbook boolean
    386 
    -
    387 
    -referential.ll.common.SettingShape > referential.I18nReferentialEntity
    388 
    -
    389 
    -referential.ll.common.TripType > referential.I18nReferentialEntity
    390 
    -
    391 
    -referential.ll.common.VesselActivity > referential.I18nReferentialEntity
    392 
    -
    393 
    -referential.ll.common.WeightDeterminationMethod > referential.I18nReferentialEntity
    394 
    -
    395 
    -
    396 
    -package fr.ird.observe.entities.referential.ll.observation
    397 
    -
    398 
    -referential.ll.observation.BaitHaulingStatus > referential.I18nReferentialEntity
    399 
    -
    400 
    -referential.ll.observation.EncounterType > referential.I18nReferentialEntity
    401 
    -
    402 
    -referential.ll.observation.HookPosition > referential.I18nReferentialEntity
    403 
    -
    404 
    -referential.ll.observation.ItemHorizontalPosition > referential.I18nReferentialEntity
    405 
    -
    406 
    -referential.ll.observation.ItemVerticalPosition > referential.I18nReferentialEntity
    407 
    -
    408 
    -referential.ll.observation.MaturityStatus > referential.I18nReferentialEntity
    409 
    -lowerValue String
    410 
    -upperValue String
    411 
    -
    412 
    -referential.ll.observation.SensorBrand > referential.ReferentialEntity
    413 
    -brandName String
    414 
    -
    415 
    -referential.ll.observation.SensorDataFormat > referential.I18nReferentialEntity
    416 
    -
    417 
    -referential.ll.observation.SensorType > referential.I18nReferentialEntity
    418 
    -
    419 
    -referential.ll.observation.StomachFullness > referential.I18nReferentialEntity
    420 
    -
    421 
    -
    422 
    -
    423 
    -
    424 
    -
    425 
    -package fr.ird.observe.entities.referential.ll.landing
    426 
    -
    427 
    -referential.ll.landing.Company > referential.I18nReferentialEntity
    428 
    -
    429 
    -referential.ll.landing.Conservation > referential.I18nReferentialEntity
    430 
    -
    431 
    -referential.ll.landing.DataSource > referential.I18nReferentialEntity
    432 
    -
    433 
    -
    434 
    -package fr.ird.observe.entities.data.ps.observation
    435 
    -
    436 
    -interface data.ps.observation.LengthWeightComputableAware > fr.ird.observe.entities.data.DataEntity
    437 
    -
    438 
    -enum !fr.ird.observe.dto.data.ps.CatchComputedValueSource
    439 
    -
    440 
    -enum !fr.ird.observe.dto.data.ps.NonTargetCatchReleaseStatus
    441 
    -
    442 
    -enum !fr.ird.observe.dto.data.ps.TypeTransmittingBuoyOperation
    443 
    -
    444 
    -enum !fr.ird.observe.dto.data.ps.DcpComputedValue
    445 
    -
    446 
    -data.ps.observation.Activity > data.DataEntity
    447 
    -comment String
    448 
    -time Date
    449 
    -latitude Float
    450 
    -longitude Float
    451 
    -vesselSpeed Float
    452 
    -seaSurfaceTemperature Float
    453 
    -observedSystemDistance Float
    454 
    -ersId String
    455 
    -vesselActivity {*:1} referential.ps.common.VesselActivity
    456 
    -surroundingActivity {*:0..1} referential.ps.observation.SurroundingActivity
    457 
    -wind {*:0..1} referential.common.Wind
    458 
    -detectionMode {*:0..1} referential.ps.observation.DetectionMode
    459 
    -reasonForNoFishing {*:0..1} referential.ps.common.ReasonForNoFishing
    460 
    -set + {0..1} data.ps.observation.Set
    461 
    -floatingObject + {*} data.ps.observation.FloatingObject
    462 
    -observedSystem {*:*} referential.ps.common.ObservedSystem
    463 
    -currentFpaZone {*:0..1} referential.common.FpaZone
    464 
    -previousFpaZone {*:0..1} referential.common.FpaZone
    465 
    -nextFpaZone {*:0..1} referential.common.FpaZone
    466 
    -dataQuality {*:0..1} referential.common.DataQuality
    467 
    -getSchoolTypeId() String
    468 
    -isActivityEndOfSearching() boolean
    469 
    -getDate() Date
    470 
    -
    471 
    -data.ps.observation.FloatingObject > data.DataEntity
    472 
    -comment String
    473 
    -objectSchoolEstimate + {*} data.ps.observation.ObjectSchoolEstimate
    474 
    -objectObservedSpecies + {*} data.ps.observation.ObjectObservedSpecies
    475 
    -objectOperation {*:1} referential.ps.common.ObjectOperation
    476 
    -supportVesselName String
    477 
    -transmittingBuoy + {*} data.ps.observation.TransmittingBuoy
    478 
    -floatingObjectPart + {*} data.ps.observation.FloatingObjectPart
    479 
    -computedWhenArrivingBiodegradable !fr.ird.observe.dto.data.ps.DcpComputedValue
    480 
    -computedWhenArrivingNonEntangling !fr.ird.observe.dto.data.ps.DcpComputedValue
    481 
    -computedWhenArrivingSimplifiedObjectType String
    482 
    -computedWhenLeavingBiodegradable !fr.ird.observe.dto.data.ps.DcpComputedValue
    483 
    -computedWhenLeavingNonEntangling !fr.ird.observe.dto.data.ps.DcpComputedValue
    484 
    -computedWhenLeavingSimplifiedObjectType String
    485 
    -
    486 
    -data.ps.observation.FloatingObjectPart > data.DataEntity
    487 
    -whenArriving String
    488 
    -whenLeaving String
    489 
    -objectMaterial {*:1} referential.ps.common.ObjectMaterial
    490 
    -
    491 
    -data.ps.observation.NonTargetCatchRelease > data.DataEntity
    492 
    -comment String
    493 
    -length Float
    494 
    -count Integer
    495 
    -acquisitionMode int
    496 
    -species {*:1} referential.common.Species
    497 
    -status {*:1} referential.ps.observation.NonTargetCatchReleaseStatus
    498 
    -sex {*:1} referential.common.Sex
    499 
    -speciesGroupReleaseMode {*:1} referential.common.SpeciesGroupReleaseMode
    500 
    -conformity {*:1} referential.ps.observation.NonTargetCatchReleaseConformity
    501 
    -releasingTime {*:1} referential.ps.observation.NonTargetCatchReleasingTime
    502 
    -lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethod
    503 
    -
    504 
    -data.ps.observation.ObjectObservedSpecies > data.DataEntity
    505 
    -count Integer
    506 
    -species {*:1} referential.common.Species
    507 
    -speciesStatus {*:1} referential.ps.observation.SpeciesStatus
    508 
    -
    509 
    -data.ps.observation.ObjectSchoolEstimate > data.DataEntity
    510 
    -totalWeight Integer
    511 
    -species {*:1} referential.common.Species
    512 
    -weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    513 
    -
    514 
    -data.ps.observation.Route > data.DataEntity
    515 
    -comment String
    516 
    -date Date
    517 
    -startLogValue Float
    518 
    -endLogValue Float
    519 
    -activity + {*} data.ps.observation.Activity
    520 
    -
    521 
    -data.ps.observation.SchoolEstimate > data.DataEntity
    522 
    -totalWeight Integer
    523 
    -meanWeight Integer
    524 
    -species {*:1} referential.common.Species
    525 
    -weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    526 
    -
    527 
    -data.ps.observation.Set > data.DataEntity
    528 
    -comment String
    529 
    -startTime Date
    530 
    -haulingStartTimeStamp Date
    531 
    -haulingEndTimeStamp Date
    532 
    -endTimeStamp Date
    533 
    -maxGearDepth Integer
    534 
    -currentSpeed Float
    535 
    -currentDirection Integer
    536 
    -schoolTopDepth Integer
    537 
    -schoolMeanDepth Integer
    538 
    -schoolThickness Integer
    539 
    -supportVesselName String
    540 
    -currentMeasureDepth Integer
    541 
    -schoolType {*:1} referential.ps.common.SchoolType
    542 
    -reasonForNullSet {*:0..1} referential.ps.common.ReasonForNullSet
    543 
    -schoolEstimate + {*} data.ps.observation.SchoolEstimate
    544 
    -catches + {*} data.ps.observation.Catch
    545 
    -sample + {*} data.ps.observation.Sample
    546 
    -nonTargetCatchRelease + {*} data.ps.observation.NonTargetCatchRelease
    547 
    -hasCatch() boolean
    548 
    -canUseSample() boolean
    549 
    -canUseNonTargetCatchRelease() boolean
    550 
    -isFreeSchoolType() boolean
    551 
    -isSchoolObjectType() boolean
    552 
    -isUnknownSchoolType() boolean
    553 
    -getSampleMeasureSize() int
    554 
    -
    555 
    -data.ps.observation.TransmittingBuoy > data.DataEntity
    556 
    -comment String
    557 
    -code String
    558 
    -transmittingBuoyOwnership {*:1} referential.ps.common.TransmittingBuoyOwnership
    559 
    -transmittingBuoyType {*:1} referential.ps.common.TransmittingBuoyType
    560 
    -transmittingBuoyOperation {*:1} referential.ps.common.TransmittingBuoyOperation
    561 
    -country {*:1} referential.common.Country
    562 
    -vessel {*:1} referential.common.Vessel
    563 
    -latitude Float
    564 
    -longitude Float
    565 
    -
    566 
    -data.ps.observation.Catch > data.DataEntity >> data.ps.observation.LengthWeightComputableAware fr.ird.observe.dto.data.WellIdAware
    567 
    -comment String
    568 
    -catchWeight Float
    569 
    -catchWeightComputedSource !fr.ird.observe.dto.data.ps.CatchComputedValueSource
    570 
    -meanWeight Float
    571 
    -meanWeightComputedSource !fr.ird.observe.dto.data.ps.CatchComputedValueSource
    572 
    -meanLength Float
    573 
    -meanLengthComputedSource !fr.ird.observe.dto.data.ps.CatchComputedValueSource
    574 
    -totalCount Integer
    575 
    -totalCountComputedSource !fr.ird.observe.dto.data.ps.CatchComputedValueSource
    576 
    -well String
    577 
    -reasonForDiscard {*:0..1} referential.ps.observation.ReasonForDiscard
    578 
    -informationSource {*:0..1} referential.ps.observation.InformationSource
    579 
    -species {*:1} referential.common.Species
    580 
    -weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    581 
    -lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethod
    582 
    -speciesFate {*:0..1} referential.ps.common.SpeciesFate
    583 
    -isCatchWeightComputed() boolean
    584 
    -isMeanWeightComputed() boolean
    585 
    -isTotalCountComputed() boolean
    586 
    -isMeanLengthComputed() boolean
    587 
    -
    588 
    -data.ps.observation.Sample > data.DataEntity
    589 
    -comment String
    590 
    -sampleMeasure + {*} data.ps.observation.SampleMeasure
    591 
    -
    592 
    -data.ps.observation.SampleMeasure > data.DataEntity >> data.ps.observation.LengthWeightComputableAware
    593 
    -length Float
    594 
    -isLengthComputed boolean
    595 
    -picturesReferences String
    596 
    -weight Float
    597 
    -isWeightComputed boolean
    598 
    -count Integer
    599 
    -acquisitionMode int
    600 
    -tagNumber String
    601 
    -species {*:1} referential.common.Species
    602 
    -sex {*:1} referential.common.Sex
    603 
    -speciesFate {*:0..1} referential.ps.common.SpeciesFate
    604 
    -sizeMeasureType {*:1} referential.common.SizeMeasureType
    605 
    -weightMeasureType {*:0..1} referential.common.WeightMeasureType
    606 
    -weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    607 
    -lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethod
    608 
    -
    609 
    -
    610 
    -package fr.ird.observe.entities.data.ps.logbook
    611 
    -
    612 
    -data.ps.logbook.Activity > data.DataEntity
    613 
    -comment String
    614 
    -time Date
    615 
    -latitude Float
    616 
    -longitude Float
    617 
    -latitudeOriginal Float
    618 
    -longitudeOriginal Float
    619 
    -originalDataModified boolean
    620 
    -vmsDivergent boolean
    621 
    -positionCorrected boolean
    622 
    -number int
    623 
    -setCount Integer
    624 
    -seaSurfaceTemperature Float
    625 
    -windDirection Integer
    626 
    -vesselActivity {*:1} referential.ps.common.VesselActivity
    627 
    -wind {*:0..1} referential.common.Wind
    628 
    -totalWeight Float
    629 
    -currentSpeed Float
    630 
    -currentDirection Integer
    631 
    -schoolType {*:1} referential.ps.common.SchoolType
    632 
    -relatedObservedActivity {0..1} data.ps.observation.Activity
    633 
    -catches + {*} data.ps.logbook.Catch
    634 
    -floatingObject + {*} data.ps.logbook.FloatingObject
    635 
    -observedSystem {*:*} referential.ps.common.ObservedSystem
    636 
    -fpaZone {*:0..1} referential.common.FpaZone
    637 
    -dataQuality {*:0..1} referential.common.DataQuality
    638 
    -informationSource {*:0..1} referential.ps.logbook.InformationSource
    639 
    -reasonForNoFishing {*:0..1} referential.ps.common.ReasonForNoFishing
    640 
    -setSuccessStatus   {*:0..1} referential.ps.logbook.SetSuccessStatus
    641 
    -reasonForNullSet {*:0..1} referential.ps.common.ReasonForNullSet
    642 
    -getSchoolTypeId() String
    643 
    -getDate() Date
    644 
    -
    645 
    -data.ps.logbook.Catch > data.DataEntity >> fr.ird.observe.dto.data.WellIdAware
    646 
    -comment String
    647 
    -species {*:1} referential.common.Species
    648 
    -weightCategory {*:0..1} referential.ps.common.WeightCategory
    649 
    -speciesFate {*:0..1} referential.ps.common.SpeciesFate
    650 
    -weight Float
    651 
    -count Integer
    652 
    -weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    653 
    -well String
    654 
    -
    655 
    -data.ps.logbook.FloatingObject > data.DataEntity
    656 
    -comment String
    657 
    -objectOperation {*:1} referential.ps.common.ObjectOperation
    658 
    -supportVesselName String
    659 
    -transmittingBuoy + {*} data.ps.logbook.TransmittingBuoy
    660 
    -floatingObjectPart + {*} data.ps.logbook.FloatingObjectPart
    661 
    -computedWhenArrivingBiodegradable !fr.ird.observe.dto.data.ps.DcpComputedValue
    662 
    -computedWhenArrivingNonEntangling !fr.ird.observe.dto.data.ps.DcpComputedValue
    663 
    -computedWhenArrivingSimplifiedObjectType String
    664 
    -computedWhenLeavingBiodegradable !fr.ird.observe.dto.data.ps.DcpComputedValue
    665 
    -computedWhenLeavingNonEntangling !fr.ird.observe.dto.data.ps.DcpComputedValue
    666 
    -computedWhenLeavingSimplifiedObjectType String
    667 
    -
    668 
    -data.ps.logbook.FloatingObjectPart > data.DataEntity
    669 
    -whenArriving String
    670 
    -whenLeaving String
    671 
    -objectMaterial {*:1} referential.ps.common.ObjectMaterial
    672 
    -
    673 
    -data.ps.logbook.Route > data.DataEntity
    674 
    -comment String
    675 
    -date Date
    676 
    -timeAtSea Integer
    677 
    -fishingTime Integer
    678 
    -activity + {*} data.ps.logbook.Activity
    679 
    -
    680 
    -data.ps.logbook.TransmittingBuoy > data.DataEntity
    681 
    -comment String
    682 
    -code String
    683 
    -transmittingBuoyOwnership {*:1} referential.ps.common.TransmittingBuoyOwnership
    684 
    -transmittingBuoyType {*:1} referential.ps.common.TransmittingBuoyType
    685 
    -transmittingBuoyOperation {*:1} referential.ps.common.TransmittingBuoyOperation
    686 
    -country {*:1} referential.common.Country
    687 
    -vessel {*:1} referential.common.Vessel
    688 
    -latitude Float
    689 
    -longitude Float
    690 
    -
    691 
    -data.ps.logbook.Sample > data.DataEntity >> fr.ird.observe.dto.data.WellIdAware
    692 
    -number Integer
    693 
    -comment String
    694 
    -well String
    695 
    -sampleType {*:0..1} referential.ps.common.SampleType
    696 
    -sampleQuality {*:0..1} referential.ps.logbook.SampleQuality
    697 
    -superSample boolean
    698 
    -smallsWeight Float
    699 
    -bigsWeight Float
    700 
    -totalWeight Float
    701 
    -person {*:*} referential.common.Person
    702 
    -sampleActivity + {*} data.ps.logbook.SampleActivity
    703 
    -sampleSpecies + {*} data.ps.logbook.SampleSpecies
    704 
    -
    705 
    -data.ps.logbook.SampleActivity > data.DataEntity >> fr.ird.observe.dto.data.ps.logbook.ActivityLabelAware
    706 
    -activity {*:1} data.ps.logbook.Activity
    707 
    -weightedWeight Float
    708 
    -
    709 
    -data.ps.logbook.SampleSpecies > data.DataEntity
    710 
    -comment String
    711 
    -startTime Date
    712 
    -endTime Date
    713 
    -subSampleNumber Integer
    714 
    -measuredCount Integer
    715 
    -totalCount Integer
    716 
    -species {*:1} referential.common.Species
    717 
    -sizeMeasureType {*:0..1} referential.common.SizeMeasureType
    718 
    -sampleSpeciesMeasure + {*} data.ps.logbook.SampleSpeciesMeasure
    719 
    -
    720 
    -data.ps.logbook.SampleSpeciesMeasure > data.DataEntity
    721 
    -sizeClass Float
    722 
    -count Integer
    723 
    -
    724 
    -data.ps.logbook.WellPlan > data.DataEntity >> fr.ird.observe.dto.data.WellIdAware
    725 
    -activity {*:1} data.ps.logbook.Activity
    726 
    -well String
    727 
    -species {*:1} referential.common.Species
    728 
    -weightCategory {*:1} referential.ps.common.WeightCategory
    729 
    -weight Float
    730 
    -wellSamplingConformity {*:1} referential.ps.logbook.WellSamplingConformity
    731 
    -wellSamplingStatus {*:1} referential.ps.logbook.WellSamplingStatus
    732 
    -
    733 
    -
    734 
    -package fr.ird.observe.entities.data.ps.landing
    735 
    -
    736 
    -data.ps.landing.Landing > data.DataEntity
    737 
    -date Date
    738 
    -species {*:1} referential.common.Species
    739 
    -weightCategory {*:1} referential.ps.common.WeightCategory
    740 
    -destination {*:1} referential.ps.landing.Destination
    741 
    -fate {*:1} referential.ps.landing.Fate
    742 
    -fateVessel {*:0..1} referential.common.Vessel
    743 
    -weight Float
    744 
    -
    745 
    -
    746 
    -package fr.ird.observe.entities.data.ps.localmarket
    747 
    -
    748 
    -enum !fr.ird.observe.dto.data.ps.localmarket.BatchWeightComputedValueSource
    749 
    -
    750 
    -data.ps.localmarket.Batch > data.DataEntity
    751 
    -date Date
    752 
    -species {*:1} referential.common.Species
    753 
    -packaging {*:1} referential.ps.localmarket.Packaging
    754 
    -count Integer
    755 
    -weight Float
    756 
    -weightComputedSource !fr.ird.observe.dto.data.ps.localmarket.BatchWeightComputedValueSource
    757 
    -survey {*:0..1} data.ps.localmarket.Survey
    758 
    -origin String
    759 
    -comment String
    760 
    -
    761 
    -data.ps.localmarket.Survey > data.DataEntity
    762 
    -comment String
    763 
    -date Date
    764 
    -number Integer
    765 
    -surveyPart + {*} data.ps.localmarket.SurveyPart
    766 
    -
    767 
    -data.ps.localmarket.SurveyPart > data.DataEntity >> data.WithProportion
    768 
    -species {*:1} referential.common.Species
    769 
    -proportion Integer
    770 
    -
    771 
    -data.ps.localmarket.Sample > data.DataEntity >> fr.ird.observe.dto.data.WellIdsAware
    772 
    -number String
    773 
    -date Date
    774 
    -comment String
    775 
    -sampleType {*:0..1} referential.ps.common.SampleType
    776 
    -sampleSpecies + {*} data.ps.localmarket.SampleSpecies
    777 
    -well + {*:*} String
    778 
    -
    779 
    -data.ps.localmarket.SampleSpecies > data.DataEntity
    780 
    -comment String
    781 
    -measuredCount Integer
    782 
    -species {*:1} referential.common.Species
    783 
    -sizeMeasureType {*:1} referential.common.SizeMeasureType
    784 
    -sampleSpeciesMeasure + {*} data.ps.localmarket.SampleSpeciesMeasure
    785 
    -
    786 
    -data.ps.localmarket.SampleSpeciesMeasure > data.DataEntity
    787 
    -count Integer
    788 
    -sizeClass Float
    789 
    -
    790 
    -
    791 
    -package fr.ird.observe.entities.data.ps.common
    792 
    -
    793 
    -data.ps.common.GearUseFeatures > data.DataEntity
    794 
    -comment String
    795 
    -number Integer
    796 
    -usedInTrip Boolean
    797 
    -gear {*:1} referential.common.Gear
    798 
    -gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement
    799 
    -
    800 
    -data.ps.common.GearUseFeaturesMeasurement > data.DataEntity
    801 
    -measurementValue String
    802 
    -gearCharacteristic {*:1} referential.common.GearCharacteristic
    803 
    -
    804 
    -data.ps.common.Trip > data.RootOpenableEntity >> data.TripEntityAware
    805 
    -startDate Date
    806 
    -endDate Date
    807 
    -formsUrl String
    808 
    -reportsUrl String
    809 
    -historicalData boolean
    810 
    -ersId String
    811 
    -ocean {*:0..1} referential.common.Ocean
    812 
    -timeAtSea Integer
    813 
    -fishingTime Integer
    814 
    -landingTotalWeight Float
    815 
    -localMarketTotalWeight Float
    816 
    -loch Integer
    817 
    -generalComment String
    818 
    -observationsComment String
    819 
    -logbookComment String
    820 
    -gearUseFeatures + {*} data.ps.common.GearUseFeatures
    821 
    -routeObs + {*} data.ps.observation.Route
    822 
    -routeLogbook + {*} data.ps.logbook.Route
    823 
    -wellPlan + {*} data.ps.logbook.WellPlan
    824 
    -sample + {*} data.ps.logbook.Sample
    825 
    -landing + {*} data.ps.landing.Landing
    826 
    -localmarketBatch + {*} data.ps.localmarket.Batch
    827 
    -localmarketSurvey + {*} data.ps.localmarket.Survey
    828 
    -localmarketSample + {*} data.ps.localmarket.Sample
    829 
    -vessel {*:1} referential.common.Vessel
    830 
    -observationsProgram {*:1} referential.ps.common.Program
    831 
    -logbookProgram {*:1} referential.ps.common.Program
    832 
    -observer {*:0..1} referential.common.Person
    833 
    -captain {*:0..1} referential.common.Person
    834 
    -observationsDataEntryOperator {*:0..1} referential.common.Person
    835 
    -logbookDataEntryOperator {*:0..1} referential.common.Person
    836 
    -departureHarbour {*:0..1} referential.common.Harbour
    837 
    -landingHarbour {*:0..1} referential.common.Harbour
    838 
    -observationsDataQuality {*:0..1} referential.common.DataQuality
    839 
    -logbookDataQuality {*:0..1} referential.common.DataQuality
    840 
    -departureWellContentStatus {*:1} referential.ps.logbook.WellContentStatus
    841 
    -landingWellContentStatus {*:1} referential.ps.logbook.WellContentStatus
    842 
    -observationsAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
    843 
    -logbookAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
    844 
    -targetWellsSamplingAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
    845 
    -landingAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
    846 
    -localMarketAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
    847 
    -localMarketWellsSamplingAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
    848 
    -localMarketSurveySamplingAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
    849 
    -advancedSamplingAcquisitionStatus {*:1} referential.ps.common.AcquisitionStatus
    850 
    -isObservationsFilled() boolean
    851 
    -isLogbookFilled() boolean
    852 
    -isTargetWellsSamplingFilled() boolean
    853 
    -isLandingFilled() boolean
    854 
    -isLocalmarketFilled() boolean
    855 
    -isLocalmarketWellsSamplingFilled() boolean
    856 
    -isLocalmarketSurveySamplingFilled() boolean
    857 
    -isAdvancedSamplingFilled() boolean
    858 
    -
    859 
    -package fr.ird.observe.entities.data.ll.observation
    860 
    -
    861 
    -data.ll.observation.Activity > data.DataEntity
    862 
    -comment String
    863 
    -timeStamp Date
    864 
    -latitude Float
    865 
    -longitude Float
    866 
    -seaSurfaceTemperature Float
    867 
    -set + {0..1} data.ll.observation.Set
    868 
    -encounter + {*} data.ll.observation.Encounter
    869 
    -vesselActivity {*:1} referential.ll.common.VesselActivity
    870 
    -dataQuality {*:0..1} referential.common.DataQuality
    871 
    -sensorUsed + {*} data.ll.observation.SensorUsed
    872 
    -fpaZone {*:1} referential.common.FpaZone
    873 
    -
    874 
    -data.ll.observation.BaitsComposition > data.DataEntity >> data.WithProportion
    875 
    -proportion Integer
    876 
    -individualSize Integer
    877 
    -individualWeight Float
    878 
    -baitSettingStatus {*:1} referential.ll.common.BaitSettingStatus
    879 
    -baitType {*:1} referential.ll.common.BaitType
    880 
    -
    881 
    -data.ll.observation.Basket > data.DataEntity >> fr.ird.observe.dto.DtoParentAware
    882 
    -settingIdentifier Integer
    883 
    -haulingIdentifier Integer
    884 
    -floatline1Length Float
    885 
    -floatline2Length Float
    886 
    -branchline + {*} data.ll.observation.Branchline
    887 
    -
    888 
    -data.ll.observation.Branchline > data.DataEntity >> fr.ird.observe.dto.DtoParentAware
    889 
    -comment String
    890 
    -settingIdentifier Integer
    891 
    -haulingIdentifier Integer
    892 
    -depthRecorder Boolean
    893 
    -timer Boolean
    894 
    -timeSinceContact Integer
    895 
    -hookOffset Integer
    896 
    -branchlineLength Float
    897 
    -weightedSwivel Boolean
    898 
    -timerTimeOnBoard Date
    899 
    -weightedSnap Boolean
    900 
    -swivelWeight Float
    901 
    -snapWeight Float
    902 
    -tracelineLength Float
    903 
    -hookLost Boolean
    904 
    -traceCutOff Boolean
    905 
    -hookType {*:0..1} referential.ll.common.HookType
    906 
    -baitType {*:0..1} referential.ll.common.BaitType
    907 
    -topType {*:0..1} referential.ll.common.LineType
    908 
    -tracelineType {*:0..1} referential.ll.common.LineType
    909 
    -baitSettingStatus {*:0..1} referential.ll.common.BaitSettingStatus
    910 
    -baitHaulingStatus {*:0..1} referential.ll.observation.BaitHaulingStatus
    911 
    -hookSize {*:0..1} referential.ll.common.HookSize
    912 
    -
    913 
    -data.ll.observation.BranchlinesComposition > data.DataEntity >> data.WithProportion
    914 
    -length Float
    915 
    -proportion Integer
    916 
    -tracelineLength Float
    917 
    -topType {*:0..1} referential.ll.common.LineType
    918 
    -tracelineType {*:0..1} referential.ll.common.LineType
    919 
    -
    920 
    -data.ll.observation.Catch > data.DataEntity
    921 
    -comment String
    922 
    -count Integer
    923 
    -totalWeight Float
    924 
    -hookWhenDiscarded Boolean
    925 
    -depredated Boolean
    926 
    -beatDiameter Float
    927 
    -gonadeWeight Float
    928 
    -photoReferences String
    929 
    -number Integer
    930 
    -acquisitionMode int
    931 
    -tagNumber String
    932 
    -section {*:0..1} data.ll.observation.Section
    933 
    -basket {*:0..1} data.ll.observation.Basket
    934 
    -branchline {*:0..1} data.ll.observation.Branchline
    935 
    -catchFate {*:1} referential.ll.common.CatchFate
    936 
    -discardHealthStatus {*:1} referential.ll.common.HealthStatus
    937 
    -sizeMeasure + {*} data.ll.observation.SizeMeasure
    938 
    -species {*:1} referential.common.Species
    939 
    -predator {*:*} referential.common.Species
    940 
    -maturityStatus {*:0..1} referential.ll.observation.MaturityStatus
    941 
    -stomachFullness {*:0..1} referential.ll.observation.StomachFullness
    942 
    -hookPosition {*:0..1} referential.ll.observation.HookPosition
    943 
    -weightMeasure + {*} data.ll.observation.WeightMeasure
    944 
    -catchHealthStatus {*:1} referential.ll.common.HealthStatus
    945 
    -sex {*:0..1} referential.common.Sex
    946 
    -weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    947 
    -
    948 
    -data.ll.observation.Encounter > data.DataEntity
    949 
    -distance Float
    950 
    -count Integer
    951 
    -encounterType {*:1} referential.ll.observation.EncounterType
    952 
    -species {*:1} referential.common.Species
    953 
    -
    954 
    -data.ll.observation.FloatlinesComposition > data.DataEntity >> data.WithProportion
    955 
    -length Float
    956 
    -proportion Integer
    957 
    -lineType {*:1} referential.ll.common.LineType
    958 
    -
    959 
    -data.ll.observation.HooksComposition > data.DataEntity >> data.WithProportion
    960 
    -proportion Integer
    961 
    -hookOffset Integer
    962 
    -hookType {*:1} referential.ll.common.HookType
    963 
    -hookSize {*:1} referential.ll.common.HookSize
    964 
    -
    965 
    -data.ll.observation.Section > data.DataEntity >> fr.ird.observe.dto.DtoParentAware
    966 
    -settingIdentifier Integer
    967 
    -haulingIdentifier Integer
    968 
    -basket + {*} data.ll.observation.Basket
    969 
    -
    970 
    -data.ll.observation.SensorUsed > data.DataEntity >> data.DataFileAware
    971 
    -data !java.sql.Blob
    972 
    -dataFilename String
    973 
    -dataLocation String
    974 
    -sensorSerialNo String
    975 
    -sensorType {*:1} referential.ll.observation.SensorType
    976 
    -sensorDataFormat {*:0..1} referential.ll.observation.SensorDataFormat
    977 
    -sensorBrand {*:1} referential.ll.observation.SensorBrand
    978 
    -
    979 
    -data.ll.observation.Set > data.DataEntity
    980 
    -comment String
    981 
    -number Integer
    982 
    -basketsPerSectionCount Integer
    983 
    -branchlinesPerBasketCount Integer
    984 
    -totalSectionsCount Integer
    985 
    -totalBasketsCount Integer
    986 
    -totalHooksCount Integer
    987 
    -weightedSnap Boolean
    988 
    -snapWeight Float
    989 
    -weightedSwivel Boolean
    990 
    -swivelWeight Float
    991 
    -lightsticksPerBasketCount Integer
    992 
    -timeBetweenHooks Long
    993 
    -shooterUsed Boolean
    994 
    -shooterSpeed Float
    995 
    -maxDepthTargeted Float
    996 
    -settingStartTimeStamp Date
    997 
    -settingStartLatitude Float
    998 
    -settingStartLongitude Float
    999 
    -settingEndTimeStamp Date
    1000 
    -settingEndLatitude Float
    1001 
    -settingEndLongitude Float
    1002 
    -settingVesselSpeed Float
    1003 
    -haulingDirectionSameAsSetting Boolean
    1004 
    -haulingStartTimeStamp Date
    1005 
    -haulingStartLatitude Float
    1006 
    -haulingStartLongitude Float
    1007 
    -haulingEndTimeStamp Date
    1008 
    -haulingEndLatitude Float
    1009 
    -haulingEndLongitude Float
    1010 
    -haulingBreaks Integer
    1011 
    -monitored Boolean
    1012 
    -baitsComposition + {*} data.ll.observation.BaitsComposition
    1013 
    -floatlinesComposition + {*} data.ll.observation.FloatlinesComposition
    1014 
    -hooksComposition + {*} data.ll.observation.HooksComposition
    1015 
    -settingShape {*:1} referential.ll.common.SettingShape
    1016 
    -section + {*} data.ll.observation.Section
    1017 
    -catches + {*} data.ll.observation.Catch
    1018 
    -tdr + {*} data.ll.observation.Tdr
    1019 
    -lineType {*:0..1} referential.ll.common.LineType
    1020 
    -lightsticksType {*:0..1} referential.ll.common.LightsticksType
    1021 
    -lightsticksColor {*:0..1} referential.ll.common.LightsticksColor
    1022 
    -mitigationType {*:*} referential.ll.common.MitigationType
    1023 
    -branchlinesComposition + {*} data.ll.observation.BranchlinesComposition
    1024 
    -
    1025 
    -data.ll.observation.SizeMeasure > data.DataEntity
    1026 
    -size Float
    1027 
    -sizeMeasureType {*:1} referential.common.SizeMeasureType
    1028 
    -
    1029 
    -data.ll.observation.Tdr > data.DataEntity >> data.DataFileAware
    1030 
    -floatline1Length Float
    1031 
    -floatline2Length Float
    1032 
    -serialNo String
    1033 
    -data !java.sql.Blob
    1034 
    -dataFilename String
    1035 
    -dataLocation String
    1036 
    -deploymentStart Date
    1037 
    -deploymentEnd Date
    1038 
    -fishingStart Date
    1039 
    -fishingEnd Date
    1040 
    -fishingStartDepth Float
    1041 
    -fishingEndDepth Float
    1042 
    -meanDeploymentDepth Float
    1043 
    -medianDeploymentDepth Float
    1044 
    -minFishingDepth Float
    1045 
    -maxFishingDepth Float
    1046 
    -meanFishingDepth Float
    1047 
    -medianFishingDepth Float
    1048 
    -section {*:0..1} data.ll.observation.Section
    1049 
    -basket {*:0..1} data.ll.observation.Basket
    1050 
    -branchline {*:0..1} data.ll.observation.Branchline
    1051 
    -sensorBrand {*:0..1} referential.ll.observation.SensorBrand
    1052 
    -species {*:*} referential.common.Species
    1053 
    -itemHorizontalPosition {*:0..1} referential.ll.observation.ItemHorizontalPosition
    1054 
    -itemVerticalPosition {*:0..1} referential.ll.observation.ItemVerticalPosition
    1055 
    -
    1056 
    -data.ll.observation.WeightMeasure > data.DataEntity
    1057 
    -weight Float
    1058 
    -weightMeasureType {*:1} referential.common.WeightMeasureType
    1059 
    -
    1060 
    -
    1061 
    -package fr.ird.observe.entities.data.ll.logbook
    1062 
    -
    1063 
    -data.ll.logbook.Activity > data.DataEntity
    1064 
    -comment String
    1065 
    -startTimeStamp Date
    1066 
    -endTimeStamp Date
    1067 
    -latitude Float
    1068 
    -longitude Float
    1069 
    -seaSurfaceTemperature Float
    1070 
    -wind {*:1} referential.common.Wind
    1071 
    -windDirection Integer
    1072 
    -currentSpeed Float
    1073 
    -currentDirection Integer
    1074 
    -vesselActivity {*:1} referential.ll.common.VesselActivity
    1075 
    -dataQuality {*:0..1} referential.common.DataQuality
    1076 
    -fpaZone {*:1} referential.common.FpaZone
    1077 
    -relatedObservedActivity {0..1} data.ll.observation.Activity
    1078 
    -set + {0..1} data.ll.logbook.Set
    1079 
    -sample + {0..1} data.ll.logbook.Sample
    1080 
    -
    1081 
    -data.ll.logbook.Set > data.DataEntity
    1082 
    -comment String
    1083 
    -number Integer
    1084 
    -basketsPerSectionCount Integer
    1085 
    -branchlinesPerBasketCount Integer
    1086 
    -totalSectionsCount Integer
    1087 
    -totalBasketsCount Integer
    1088 
    -totalHooksCount Integer
    1089 
    -lightsticksPerBasketCount Integer
    1090 
    -totalLightsticksCount Integer
    1091 
    -weightedSnap Boolean
    1092 
    -snapWeight Float
    1093 
    -weightedSwivel Boolean
    1094 
    -swivelWeight Float
    1095 
    -timeBetweenHooks Long
    1096 
    -shooterUsed Boolean
    1097 
    -shooterSpeed Float
    1098 
    -maxDepthTargeted Float
    1099 
    -settingStartTimeStamp Date
    1100 
    -settingStartLatitude Float
    1101 
    -settingStartLongitude Float
    1102 
    -settingEndTimeStamp Date
    1103 
    -settingEndLatitude Float
    1104 
    -settingEndLongitude Float
    1105 
    -settingVesselSpeed Float
    1106 
    -haulingDirectionSameAsSetting Boolean
    1107 
    -haulingStartTimeStamp Date
    1108 
    -haulingStartLatitude Float
    1109 
    -haulingStartLongitude Float
    1110 
    -haulingEndTimeStamp Date
    1111 
    -haulingEndLatitude Float
    1112 
    -haulingEndLongitude Float
    1113 
    -haulingBreaks Integer
    1114 
    -monitored Boolean
    1115 
    -totalLineLength Float
    1116 
    -basketLineLength Float
    1117 
    -lengthBetweenBranchlines Float
    1118 
    -baitsComposition + {*} data.ll.logbook.BaitsComposition
    1119 
    -floatlinesComposition + {*} data.ll.logbook.FloatlinesComposition
    1120 
    -hooksComposition + {*} data.ll.logbook.HooksComposition
    1121 
    -settingShape {*:1} referential.ll.common.SettingShape
    1122 
    -catches + {*} data.ll.logbook.Catch
    1123 
    -lineType {*:0..1} referential.ll.common.LineType
    1124 
    -lightsticksUsed Boolean
    1125 
    -lightsticksType {*:0..1} referential.ll.common.LightsticksType
    1126 
    -lightsticksColor {*:0..1} referential.ll.common.LightsticksColor
    1127 
    -mitigationType {*:*} referential.ll.common.MitigationType
    1128 
    -branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition
    1129 
    -
    1130 
    -data.ll.logbook.Catch > data.DataEntity
    1131 
    -comment String
    1132 
    -count Integer
    1133 
    -totalWeight Float
    1134 
    -hookWhenDiscarded Boolean
    1135 
    -depredated Boolean
    1136 
    -beatDiameter Float
    1137 
    -photoReferences String
    1138 
    -number Integer
    1139 
    -acquisitionMode int
    1140 
    -countDepredated Integer
    1141 
    -depredatedProportion Integer
    1142 
    -tagNumber String
    1143 
    -catchFate {*:1} referential.ll.common.CatchFate
    1144 
    -discardHealthStatus {*:1} referential.ll.common.HealthStatus
    1145 
    -species {*:1} referential.common.Species
    1146 
    -predator {*:*} referential.common.Species
    1147 
    -catchHealthStatus {*:1} referential.ll.common.HealthStatus
    1148 
    -onBoardProcessing {*:1} referential.ll.common.OnBoardProcessing
    1149 
    -weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    1150 
    -
    1151 
    -data.ll.logbook.BaitsComposition > data.DataEntity >> data.WithProportion
    1152 
    -proportion Integer
    1153 
    -individualSize Integer
    1154 
    -individualWeight Float
    1155 
    -baitSettingStatus {*:1} referential.ll.common.BaitSettingStatus
    1156 
    -baitType {*:1} referential.ll.common.BaitType
    1157 
    -
    1158 
    -data.ll.logbook.BranchlinesComposition > data.DataEntity >> data.WithProportion
    1159 
    -length Float
    1160 
    -proportion Integer
    1161 
    -tracelineLength Float
    1162 
    -topType {*:0..1} referential.ll.common.LineType
    1163 
    -tracelineType {*:0..1} referential.ll.common.LineType
    1164 
    -
    1165 
    -data.ll.logbook.FloatlinesComposition > data.DataEntity >> data.WithProportion
    1166 
    -length Float
    1167 
    -proportion Integer
    1168 
    -lineType {*:1} referential.ll.common.LineType
    1169 
    -
    1170 
    -data.ll.logbook.HooksComposition > data.DataEntity >> data.WithProportion
    1171 
    -proportion Integer
    1172 
    -hookOffset Integer
    1173 
    -hookType {*:1} referential.ll.common.HookType
    1174 
    -hookSize {*:1} referential.ll.common.HookSize
    1175 
    -
    1176 
    -data.ll.logbook.SamplePart > data.DataEntity
    1177 
    -length Float
    1178 
    -weight Float
    1179 
    -count Integer
    1180 
    -acquisitionMode int
    1181 
    -tagNumber String
    1182 
    -species {*:1} referential.common.Species
    1183 
    -sex {*:1} referential.common.Sex
    1184 
    -sizeMeasureType {*:0..1} referential.common.SizeMeasureType
    1185 
    -lengthMeasureMethod {*:0..1} referential.common.LengthMeasureMethod
    1186 
    -weightMeasureType {*:0..1} referential.common.WeightMeasureType
    1187 
    -weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    1188 
    -
    1189 
    -data.ll.logbook.Sample > data.DataEntity
    1190 
    -comment String
    1191 
    -timeStamp Date
    1192 
    -latitude Float
    1193 
    -longitude Float
    1194 
    -samplePart + {*} data.ll.logbook.SamplePart
    1195 
    -getCoordinateStr() String
    1196 
    -
    1197 
    -package fr.ird.observe.entities.data.ll.landing
    1198 
    -
    1199 
    -data.ll.landing.Landing > data.DataEntity
    1200 
    -comment String
    1201 
    -startDate Date
    1202 
    -endDate Date
    1203 
    -latitude Float
    1204 
    -longitude Float
    1205 
    -dataSource {*:1} referential.ll.landing.DataSource
    1206 
    -processingCompany {*:1} referential.ll.landing.Company
    1207 
    -shippingCompany {*:1} referential.ll.landing.Company
    1208 
    -brokerageCompany {*:1} referential.ll.landing.Company
    1209 
    -person {*:1} referential.common.Person
    1210 
    -harbour {*:0..1} referential.common.Harbour
    1211 
    -vessel {*:0..1} referential.common.Vessel
    1212 
    -landingPart + {*} data.ll.landing.LandingPart
    1213 
    -
    1214 
    -data.ll.landing.LandingPart > data.DataEntity
    1215 
    -species {*:1} referential.common.Species
    1216 
    -dataQuality {*:0..1} referential.common.DataQuality
    1217 
    -categoryMin Float
    1218 
    -categoryMax Float
    1219 
    -onBoardProcessing {*:1} referential.ll.common.OnBoardProcessing
    1220 
    -conservation {*:1} referential.ll.landing.Conservation
    1221 
    -count Integer
    1222 
    -weight Float
    1223 
    -weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    1224 
    -
    1225 
    -
    1226 
    -package fr.ird.observe.entities.data.ll.common
    1227 
    -
    1228 
    -data.ll.common.GearUseFeatures > data.DataEntity
    1229 
    -comment String
    1230 
    -number Integer
    1231 
    -usedInTrip Boolean
    1232 
    -gear {*:1} referential.common.Gear
    1233 
    -gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement
    1234 
    -
    1235 
    -data.ll.common.GearUseFeaturesMeasurement > data.DataEntity
    1236 
    -measurementValue String
    1237 
    -gearCharacteristic {*:1} referential.common.GearCharacteristic
    1238 
    -
    1239 
    -data.ll.common.Trip > data.RootOpenableEntity >> data.TripEntityAware
    1240 
    -startDate Date
    1241 
    -endDate Date
    1242 
    -noOfCrewMembers Integer
    1243 
    -ersId String
    1244 
    -gearUseFeatures + {*} data.ll.common.GearUseFeatures
    1245 
    -activityObs + {*} data.ll.observation.Activity
    1246 
    -activityLogbook + {*} data.ll.logbook.Activity
    1247 
    -landing + {*} data.ll.landing.Landing
    1248 
    -sample + {*} data.ll.logbook.Sample
    1249 
    -tripType {*:1} referential.ll.common.TripType
    1250 
    -observationMethod {*:1} referential.ll.common.ObservationMethod
    1251 
    -observer {*:1} referential.common.Person
    1252 
    -vessel {*:1} referential.common.Vessel
    1253 
    -observationsProgram {*:1} referential.ll.common.Program
    1254 
    -logbookProgram {*:1} referential.ll.common.Program
    1255 
    -captain {*:1} referential.common.Person
    1256 
    -observationsDataEntryOperator {*:1} referential.common.Person
    1257 
    -logbookDataEntryOperator {*:1} referential.common.Person
    1258 
    -sampleDataEntryOperator {*:1} referential.common.Person
    1259 
    -landingDataEntryOperator {*:1} referential.common.Person
    1260 
    -ocean {*:1} referential.common.Ocean
    1261 
    -departureHarbour {*:0..1} referential.common.Harbour
    1262 
    -landingHarbour {*:0..1} referential.common.Harbour
    1263 
    -observationsDataQuality {*:0..1} referential.common.DataQuality
    1264 
    -logbookDataQuality {*:0..1} referential.common.DataQuality
    1265 
    -generalComment String
    1266 
    -observationsComment String
    1267 
    -logbookComment String
    1268 
    -species {*:*} referential.common.Species
    1269 
    -observationsAvailability boolean
    1270 
    -logbookAvailability boolean
    \ No newline at end of file

  • src/site/markdown/avdth/referential.md
    ... ... @@ -144,41 +144,43 @@ TODO
    144 144
    145 145 
     Mapping type d'activité
    146 146
    147 
    -|**ACTIVITY.C_OPERA**| **ps_common.VesselActivity.code**|
    148 
    -|:---                | :---                             |
    149 
    -| 0                  | 6                                |
    150 
    -| 1                  | 6                                |
    151 
    -| 2                  | 6                                |
    152 
    -| 3                  | 2                                |
    153 
    -| 4                  | 1                                |
    154 
    -| 5                  | 13                               |
    155 
    -| 6                  | 13                               |
    156 
    -| 22                 | 13                               |
    157 
    -| 23                 | 13                               |
    158 
    -| 24                 | 13                               |
    159 
    -| 25                 | 13                               |
    160 
    -| 26                 | 13                               |
    161 
    -| 29                 | 13                               |
    162 
    -| 30                 | 13                               |
    163 
    -| 31                 | 13                               |
    164 
    -| 32                 | 13                               |
    165 
    -| 33                 | 13                               |
    166 
    -| 34                 | 13                               |
    167 
    -| 7                  | 22                               |
    168 
    -| 8                  | 10                               |
    169 
    -| 9                  | 23                               |
    170 
    -| 10                 | 24                               |
    171 
    -| 11                 | 25                               |
    172 
    -| 12                 | 26                               |
    173 
    -| 13                 | 27                               |
    174 
    -| 14                 | 28                               |
    175 
    -| 15                 | 0                                |
    176 
    -| 19                 | 29                               |
    177 
    -| 20                 | 30                               |
    178 
    -| 35                 | 31                               |
    179 
    -| 36                 | 99  **FIXME**                    |
    180 
    -
    181 
    -**Seule une activité de code 13 permet la création de DCP**.
    147 
    +|**ACTIVITY.C_OPERA**| **ps_common.VesselActivity.code** |
    148 
    +|:---                |:----------------------------------|
    149 
    +| 0                  | 6   (1)                           |
    150 
    +| 1                  | 6   (1)                           |
    151 
    +| 2                  | 6   (1)                           |
    152 
    +| 14                 | 6   (1) (3)                       |
    153 
    +| 3                  | 2                                 |
    154 
    +| 4                  | 1                                 |
    155 
    +| 5                  | 13  (2)                           |
    156 
    +| 6                  | 13  (2)                           |
    157 
    +| 22                 | 13  (2)                           |
    158 
    +| 23                 | 13  (2)                           |
    159 
    +| 24                 | 13  (2)                           |
    160 
    +| 25                 | 13  (2)                           |
    161 
    +| 26                 | 13  (2)                           |
    162 
    +| 29                 | 13  (2)                           |
    163 
    +| 30                 | 13  (2)                           |
    164 
    +| 31                 | 13  (2)                           |
    165 
    +| 32                 | 13  (2)                           |
    166 
    +| 33                 | 13  (2)                           |
    167 
    +| 34                 | 13  (2)                           |
    168 
    +| 7                  | 22                                |
    169 
    +| 8                  | 10                                |
    170 
    +| 9                  | 23                                |
    171 
    +| 10                 | 24                                |
    172 
    +| 11                 | 25                                |
    173 
    +| 12                 | 26                                |
    174 
    +| 13                 | 27                                |
    175 
    +| 15                 | 0                                 |
    176 
    +| 19                 | 29                                |
    177 
    +| 20                 | 30                                |
    178 
    +| 35                 | 31                                |
    179 
    +| 36                 | 99  **FIXME**                     |
    180 
    +
    181 
    +1. **Seule une activité de code 6 permet la création de captures**.
    182 
    +2. **Seule une activité de code 13 permet la création de DCP**.
    183 
    +3. On ajoute en plus un système observé **110** et **setSuccessStatus** à **2**.
    182 184
    183 185 
     ### REF_SCHOOL_TYPE
    184 186
    ... ... @@ -216,7 +218,7 @@ Mapping conformité d'échantillonnage de cuve
    216 218
    217 219 
     À partir de **CUVE.C_DEST**, on déduit **ps_logbook.WellSamplingConformity.code**
    218 220
    219 
    -|**CUVE.C_DEST**| **WellSamplingConformity.code**|                                                    |
    221 
    +|**CUVE.C_DEST**| **WellSamplingConformity.code**|
    220 222 
     |:---           | :---                           |
    221 223 
     | 1             | 9                              |
    222 224 
     | 2             | 9                              |
    ... ... @@ -245,7 +247,7 @@ Mapping status d'échantillonnage de cuve
    245 247
    246 248 
     À partir de **CUVE_DEST**, on déduit **ps_logbook.WellSamplingStatus.code**
    247 249
    248 
    -|**CUVE.C_DEST**| **WellSamplingStatus.code** |                                                    |
    250 
    +|**CUVE.C_DEST**| **WellSamplingStatus.code** |
    249 251 
     |:---           | :---                        |
    250 252 
     | 1             | 9                           |
    251 253 
     | 2             | 9                           |

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help