Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
ef9da7b2
by Tony Chemit at 2020-08-17T18:41:28+02:00
4 changed files:
- persistence/src/main/models/Observe-20-data-ps-observation.model
- persistence/src/main/models/Observe-30-data-ll-observation.model
- persistence/src/main/models/Observe-31-data-ll-logbook.model
- persistence/src/main/models/Observe-35-data-ll-common.model
Changes:
| ... | ... | @@ -25,7 +25,7 @@ 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 | 27 |
floatingObject + {*} data.ps.observation.FloatingObject | unique
|
| 28 |
-observedSystem {*:*} referential.ps.observation.ObservedSystem | unique manyToManyTableName=activity_observedSystem
|
|
| 28 |
+observedSystem {*:*} referential.ps.observation.ObservedSystem | unique
|
|
| 29 | 29 |
set + {0..1} data.ps.observation.Set
|
| 30 | 30 |
currentFpaZone {*:0..1} referential.common.FpaZone
|
| 31 | 31 |
previousFpaZone {*:0..1} referential.common.FpaZone
|
| ... | ... | @@ -108,7 +108,7 @@ catchFate {*:1} referential.ll.common.CatchFate |
| 108 | 108 |
discardHealthStatus {*:1} referential.ll.common.HealthStatus
|
| 109 | 109 |
sizeMeasure + {*} data.ll.observation.SizeMeasure | orderBy=topiaCreateDate
|
| 110 | 110 |
speciesCatch {*:1} referential.common.Species
|
| 111 |
-predator {*:*} referential.common.Species | manyToManyTableName=catch_predator
|
|
| 111 |
+predator {*:*} referential.common.Species
|
|
| 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
|
| ... | ... | @@ -195,7 +195,7 @@ 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
|
|
| 198 |
+mitigationType:set {*:*} referential.ll.common.MitigationType
|
|
| 199 | 199 |
branchlinesComposition + {*} data.ll.observation.BranchlinesComposition | orderBy=topiaCreateDate
|
| 200 | 200 |
getSettingStartTime() Date
|
| 201 | 201 |
getSettingStartDate() 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
|
|
| 259 |
+species {*:*} referential.common.Species
|
|
| 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
|
| ... | ... | @@ -67,7 +67,7 @@ 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
|
|
| 70 |
+mitigationType:set {*:*} referential.ll.common.MitigationType
|
|
| 71 | 71 |
branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition | orderBy=topiaCreateDate
|
| 72 | 72 |
getSettingStartTime() Date
|
| 73 | 73 |
getSettingStartDate() 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
|
|
| 121 |
+predator {*:*} referential.common.Species
|
|
| 122 | 122 |
catchHealthStatus {*:1} referential.ll.common.HealthStatus
|
| 123 | 123 |
onBoardProcessing {*:1} referential.ll.common.OnBoardProcessing
|
| 124 | 124 |
weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod
|
| ... | ... | @@ -35,7 +35,7 @@ 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
|
|
| 38 |
+species {*:*} referential.common.Species
|
|
| 39 | 39 |
observationsAvailability + {*:1} boolean
|
| 40 | 40 |
logbookAvailability + {*:1} boolean
|
| 41 | 41 |
gearUseFeatures + {*} data.ll.common.GearUseFeatures | unique orderBy=topiaCreateDate
|