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

Commits:

8 changed files:

Changes:

  • persistence/src/main/models/Observe-02-referential-ps-common.model
    ... ... @@ -18,5 +18,5 @@ referential.ps.common.TransmittingBuoyOwnership > referential.I18nReferentialEnt
    18 18 
     referential.ps.common.TransmittingBuoyType > referential.I18nReferentialEntity | entity
    19 19 
     technology + {*:1} String | hibernateAttributeType=text
    20 20
    21 
    -referential.ps.common.VesselActivity > referential.I18nReferentialEntity | entity dbName=VesselActivity
    21 
    +referential.ps.common.VesselActivity > referential.I18nReferentialEntity | entity
    22 22 
     allowFad + {*:1} boolean

  • persistence/src/main/models/Observe-03-referential-ps-observation.model
    ... ... @@ -36,5 +36,5 @@ referential.ps.observation.SpeciesStatus > referential.I18nReferentialEntity | e
    36 36
    37 37 
     referential.ps.observation.SurroundingActivity > referential.I18nReferentialEntity | entity
    38 38
    39 
    -referential.ps.observation.WeightCategory > referential.I18nReferentialEntity | entity dbName=WeightCategory
    39 
    +referential.ps.observation.WeightCategory > referential.I18nReferentialEntity | entity
    40 40 
     species {*:1} referential.common.Species | lazy=false

  • persistence/src/main/models/Observe-20-data-ps-observation.model
    ... ... @@ -10,7 +10,7 @@ enum !fr.ird.observe.dto.data.ps.TypeTransmittingBuoyOperation
    10 10
    11 11 
     enum !fr.ird.observe.dto.data.ps.DcpComputedValue
    12 12
    13 
    -data.ps.observation.Activity > data.DataEntity >> data.ActivityAware | entity dbName=Activity
    13 
    +data.ps.observation.Activity > data.DataEntity >> data.ActivityAware | entity
    14 14 
     comment + {*:1} String | hibernateAttributeType=text
    15 15 
     time + {*:1} Date | hibernateAttributeType.java.util.Date=time
    16 16 
     latitude + {*:1} Float | sqlType=numeric
    ... ... @@ -19,14 +19,14 @@ vesselSpeed + {*:1} Float | sqlType=numeric
    19 19 
     seaSurfaceTemperature + {*:1} Float | sqlType=numeric
    20 20 
     observedSystemDistance + {*:1} Float | sqlType=numeric
    21 21 
     ersId + {*:1} String
    22 
    -vesselActivity {*:1} referential.ps.common.VesselActivity | dbName=vesselActivity
    22 
    +vesselActivity {*:1} referential.ps.common.VesselActivity
    23 23 
     surroundingActivity {*:0..1} referential.ps.observation.SurroundingActivity
    24 24 
     wind {*:0..1} referential.common.Wind
    25 25 
     detectionMode {*:0..1} referential.ps.observation.DetectionMode
    26 26 
     reasonForNoFishing {*:0..1} referential.ps.observation.ReasonForNoFishing
    27 
    -floatingObject + {*} data.ps.observation.FloatingObject | unique reverseDbName=activity
    28 
    -observedSystem {*:*} referential.ps.observation.ObservedSystem | unique manyToManyTableName=activity_observedSystem reverseDbName=activity
    29 
    -set + {0..1} data.ps.observation.Set | dbName=set
    27 
    +floatingObject + {*} data.ps.observation.FloatingObject | unique
    28 
    +observedSystem {*:*} referential.ps.observation.ObservedSystem | unique manyToManyTableName=activity_observedSystem
    29 
    +set + {0..1} data.ps.observation.Set
    30 30 
     currentFpaZone {*:0..1} referential.common.FpaZone
    31 31 
     previousFpaZone {*:0..1} referential.common.FpaZone
    32 32 
     nextFpaZone {*:0..1} referential.common.FpaZone
    ... ... @@ -137,11 +137,11 @@ activity + {*} data.ps.observation.Activity | unique orderBy=time
    137 137 
     data.ps.observation.SchoolEstimate > data.DataEntity | naturalIdMutable entity
    138 138 
     totalWeight + {*:1} Integer
    139 139 
     meanWeight + {*:1} Integer
    140 
    -set {*:1} data.ps.observation.Set | naturalId dbName=set
    140 
    +set {*:1} data.ps.observation.Set | naturalId
    141 141 
     species {*:1} referential.common.Species | naturalId
    142 142 
     weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    143 143
    144 
    -data.ps.observation.Set > data.DataEntity >> data.SetAware | entity dbName=Set constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime
    144 
    +data.ps.observation.Set > data.DataEntity >> data.SetAware | entity constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime
    145 145 
     comment + {*:1} String | hibernateAttributeType=text
    146 146 
     startTime + {*:1} Date | hibernateAttributeType.java.util.Date=time
    147 147 
     endPursingTimeStamp + {*:1} Date
    ... ... @@ -157,13 +157,13 @@ currentMeasureDepth + {*:1} Integer
    157 157 
     schoolType {*:1} referential.ps.common.SchoolType
    158 158 
     targetCatchCompositionEstimatedByObserver + {*:1} boolean
    159 159 
     targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean
    160 
    -nonTargetCatch + {*} data.ps.observation.NonTargetCatch | ordered reverseDbName=set
    160 
    +nonTargetCatch + {*} data.ps.observation.NonTargetCatch | ordered
    161 161 
     reasonForNullSet {*:0..1} referential.ps.observation.ReasonForNullSet
    162 
    -nonTargetSample + {*} data.ps.observation.NonTargetSample | unique reverseDbName=set
    163 
    -targetSample + {*} data.ps.observation.TargetSample | unique reverseDbName=set
    164 
    -targetCatch + {*} data.ps.observation.TargetCatch | ordered reverseDbName=set
    165 
    -schoolEstimate + {*} data.ps.observation.SchoolEstimate | reverseDbName=set orderBy=topiaCreateDate
    166 
    -nonTargetCatchRelease + {*} data.ps.observation.NonTargetCatchRelease | ordered reverseDbName=set
    162 
    +nonTargetSample + {*} data.ps.observation.NonTargetSample | unique
    163 
    +targetSample + {*} data.ps.observation.TargetSample | unique
    164 
    +targetCatch + {*} data.ps.observation.TargetCatch | ordered
    165 
    +schoolEstimate + {*} data.ps.observation.SchoolEstimate |  orderBy=topiaCreateDate
    166 
    +nonTargetCatchRelease + {*} data.ps.observation.NonTargetCatchRelease | ordered
    167 167 
     hasTargetCatch() boolean
    168 168 
     hasRejetThon() boolean
    169 169 
     canUseTargetSample(discarded boolean) boolean
    ... ... @@ -187,7 +187,7 @@ catchWeight + {*:1} Float | sqlType=numeric
    187 187 
     well + {*:1} String | naturalId notNull=false
    188 188 
     broughtOnDeck + {*:1} Boolean
    189 189 
     discarded + {*:1} boolean | naturalId
    190 
    -set {*:1} data.ps.observation.Set | naturalId dbName=set
    190 
    +set {*:1} data.ps.observation.Set | naturalId
    191 191 
     weightCategory {*:1} referential.ps.observation.WeightCategory | naturalId
    192 192 
     reasonForDiscard {*:0..1} referential.ps.observation.ReasonForDiscard | naturalId notNull=false
    193 193 
     weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod

  • persistence/src/main/models/Observe-25-data-ps-common.model
    1 1 
     package fr.ird.observe.entities.data.ps.common| entity dbSchema=ps_common
    2 2
    3 
    -data.ps.common.GearUseFeaturesMeasurement > data.DataEntity | entity dbName=GearUseFeaturesMeasurement
    3 
    +data.ps.common.GearUseFeaturesMeasurement > data.DataEntity | entity
    4 4 
     measurementValue + {*:1} String
    5 5 
     gearCaracteristic {*:1} referential.common.GearCaracteristic | notNull
    6 6
    7 
    -data.ps.common.GearUseFeatures > data.DataEntity | entity dbName=GearUseFeatures
    7 
    +data.ps.common.GearUseFeatures > data.DataEntity | entity
    8 8 
     comment + {*:1} String | hibernateAttributeType=text
    9 9 
     number + {*:1} Integer
    10 10 
     usedInTrip + {*:1} Boolean
    11 11 
     gear {*:1} referential.common.Gear
    12 
    -gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement | orderBy=topiaCreateDate reverseDbName=gearUseFeatures
    12 
    +gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement | orderBy=topiaCreateDate
    13 13 
     getMeasurementsAsString() String
    14 14
    15 
    -data.ps.common.Trip > data.DataEntity >> data.TripAware | entity dbName=Trip entryPoint
    15 
    +data.ps.common.Trip > data.DataEntity >> data.TripAware | entity entryPoint
    16 16 
     comment + {*:1} String | hibernateAttributeType=text
    17 17 
     startDate + {*:1} Date | hibernateAttributeType.java.util.Date=date
    18 18 
     endDate + {*:1} Date | hibernateAttributeType.java.util.Date=date
    ... ... @@ -22,7 +22,7 @@ reportsUrl + {*:1} String
    22 22 
     historicalData + {*:1} boolean
    23 23 
     ersId + {*:1} String
    24 24 
     ocean {*:0..1} referential.common.Ocean
    25 
    -route + {*} data.ps.observation.Route | unique orderBy=date reverseDbName=trip
    25 
    +route + {*} data.ps.observation.Route | unique orderBy=date
    26 26 
     vessel {*:1} referential.common.Vessel
    27 27 
     program {*:1} referential.common.Program
    28 28 
     observer {*:0..1} referential.common.Person
    ... ... @@ -31,6 +31,6 @@ dataEntryOperator {*:0..1} referential.common.Person
    31 31 
     departureHarbour {*:0..1} referential.common.Harbour
    32 32 
     landingHarbour {*:0..1} referential.common.Harbour
    33 33 
     dataQuality {*:0..1} referential.common.DataQuality
    34 
    -gearUseFeatures + {*} data.ps.common.GearUseFeatures | unique orderBy=topiaCreateDate reverseDbName=trip
    34 
    +gearUseFeatures + {*} data.ps.common.GearUseFeatures | unique orderBy=topiaCreateDate
    35 35 
     getObserverLabel() String
    36 36 
     getRouteCount() int

  • persistence/src/main/models/Observe-30-data-ll-observation.model
    ... ... @@ -20,11 +20,11 @@ timeStamp + {*:1} Date
    20 20 
     latitude + {*:1} Float
    21 21 
     longitude + {*:1} Float
    22 22 
     seaSurfaceTemperature + {*:1} Float
    23 
    -set + {0..1} data.ll.observation.Set | dbName=set
    24 
    -encounter + {*} data.ll.observation.Encounter | reverseDbName=activity orderBy=topiaCreateDate
    23 
    +set + {0..1} data.ll.observation.Set
    24 
    +encounter + {*} data.ll.observation.Encounter | orderBy=topiaCreateDate
    25 25 
     vesselActivity {*:1} referential.ll.common.VesselActivity | lazy=false
    26 26 
     dataQuality {*:0..1} referential.common.DataQuality
    27 
    -sensorUsed + {*} data.ll.observation.SensorUsed | reverseDbName=activity orderBy=topiaCreateDate
    27 
    +sensorUsed + {*} data.ll.observation.SensorUsed | orderBy=topiaCreateDate
    28 28 
     fpaZone {*:1} referential.common.FpaZone
    29 29 
     getDate() Date
    30 30 
     getTime() Date
    ... ... @@ -43,10 +43,10 @@ settingIdentifier + {*:1} Integer | notNull
    43 43 
     haulingIdentifier + {*:1} Integer
    44 44 
     floatline1Length + {*:1} Float
    45 45 
     floatline2Length + {*:1} Float
    46 
    -branchline + {*} data.ll.observation.Branchline | unique orderBy=settingIdentifier reverseDbName=basket
    47 
    -catches {*} data.ll.observation.Catch | reverseDbName=basket
    48 
    -tdr {*} data.ll.observation.Tdr | reverseDbName=basket
    49 
    -set {*:1} data.ll.observation.Set | dbName=set
    46 
    +branchline + {*} data.ll.observation.Branchline | unique orderBy=settingIdentifier
    47 
    +catches {*} data.ll.observation.Catch
    48 
    +tdr {*} data.ll.observation.Tdr
    49 
    +set {*:1} data.ll.observation.Set
    50 50 
     getSection() data.ll.observation.Section
    51 51 
     setSection(section data.ll.observation.Section)
    52 52
    ... ... @@ -68,8 +68,8 @@ tracelineLength + {*:1} Float | sqlType=numeric
    68 68 
     hookLost + {*:1} Boolean
    69 69 
     traceCutOff + {*:1} Boolean
    70 70 
     hookType {*:0..1} referential.ll.common.HookType
    71 
    -tdr {*} data.ll.observation.Tdr | reverseDbName=branchline
    72 
    -catches {*} data.ll.observation.Catch | reverseDbName=branchline
    71 
    +tdr {*} data.ll.observation.Tdr
    72 
    +catches {*} data.ll.observation.Catch
    73 73 
     baitType {*:0..1} referential.ll.common.BaitType
    74 74 
     topType {*:0..1} referential.ll.common.LineType
    75 75 
     tracelineType {*:0..1} referential.ll.common.LineType
    ... ... @@ -106,14 +106,14 @@ basket {*:0..1} data.ll.observation.Basket
    106 106 
     branchline {*:0..1} data.ll.observation.Branchline
    107 107 
     catchFate {*:1} referential.ll.common.CatchFate
    108 108 
     discardHealthStatus {*:1} referential.ll.common.HealthStatus
    109 
    -sizeMeasure + {*} data.ll.observation.SizeMeasure | reverseDbName=catch orderBy=topiaCreateDate
    109 
    +sizeMeasure + {*} data.ll.observation.SizeMeasure | orderBy=topiaCreateDate
    110 110 
     speciesCatch {*:1} referential.common.Species
    111 
    -predator {*:*} referential.common.Species | manyToManyTableName=catch_predator reverseDbName=catch
    111 
    +predator {*:*} referential.common.Species | manyToManyTableName=catch_predator
    112 112 
     section {*:0..1} data.ll.observation.Section
    113 113 
     maturityStatus {*:0..1} referential.ll.observation.MaturityStatus
    114 114 
     stomachFullness {*:0..1} referential.ll.observation.StomachFullness
    115 115 
     hookPosition {*:0..1} referential.ll.observation.HookPosition
    116 
    -weightMeasure + {*} data.ll.observation.WeightMeasure | reverseDbName=catch orderBy=topiaCreateDate
    116 
    +weightMeasure + {*} data.ll.observation.WeightMeasure | orderBy=topiaCreateDate
    117 117 
     catchHealthStatus {*:1} referential.ll.common.HealthStatus
    118 118 
     sex {*:0..1} referential.common.Sex
    119 119 
     weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    ... ... @@ -138,10 +138,10 @@ hookSize {*:1} referential.ll.common.HookSize
    138 138 
     data.ll.observation.Section > data.DataEntity >> data.ll.observation.LonglineCompositionAware | entity
    139 139 
     settingIdentifier + {*:1} Integer | notNull
    140 140 
     haulingIdentifier + {*:1} Integer
    141 
    -set {*:1} data.ll.observation.Set | dbName=set
    142 
    -basket + {*} data.ll.observation.Basket | unique orderBy=settingIdentifier | reverseDbName=section
    143 
    -tdr {*} data.ll.observation.Tdr | reverseDbName=section
    144 
    -catches {*} data.ll.observation.Catch | reverseDbName=section
    141 
    +set {*:1} data.ll.observation.Set
    142 
    +basket + {*} data.ll.observation.Basket | unique orderBy=settingIdentifier
    143 
    +tdr {*} data.ll.observation.Tdr
    144 
    +catches {*} data.ll.observation.Catch
    145 145
    146 146 
     data.ll.observation.SensorUsed > data.DataEntity | entity
    147 147 
     data + {*:1} !java.sql.Blob
    ... ... @@ -185,18 +185,18 @@ haulingEndLatitude + {*:1} Float | sqlType=numeric
    185 185 
     haulingEndLongitude + {*:1} Float | sqlType=numeric
    186 186 
     haulingBreaks + {*:1} Integer
    187 187 
     monitored + {*:1} Boolean
    188 
    -baitsComposition + {*} data.ll.observation.BaitsComposition | reverseDbName=set orderBy=topiaCreateDate
    189 
    -floatlinesComposition + {*} data.ll.observation.FloatlinesComposition | reverseDbName=set orderBy=topiaCreateDate
    190 
    -hooksComposition + {*} data.ll.observation.HooksComposition | reverseDbName=set orderBy=topiaCreateDate
    191 
    -section + {*} data.ll.observation.Section | unique orderBy=settingIdentifier reverseDbName=set
    188 
    +baitsComposition + {*} data.ll.observation.BaitsComposition | orderBy=topiaCreateDate
    189 
    +floatlinesComposition + {*} data.ll.observation.FloatlinesComposition | orderBy=topiaCreateDate
    190 
    +hooksComposition + {*} data.ll.observation.HooksComposition | orderBy=topiaCreateDate
    191 
    +section + {*} data.ll.observation.Section | unique orderBy=settingIdentifier
    192 192 
     settingShape {*:1} referential.ll.common.SettingShape
    193 
    -tdr + {*} data.ll.observation.Tdr | reverseDbName=set orderBy=topiaCreateDate
    194 
    -catches + {*} data.ll.observation.Catch | ordered reverseDbName=set
    193 
    +tdr + {*} data.ll.observation.Tdr | orderBy=topiaCreateDate
    194 
    +catches + {*} data.ll.observation.Catch | ordered
    195 195 
     lineType {*:0..1} referential.ll.common.LineType
    196 196 
     lightsticksType {*:0..1} referential.ll.common.LightsticksType
    197 197 
     lightsticksColor {*:0..1} referential.ll.common.LightsticksColor
    198 
    -mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set reverseDbName=set
    199 
    -branchlinesComposition + {*} data.ll.observation.BranchlinesComposition | reverseDbName=set orderBy=topiaCreateDate
    198 
    +mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set
    199 
    +branchlinesComposition + {*} data.ll.observation.BranchlinesComposition | orderBy=topiaCreateDate
    200 200 
     getSettingStartTime() Date
    201 201 
     getSettingStartDate() Date
    202 202 
     setSettingStartDate(date Date)
    ... ... @@ -256,7 +256,7 @@ meanFishingDepth + {*:1} Float
    256 256 
     medianFishingDepth + {*:1} Float
    257 257 
     branchline {*:0..1} data.ll.observation.Branchline
    258 258 
     sensorBrand {*:0..1} referential.ll.observation.SensorBrand
    259 
    -species {*:*} referential.common.Species | manyToManyTableName=species_tdr reverseDbName=tdr
    259 
    +species {*:*} referential.common.Species | manyToManyTableName=species_tdr
    260 260 
     section {*:0..1} data.ll.observation.Section
    261 261 
     basket {*:0..1} data.ll.observation.Basket
    262 262 
     itemHorizontalPosition {*:0..1} referential.ll.observation.ItemHorizontalPosition

  • persistence/src/main/models/Observe-31-data-ll-logbook.model
    ... ... @@ -14,7 +14,7 @@ currentDirection + {*:1} Integer
    14 14 
     vesselActivity {*:1} referential.ll.common.VesselActivity | lazy=false
    15 15 
     dataQuality {*:0..1} referential.common.DataQuality
    16 16 
     fpaZone {*:1} referential.common.FpaZone
    17 
    -relatedObservedActivity + {0..1} data.ll.observation.Activity | reverseDbName=activity
    17 
    +relatedObservedActivity + {0..1} data.ll.observation.Activity
    18 18 
     set + {0..1} data.ll.logbook.Set
    19 19 
     sample + {0..1} data.ll.logbook.Sample
    20 20 
     getStartDate() Date
    ... ... @@ -58,17 +58,17 @@ monitored + {*:1} Boolean
    58 58 
     totalLineLength + {*:1} Integer
    59 59 
     basketLineLength + {*:1} Integer
    60 60 
     lengthBetweenBranchlines + {*:1} Integer
    61 
    -baitsComposition + {*} data.ll.logbook.BaitsComposition | reverseDbName=set orderBy=topiaCreateDate
    62 
    -floatlinesComposition + {*} data.ll.logbook.FloatlinesComposition | reverseDbName=set orderBy=topiaCreateDate
    63 
    -hooksComposition + {*} data.ll.logbook.HooksComposition | reverseDbName=set orderBy=topiaCreateDate
    61 
    +baitsComposition + {*} data.ll.logbook.BaitsComposition | orderBy=topiaCreateDate
    62 
    +floatlinesComposition + {*} data.ll.logbook.FloatlinesComposition | orderBy=topiaCreateDate
    63 
    +hooksComposition + {*} data.ll.logbook.HooksComposition | orderBy=topiaCreateDate
    64 64 
     settingShape {*:1} referential.ll.common.SettingShape
    65 
    -catches + {*} data.ll.logbook.Catch | ordered reverseDbName=set
    65 
    +catches + {*} data.ll.logbook.Catch | ordered
    66 66 
     lineType {*:0..1} referential.ll.common.LineType
    67 67 
     lightsticksUsed + {*:1} Boolean
    68 68 
     lightsticksType {*:0..1} referential.ll.common.LightsticksType
    69 69 
     lightsticksColor {*:0..1} referential.ll.common.LightsticksColor
    70 
    -mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set reverseDbName=set
    71 
    -branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition | reverseDbName=set orderBy=topiaCreateDate
    70 
    +mitigationType:set {*:*} referential.ll.common.MitigationType | manyToManyTableName=mitigationtype_set
    71 
    +branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition | orderBy=topiaCreateDate
    72 72 
     getSettingStartTime() Date
    73 73 
     getSettingStartDate() Date
    74 74 
     setSettingStartDate(date Date)
    ... ... @@ -118,7 +118,7 @@ tagNumber + {*:1} String
    118 118 
     catchFate {*:1} referential.ll.common.CatchFate
    119 119 
     discardHealthStatus {*:1} referential.ll.common.HealthStatus
    120 120 
     speciesCatch {*:1} referential.common.Species
    121 
    -predator {*:*} referential.common.Species | manyToManyTableName=catch_predator reverseDbName=catch
    121 
    +predator {*:*} referential.common.Species | manyToManyTableName=catch_predator
    122 122 
     catchHealthStatus {*:1} referential.ll.common.HealthStatus
    123 123 
     onBoardProcessing {*:1} referential.ll.common.OnBoardProcessing
    124 124 
     weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
    ... ... @@ -166,6 +166,6 @@ comment + {*:1} String | hibernateAttributeType=text
    166 166 
     timeStamp + {*:1} Date
    167 167 
     latitude + {*:1} Float | sqlType=numeric
    168 168 
     longitude + {*:1} Float | sqlType=numeric
    169 
    -samplePart + {*} data.ll.logbook.SamplePart | ordered dbName=samplePart reverseDbName=sample
    169 
    +samplePart + {*} data.ll.logbook.SamplePart | ordered
    170 170 
     getQuadrant() Integer
    171 171 
     setQuadrant(quadrant Integer)

  • persistence/src/main/models/Observe-32-data-ll-landing.model
    ... ... @@ -9,7 +9,7 @@ compagnies {*:1} referential.ll.landing.Compagnies
    9 9 
     person {*:1} referential.common.Person
    10 10 
     harbour {*:0..1} referential.common.Harbour
    11 11 
     vessel {*:0..1} referential.common.Vessel
    12 
    -landingPart + {*} data.ll.landing.LandingPart | reverseDbName=landing orderBy=topiaCreateDate
    12 
    +landingPart + {*} data.ll.landing.LandingPart | orderBy=topiaCreateDate
    13 13
    14 14 
     data.ll.landing.LandingPart > data.DataEntity | entity
    15 15 
     species {*:1} referential.common.Species

  • persistence/src/main/models/Observe-35-data-ll-common.model
    ... ... @@ -4,7 +4,7 @@ data.ll.common.GearUseFeatures > data.DataEntity | entity
    4 4 
     comment + {*:1} String | hibernateAttributeType=text
    5 5 
     number + {*:1} Integer
    6 6 
     usedInTrip + {*:1} Boolean
    7 
    -gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement | unique orderBy=topiaCreateDate reverseDbName=gearUseFeatures
    7 
    +gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement | unique orderBy=topiaCreateDate
    8 8 
     gear {*:1} referential.common.Gear
    9 9 
     getMeasurementsAsString() String
    10 10
    ... ... @@ -17,8 +17,8 @@ startDate + {*:1} Date
    17 17 
     endDate + {*:1} Date
    18 18 
     noOfCrewMembers + {*:1} Integer
    19 19 
     ersId + {*:1} String
    20 
    -activityObs + {*} data.ll.observation.Activity | unique reverseDbName=trip
    21 
    -activityLogbook + {*} data.ll.logbook.Activity | unique reverseDbName=trip
    20 
    +activityObs + {*} data.ll.observation.Activity | unique
    21 
    +activityLogbook + {*} data.ll.logbook.Activity | unique
    22 22 
     tripType {*:1} referential.ll.common.TripType
    23 23 
     observationMethod {*:1} referential.ll.common.ObservationMethod
    24 24 
     observer {*:1} referential.common.Person
    ... ... @@ -35,12 +35,12 @@ logbookDataQuality {*:0..1} referential.common.DataQuality
    35 35 
     generalComment + {*:1} String | hibernateAttributeType=text
    36 36 
     observationsComment + {*:1} String | hibernateAttributeType=text
    37 37 
     logbookComment + {*:1} String | hibernateAttributeType=text
    38 
    -species {*:*} referential.common.Species | manyToManyTableName=species_trip reverseDbName=trip
    38 
    +species {*:*} referential.common.Species | manyToManyTableName=species_trip
    39 39 
     observationsAvailability + {*:1} boolean
    40 40 
     logbookAvailability + {*:1} boolean
    41 
    -gearUseFeatures + {*} data.ll.common.GearUseFeatures | unique orderBy=topiaCreateDate reverseDbName=trip
    42 
    -landing + {*} data.ll.landing.Landing | unique orderBy=startDate reverseDbName=trip
    43 
    -sample + {*} data.ll.logbook.Sample | unique orderBy=timeStamp reverseDbName=trip
    41 
    +gearUseFeatures + {*} data.ll.common.GearUseFeatures | unique orderBy=topiaCreateDate
    42 
    +landing + {*} data.ll.landing.Landing | unique orderBy=startDate
    43 
    +sample + {*} data.ll.logbook.Sample | unique orderBy=timeStamp
    44 44 
     getActivityObsCount() int
    45 45 
     getActivityLogbookCount() int
    46 46 
     getSampleCount() int

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.