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

Commits:

15 changed files:

Changes:

  • doc/modelisation/zargo/v5/observe-common.zargo
    No preview for this file type
  • doc/modelisation/zargo/v5/observe-longline.zargo
    No preview for this file type
  • doc/modelisation/zargo/v5/observe-seine.zargo
    No preview for this file type
  • doc/modelisation/zargo/v5/observe.ini
    1
    +[model]
    
    2
    +attributeType.Boolean = java.lang.Boolean
    
    3
    +attributeType.Float = java.lang.Float
    
    4
    +attributeType.Integer = java.lang.Integer
    
    5
    +attributeType.Long = java.lang.Long
    
    6
    +attributeType.String = java.lang.String
    
    7
    +generateForeignKeyNames = true
    
    8
    +generateOperatorForDAOHelper = true
    
    9
    +generatePropertyChangeSupport = true
    
    10
    +indexForeignKeys = true
    
    11
    +notGenerateToString = true
    
    12
    +useEnumerationName = false
    
    13
    +version = @observe.model.version@
    
    14
    +
    
    15
    +[package fr.ird.observe.entities]
    
    16
    +dbSchema = OBSERVE_COMMON
    
    17
    +
    
    18
    +[package fr.ird.observe.entities.longline]
    
    19
    +dbSchema = OBSERVE_LONGLINE
    
    20
    +
    
    21
    +[package fr.ird.observe.entities.referentiel]
    
    22
    +dbSchema = OBSERVE_COMMON
    
    23
    +
    
    24
    +[package fr.ird.observe.entities.referentiel.longline]
    
    25
    +dbSchema = OBSERVE_LONGLINE
    
    26
    +
    
    27
    +[package fr.ird.observe.entities.referentiel.seine]
    
    28
    +dbSchema = OBSERVE_SEINE
    
    29
    +
    
    30
    +[package fr.ird.observe.entities.seine]
    
    31
    +dbSchema = OBSERVE_SEINE
    
    32
    +
    
    33
    +[class fr.ird.observe.entities.CommentableEntity]
    
    34
    +comment.hibernateAttributeType = text
    
    35
    +
    
    36
    +[class fr.ird.observe.entities.ObserveEntity]
    
    37
    +lastUpdateDate.notNull = true
    
    38
    +
    
    39
    +[class fr.ird.observe.entities.longline.ActivityLongline]
    
    40
    +dbName = Activity
    
    41
    +encounter.reverseDbName = activity
    
    42
    +sensorUsed.reverseDbName = activity
    
    43
    +setLongline.dbName = set
    
    44
    +vesselActivityLongline.dbName = vesselActivity
    
    45
    +vesselActivityLongline.lazy = false
    
    46
    +
    
    47
    +[class fr.ird.observe.entities.longline.Basket]
    
    48
    +branchline.orderBy = settingIdentifier
    
    49
    +branchline.unique = true
    
    50
    +settingIdentifier.notNull = true
    
    51
    +
    
    52
    +[class fr.ird.observe.entities.longline.Branchline]
    
    53
    +branchlineLength.sqlType = numeric
    
    54
    +catchLongline.dbName = catch
    
    55
    +hookSize.sqlType = numeric
    
    56
    +settingIdentifier.notNull = true
    
    57
    +snapWeight.sqlType = numeric
    
    58
    +swivelWeight.sqlType = numeric
    
    59
    +tracelineLength.sqlType = numeric
    
    60
    +
    
    61
    +[class fr.ird.observe.entities.longline.BranchlinesComposition]
    
    62
    +length.sqlType = numeric
    
    63
    +
    
    64
    +[class fr.ird.observe.entities.longline.CatchLongline]
    
    65
    +dbName = Catch
    
    66
    +beatDiameter.sqlType = numeric
    
    67
    +catchFateLongline.dbName = catchFate
    
    68
    +gonadeWeight.sqlType = numeric
    
    69
    +predator.manyToManyTableName = catch_predator
    
    70
    +predator.reverseDbName = catch
    
    71
    +sizeMeasure.reverseDbName = catch
    
    72
    +totalWeight.sqlType = numeric
    
    73
    +weightMeasure.reverseDbName = catch
    
    74
    +
    
    75
    +[class fr.ird.observe.entities.longline.Encounter]
    
    76
    +distance.sqlType = numeric
    
    77
    +
    
    78
    +[class fr.ird.observe.entities.longline.FloatlinesComposition]
    
    79
    +length.sqlType = numeric
    
    80
    +
    
    81
    +[class fr.ird.observe.entities.longline.GearUseFeaturesLongline]
    
    82
    +dbName = GearUseFeatures
    
    83
    +gearUseFeaturesMeasurement.orderBy = topiaCreateDate
    
    84
    +gearUseFeaturesMeasurement.reverseDbName = gearUseFeatures
    
    85
    +gearUseFeaturesMeasurement.unique = true
    
    86
    +
    
    87
    +[class fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline]
    
    88
    +dbName = GearUseFeaturesMeasurement
    
    89
    +gearCaracteristic.notNull = true
    
    90
    +
    
    91
    +[class fr.ird.observe.entities.longline.HooksComposition]
    
    92
    +hookSize.sqlType = numeric
    
    93
    +
    
    94
    +[class fr.ird.observe.entities.longline.Section]
    
    95
    +basket.orderBy = settingIdentifier
    
    96
    +basket.unique = true
    
    97
    +setLongline.dbName = set
    
    98
    +settingIdentifier.notNull = true
    
    99
    +
    
    100
    +[class fr.ird.observe.entities.longline.SetLongline]
    
    101
    +dbName = Set
    
    102
    +baitsComposition.reverseDbName = set
    
    103
    +branchlinesComposition.reverseDbName = set
    
    104
    +catchLongline.reverseDbName = set
    
    105
    +catchLongline.unique = true
    
    106
    +floatlinesComposition.reverseDbName = set
    
    107
    +haulingEndLatitude.sqlType = numeric
    
    108
    +haulingEndLongitude.sqlType = numeric
    
    109
    +haulingStartLatitude.sqlType = numeric
    
    110
    +haulingStartLongitude.sqlType = numeric
    
    111
    +hooksComposition.reverseDbName = set
    
    112
    +mitigationType.manyToManyTableName = mitigationtype_set
    
    113
    +mitigationType.reverseDbName = set
    
    114
    +section.orderBy = settingIdentifier
    
    115
    +section.reverseDbName = set
    
    116
    +section.unique = true
    
    117
    +settingEndLatitude.sqlType = numeric
    
    118
    +settingEndLongitude.sqlType = numeric
    
    119
    +settingStartLatitude.sqlType = numeric
    
    120
    +settingStartLongitude.sqlType = numeric
    
    121
    +settingVesselSpeed.sqlType = numeric
    
    122
    +shooterSpeed.sqlType = numeric
    
    123
    +snapWeight.sqlType = numeric
    
    124
    +swivelWeight.sqlType = numeric
    
    125
    +tdr.reverseDbName = set
    
    126
    +
    
    127
    +[class fr.ird.observe.entities.longline.SizeMeasure]
    
    128
    +size.sqlType = numeric
    
    129
    +
    
    130
    +[class fr.ird.observe.entities.longline.Tdr]
    
    131
    +floatline1Length.sqlType = numeric
    
    132
    +floatline2Length.sqlType = numeric
    
    133
    +
    
    134
    +[class fr.ird.observe.entities.longline.TdrRecord]
    
    135
    +depth.sqlType = numeric
    
    136
    +temperature.sqlType = numeric
    
    137
    +
    
    138
    +[class fr.ird.observe.entities.longline.TripLongline]
    
    139
    +dbName = Trip
    
    140
    +activityLongline.reverseDbName = trip
    
    141
    +activityLongline.unique = true
    
    142
    +gearUseFeaturesLongline.orderBy = topiaCreateDate
    
    143
    +gearUseFeaturesLongline.reverseDbName = trip
    
    144
    +gearUseFeaturesLongline.unique = true
    
    145
    +
    
    146
    +[class fr.ird.observe.entities.longline.WeightMeasure]
    
    147
    +weight.sqlType = numeric
    
    148
    +
    
    149
    +[class fr.ird.observe.entities.referentiel.Gear]
    
    150
    +gearCaracteristic.lazy = false
    
    151
    +
    
    152
    +[class fr.ird.observe.entities.referentiel.GearCaracteristic]
    
    153
    +gearCaracteristicType.lazy = false
    
    154
    +
    
    155
    +[class fr.ird.observe.entities.referentiel.LengthWeightParameter]
    
    156
    +ocean.lazy = false
    
    157
    +ocean.notNull = true
    
    158
    +sex.lazy = false
    
    159
    +sex.notNull = true
    
    160
    +species.lazy = false
    
    161
    +species.notNull = true
    
    162
    +
    
    163
    +[class fr.ird.observe.entities.referentiel.Organism]
    
    164
    +country.lazy = false
    
    165
    +
    
    166
    +[class fr.ird.observe.entities.referentiel.Program]
    
    167
    +comment.hibernateAttributeType = text
    
    168
    +organism.lazy = false
    
    169
    +
    
    170
    +[class fr.ird.observe.entities.referentiel.Species]
    
    171
    +maxLength.sqlType = numeric
    
    172
    +maxWeight.sqlType = numeric
    
    173
    +minLength.sqlType = numeric
    
    174
    +minWeight.sqlType = numeric
    
    175
    +ocean.lazy = false
    
    176
    +speciesGroup.lazy = false
    
    177
    +
    
    178
    +[class fr.ird.observe.entities.referentiel.SpeciesList]
    
    179
    +species.lazy = false
    
    180
    +
    
    181
    +[class fr.ird.observe.entities.referentiel.Vessel]
    
    182
    +capacity.sqlType = numeric
    
    183
    +comment.hibernateAttributeType = text
    
    184
    +flagCountry.lazy = false
    
    185
    +length.sqlType = numeric
    
    186
    +searchMaximum.sqlType = numeric
    
    187
    +vesselSizeCategory.lazy = false
    
    188
    +vesselType.lazy = false
    
    189
    +
    
    190
    +[class fr.ird.observe.entities.referentiel.longline.CatchFateLongline]
    
    191
    +dbName = CatchFate
    
    192
    +
    
    193
    +[class fr.ird.observe.entities.referentiel.longline.VesselActivityLongline]
    
    194
    +dbName = VesselActivity
    
    195
    +
    
    196
    +[class fr.ird.observe.entities.referentiel.seine.VesselActivitySeine]
    
    197
    +dbName = VesselActivity
    
    198
    +
    
    199
    +[class fr.ird.observe.entities.referentiel.seine.WeightCategory]
    
    200
    +species.lazy = false
    
    201
    +
    
    202
    +[class fr.ird.observe.entities.seine.ActivitySeine]
    
    203
    +dbName = Activity
    
    204
    +floatingObject.reverseDbName = activity
    
    205
    +floatingObject.unique = true
    
    206
    +latitude.sqlType = numeric
    
    207
    +longitude.sqlType = numeric
    
    208
    +observedSystem.manyToManyTableName = activity_observedSystem
    
    209
    +observedSystem.reverseDbName = activity
    
    210
    +observedSystem.unique = true
    
    211
    +observedSystemDistance.sqlType = numeric
    
    212
    +seaSurfaceTemperature.sqlType = numeric
    
    213
    +setSeine.dbName = set
    
    214
    +time.hibernateAttributeType.java.util.Date = time
    
    215
    +vesselActivitySeine.dbName = vesselActivity
    
    216
    +vesselSpeed.sqlType = numeric
    
    217
    +
    
    218
    +[class fr.ird.observe.entities.seine.FloatingObject]
    
    219
    +transmittingBuoy.unique = true
    
    220
    +
    
    221
    +[class fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine]
    
    222
    +dbName = GearUseFeaturesMeasurement
    
    223
    +gearCaracteristic.notNull = true
    
    224
    +
    
    225
    +[class fr.ird.observe.entities.seine.GearUseFeaturesSeine]
    
    226
    +dbName = GearUseFeatures
    
    227
    +gearUseFeaturesMeasurement.orderBy = topiaCreateDate
    
    228
    +gearUseFeaturesMeasurement.reverseDbName = gearUseFeatures
    
    229
    +
    
    230
    +[class fr.ird.observe.entities.seine.NonTargetCatch]
    
    231
    +catchWeight.sqlType = numeric
    
    232
    +meanLength.sqlType = numeric
    
    233
    +meanWeight.sqlType = numeric
    
    234
    +
    
    235
    +[class fr.ird.observe.entities.seine.NonTargetLength]
    
    236
    +length.sqlType = numeric
    
    237
    +sex.lazy = false
    
    238
    +weight.sqlType = numeric
    
    239
    +
    
    240
    +[class fr.ird.observe.entities.seine.NonTargetSample]
    
    241
    +nonTargetLength.unique = true
    
    242
    +
    
    243
    +[class fr.ird.observe.entities.seine.Route]
    
    244
    +activitySeine.orderBy = time
    
    245
    +activitySeine.unique = true
    
    246
    +date.hibernateAttributeType.java.util.Date = date
    
    247
    +endLogValue.sqlType = numeric
    
    248
    +startLogValue.sqlType = numeric
    
    249
    +
    
    250
    +[class fr.ird.observe.entities.seine.SchoolEstimate]
    
    251
    +naturalIdMutable = true
    
    252
    +setSeine.dbName = set
    
    253
    +setSeine.naturalId = true
    
    254
    +species.naturalId = true
    
    255
    +
    
    256
    +[class fr.ird.observe.entities.seine.SetSeine]
    
    257
    +dbName = Set
    
    258
    +currentSpeed.sqlType = numeric
    
    259
    +nonTargetCatch.reverseDbName = set
    
    260
    +nonTargetSample.reverseDbName = set
    
    261
    +nonTargetSample.unique = true
    
    262
    +schoolEstimate.reverseDbName = set
    
    263
    +startTime.hibernateAttributeType.java.util.Date = time
    
    264
    +targetCatch.reverseDbName = set
    
    265
    +targetSample.reverseDbName = set
    
    266
    +targetSample.unique = true
    
    267
    +
    
    268
    +[class fr.ird.observe.entities.seine.TargetCatch]
    
    269
    +naturalIdMutable = true
    
    270
    +catchWeight.sqlType = numeric
    
    271
    +discarded.naturalId = true
    
    272
    +reasonForDiscard.naturalId = true
    
    273
    +reasonForDiscard.notNull = false
    
    274
    +setSeine.dbName = set
    
    275
    +setSeine.naturalId = true
    
    276
    +weightCategory.naturalId = true
    
    277
    +well.naturalId = true
    
    278
    +well.notNull = false
    
    279
    +
    
    280
    +[class fr.ird.observe.entities.seine.TargetLength]
    
    281
    +length.sqlType = numeric
    
    282
    +weight.sqlType = numeric
    
    283
    +
    
    284
    +[class fr.ird.observe.entities.seine.TargetSample]
    
    285
    +targetLength.unique = true
    
    286
    +
    
    287
    +[class fr.ird.observe.entities.seine.TripSeine]
    
    288
    +dbName = Trip
    
    289
    +endDate.hibernateAttributeType.java.util.Date = date
    
    290
    +gearUseFeaturesSeine.orderBy = topiaCreateDate
    
    291
    +gearUseFeaturesSeine.reverseDbName = trip
    
    292
    +route.orderBy = date
    
    293
    +route.reverseDbName = trip
    
    294
    +route.unique = true
    
    295
    +startDate.hibernateAttributeType.java.util.Date = date

  • persistence/src/main/xmi/observe-common.zargodoc/modelisation/zargo/v7/observe-common.zargo
    No preview for this file type
  • persistence/src/main/xmi/observe-longline.zargodoc/modelisation/zargo/v7/observe-longline.zargo
    No preview for this file type
  • persistence/src/main/xmi/observe-seine.zargodoc/modelisation/zargo/v7/observe-seine.zargo
    No preview for this file type
  • persistence/src/main/xmi/observe.inidoc/modelisation/zargo/v7/observe.ini

  • persistence/src/main/models/Observe.friendmodelpersistence/src/main/models/Observe.model
    1
    -model Observe | generatePropertyChangeSupport generateForeignKeyNames notGenerateToString generateOperatorForDAOHelper indexForeignKeys attributeType.Boolean=java.lang.Boolean attributeType.Float=java.lang.Float attributeType.Integer=java.lang.Integer attributeType.Long=java.lang.Long attributeType.String=java.lang.String defaultPackage=fr.ird.observe.entities useEnumerationName=false version=6.901
    
    1
    +model Observe | generatePropertyChangeSupport generateForeignKeyNames notGenerateToString generateOperatorForDAOHelper indexForeignKeys attributeType.Boolean=java.lang.Boolean attributeType.Float=java.lang.Float attributeType.Integer=java.lang.Integer attributeType.Long=java.lang.Long attributeType.String=java.lang.String useEnumerationName=false
    
    2
    +model Observe | defaultPackage=fr.ird.observe.entities version=@observe.model.version@
    
    2 3
     
    
    3 4
     package fr.ird.observe.common | skip
    
    4 5
     package fr.ird.observe.entities | dbSchema=OBSERVE_COMMON
    

  • services/src/main/models/Observe.friendmodelservices/src/main/models/Observe.model
    1
    -model Observe | java8 classNameSuffix=Dto defaultPackage=fr.ird.observe.services.dto superClass=fr.ird.observe.services.dto.AbstractObserveDto version=@observe.model.version@
    
    1
    +model Observe | java8 classNameSuffix=Dto  superClass=fr.ird.observe.services.dto.AbstractObserveDto
    
    2
    +model Observe | defaultPackage=fr.ird.observe.services.dto version=@observe.model.version@
    
    2 3
     
    
    3 4
     package fr.ird.observe.common | skip
    
    4 5
     package fr.ird.observe.services.dto | bean
    

  • services/src/main/xmi/observe-services-dto-common.zargo deleted
    No preview for this file type
  • services/src/main/xmi/observe-services-dto-longline.zargo deleted
    No preview for this file type
  • services/src/main/xmi/observe-services-dto-seine.zargo deleted
    No preview for this file type
  • services/src/main/xmi/observe-services-dto.ini deleted
    1
    -[model]
    
    2
    -java8 = true
    
    3
    -classNameSuffix = Dto
    
    4
    -superClass = fr.ird.observe.services.dto.AbstractObserveDto
    
    5
    -version = @observe.model.version@
    
    6
    -defaultPackage=fr.ird.observe.services.dto
    
    7
    -
    
    8
    -[package fr.ird.observe.common]
    
    9
    -skip= true
    
    10
    -
    
    11
    -[package fr.ird.observe.services.dto]
    
    12
    -bean = true
    
    13
    -
    
    14
    -[class fr.ird.observe.services.dto.TripMap]
    
    15
    -points.ordered = true
    
    16
    -points.unique = true
    
    17
    -
    
    18
    -[class fr.ird.observe.services.dto.longline.ActivityLongline]
    
    19
    -fpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto
    
    20
    -setLongline.attributeGeneric = fr.ird.observe.services.dto.longline.SetLonglineDto
    
    21
    -vesselActivityLongline.attributeGeneric = fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto
    
    22
    -
    
    23
    -[class fr.ird.observe.services.dto.longline.BaitsComposition]
    
    24
    -baitSettingStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto
    
    25
    -baitType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitTypeDto
    
    26
    -
    
    27
    -[class fr.ird.observe.services.dto.longline.Basket]
    
    28
    -branchline.ordered = true
    
    29
    -branchline.unique = true
    
    30
    -
    
    31
    -[class fr.ird.observe.services.dto.longline.Branchline]
    
    32
    -baitHaulingStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto
    
    33
    -baitSettingStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto
    
    34
    -baitType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.BaitTypeDto
    
    35
    -hookSize.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookSizeDto
    
    36
    -hookType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookTypeDto
    
    37
    -topType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto
    
    38
    -tracelineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto
    
    39
    -
    
    40
    -[class fr.ird.observe.services.dto.longline.BranchlinesComposition]
    
    41
    -topType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto
    
    42
    -tracelineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto
    
    43
    -
    
    44
    -[class fr.ird.observe.services.dto.longline.CatchLongline]
    
    45
    -basket.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto
    
    46
    -branchline.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto
    
    47
    -catchFateLongline.attributeGeneric = fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto
    
    48
    -catchHealthness.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HealthnessDto
    
    49
    -discardHealthness.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HealthnessDto
    
    50
    -hookPosition.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookPositionDto
    
    51
    -maturityStatus.attributeGeneric = fr.ird.observe.services.dto.referential.longline.MaturityStatusDto
    
    52
    -predator.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto
    
    53
    -section.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto
    
    54
    -sex.attributeGeneric = fr.ird.observe.services.dto.referential.SexDto
    
    55
    -speciesCatch.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto
    
    56
    -stomacFullness.attributeGeneric = fr.ird.observe.services.dto.referential.longline.StomacFullnessDto
    
    57
    -
    
    58
    -[class fr.ird.observe.services.dto.longline.Encounter]
    
    59
    -encounterType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.EncounterTypeDto
    
    60
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto
    
    61
    -
    
    62
    -[class fr.ird.observe.services.dto.longline.FloatlinesComposition]
    
    63
    -lineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto
    
    64
    -
    
    65
    -[class fr.ird.observe.services.dto.longline.GearUseFeaturesLongline]
    
    66
    -gear.attributeGeneric = fr.ird.observe.services.dto.referential.GearDto
    
    67
    -gearUseFeaturesMeasurement.ordered = true
    
    68
    -gearUseFeaturesMeasurement.unique = true
    
    69
    -
    
    70
    -[class fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLongline]
    
    71
    -gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristicDto
    
    72
    -
    
    73
    -[class fr.ird.observe.services.dto.longline.HooksComposition]
    
    74
    -hookSize.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookSizeDto
    
    75
    -hookType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.HookTypeDto
    
    76
    -
    
    77
    -[class fr.ird.observe.services.dto.longline.Section]
    
    78
    -basket.ordered = true
    
    79
    -basket.unique = true
    
    80
    -
    
    81
    -[class fr.ird.observe.services.dto.longline.SensorUsed]
    
    82
    -sensorBrand.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorBrandDto
    
    83
    -sensorDataFormat.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto
    
    84
    -sensorType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorTypeDto
    
    85
    -
    
    86
    -[class fr.ird.observe.services.dto.longline.SetLongline]
    
    87
    -lightsticksColor.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LightsticksColorDto
    
    88
    -lightsticksType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto
    
    89
    -lineType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.LineTypeDto
    
    90
    -settingShape.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SettingShapeDto
    
    91
    -
    
    92
    -[class fr.ird.observe.services.dto.longline.SetLonglineCatch]
    
    93
    -baskets.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto
    
    94
    -branchlines.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto
    
    95
    -sections.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto
    
    96
    -catchLongline.ordered = true
    
    97
    -
    
    98
    -[class fr.ird.observe.services.dto.longline.SetLonglineDetailComposition]
    
    99
    -section.ordered = true
    
    100
    -section.unique = true
    
    101
    -
    
    102
    -[class fr.ird.observe.services.dto.longline.SetLonglineGlobalComposition]
    
    103
    -mitigationType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.MitigationTypeDto
    
    104
    -
    
    105
    -[class fr.ird.observe.services.dto.longline.SetLonglineStub]
    
    106
    -activityLongline.attributeGeneric = fr.ird.observe.services.dto.longline.ActivityLonglineDto
    
    107
    -activityLongline.unique = true
    
    108
    -
    
    109
    -[class fr.ird.observe.services.dto.longline.SetLonglineTdr]
    
    110
    -baskets.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto
    
    111
    -branchlines.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto
    
    112
    -sections.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto
    
    113
    -
    
    114
    -[class fr.ird.observe.services.dto.longline.SizeMeasure]
    
    115
    -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureTypeDto
    
    116
    -
    
    117
    -[class fr.ird.observe.services.dto.longline.Tdr]
    
    118
    -basket.attributeGeneric = fr.ird.observe.services.dto.longline.BasketDto
    
    119
    -branchline.attributeGeneric = fr.ird.observe.services.dto.longline.BranchlineDto
    
    120
    -itemHorizontalPosition.attributeGeneric = fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto
    
    121
    -itemVerticalPosition.attributeGeneric = fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto
    
    122
    -section.attributeGeneric = fr.ird.observe.services.dto.longline.SectionDto
    
    123
    -sensorBrand.attributeGeneric = fr.ird.observe.services.dto.referential.longline.SensorBrandDto
    
    124
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto
    
    125
    -
    
    126
    -[class fr.ird.observe.services.dto.longline.TripLongline]
    
    127
    -activityLongline.ordered = true
    
    128
    -activityLongline.unique = true
    
    129
    -captain.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto
    
    130
    -dataEntryOperator.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto
    
    131
    -departureHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto
    
    132
    -landingHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto
    
    133
    -observer.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto
    
    134
    -ocean.attributeGeneric = fr.ird.observe.services.dto.referential.OceanDto
    
    135
    -program.attributeGeneric = fr.ird.observe.services.dto.referential.ProgramDto
    
    136
    -tripType.attributeGeneric = fr.ird.observe.services.dto.referential.longline.TripTypeDto
    
    137
    -vessel.attributeGeneric = fr.ird.observe.services.dto.referential.VesselDto
    
    138
    -
    
    139
    -[class fr.ird.observe.services.dto.longline.TripLonglineGearUse]
    
    140
    -gearUseFeaturesLongline.ordered = true
    
    141
    -gearUseFeaturesLongline.unique = true
    
    142
    -
    
    143
    -[class fr.ird.observe.services.dto.longline.WeightMeasure]
    
    144
    -weightMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.WeightMeasureTypeDto
    
    145
    -
    
    146
    -[class fr.ird.observe.services.dto.referential.Gear]
    
    147
    -gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristic
    
    148
    -gearCaracteristic.ordered = true
    
    149
    -
    
    150
    -[class fr.ird.observe.services.dto.referential.GearCaracteristic]
    
    151
    -gearCaracteristicType.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristicType
    
    152
    -
    
    153
    -[class fr.ird.observe.services.dto.referential.Harbour]
    
    154
    -country.attributeGeneric = fr.ird.observe.services.dto.referential.Country
    
    155
    -
    
    156
    -[class fr.ird.observe.services.dto.referential.LengthLengthParameter]
    
    157
    -inpuSizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType
    
    158
    -outputSizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType
    
    159
    -
    
    160
    -[class fr.ird.observe.services.dto.referential.LengthWeightParameter]
    
    161
    -ocean.attributeGeneric = fr.ird.observe.services.dto.referential.Ocean
    
    162
    -sex.attributeGeneric = fr.ird.observe.services.dto.referential.Sex
    
    163
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.Species
    
    164
    -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType
    
    165
    -
    
    166
    -[class fr.ird.observe.services.dto.referential.Organism]
    
    167
    -country.attributeGeneric = fr.ird.observe.services.dto.referential.Country
    
    168
    -
    
    169
    -[class fr.ird.observe.services.dto.referential.Person]
    
    170
    -country.attributeGeneric = fr.ird.observe.services.dto.referential.Country
    
    171
    -
    
    172
    -[class fr.ird.observe.services.dto.referential.Program]
    
    173
    -organism.attributeGeneric = fr.ird.observe.services.dto.referential.Organism
    
    174
    -
    
    175
    -[class fr.ird.observe.services.dto.referential.ShipOwner]
    
    176
    -country.attributeGeneric = fr.ird.observe.services.dto.referential.Country
    
    177
    -
    
    178
    -[class fr.ird.observe.services.dto.referential.Species]
    
    179
    -ocean.attributeGeneric = fr.ird.observe.services.dto.referential.Ocean
    
    180
    -ocean.ordered = true
    
    181
    -speciesGroup.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroup
    
    182
    -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType
    
    183
    -
    
    184
    -[class fr.ird.observe.services.dto.referential.SpeciesGroup]
    
    185
    -speciesGroupReleaseMode.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroupReleaseMode
    
    186
    -speciesGroupReleaseMode.ordered = true
    
    187
    -speciesGroupReleaseStatus.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroupReleaseStatus
    
    188
    -speciesGroupReleaseStatus.ordered = true
    
    189
    -
    
    190
    -[class fr.ird.observe.services.dto.referential.SpeciesList]
    
    191
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.Species
    
    192
    -species.ordered = true
    
    193
    -
    
    194
    -[class fr.ird.observe.services.dto.referential.Vessel]
    
    195
    -flagCountry.attributeGeneric = fr.ird.observe.services.dto.referential.Country
    
    196
    -vesselSizeCategory.attributeGeneric = fr.ird.observe.services.dto.referential.VesselSizeCategory
    
    197
    -vesselType.attributeGeneric = fr.ird.observe.services.dto.referential.VesselType
    
    198
    -shipOwner.attributeGeneric = fr.ird.observe.services.dto.referential.ShipOwner
    
    199
    -
    
    200
    -[class fr.ird.observe.services.dto.referential.seine.WeightCategory]
    
    201
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.Species
    
    202
    -
    
    203
    -[class fr.ird.observe.services.dto.seine.ActivitySeine]
    
    204
    -currentFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto
    
    205
    -detectionMode.attributeGeneric = fr.ird.observe.services.dto.referential.seine.DetectionModeDto
    
    206
    -nextFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto
    
    207
    -observedSystem.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObservedSystemDto
    
    208
    -previousFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto
    
    209
    -reasonForNoFishing.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto
    
    210
    -setSeine.attributeGeneric = fr.ird.observe.services.dto.seine.SetSeineDto
    
    211
    -surroundingActivity.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto
    
    212
    -vesselActivitySeine.attributeGeneric = fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto
    
    213
    -wind.attributeGeneric = fr.ird.observe.services.dto.referential.seine.WindDto
    
    214
    -
    
    215
    -[class fr.ird.observe.services.dto.seine.FloatingObject]
    
    216
    -objectOperation.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectOperationDto
    
    217
    -objectType.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectTypeDto
    
    218
    -
    
    219
    -[class fr.ird.observe.services.dto.referential.seine.ObjectMaterial]
    
    220
    -parent.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto
    
    221
    -
    
    222
    -[class fr.ird.observe.services.dto.seine.FloatingObjectPart]
    
    223
    -objectMaterial.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto
    
    224
    -
    
    225
    -[class fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeine]
    
    226
    -gearCaracteristic.attributeGeneric = fr.ird.observe.services.dto.referential.GearCaracteristicDto
    
    227
    -
    
    228
    -[class fr.ird.observe.services.dto.seine.GearUseFeaturesSeine]
    
    229
    -gear.attributeGeneric = fr.ird.observe.services.dto.referential.GearDto
    
    230
    -gearUseFeaturesMeasurement.unique = true
    
    231
    -
    
    232
    -[class fr.ird.observe.services.dto.seine.NonTargetCatch]
    
    233
    -reasonForDiscard.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto
    
    234
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto
    
    235
    -speciesFate.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesFateDto
    
    236
    -
    
    237
    -[class fr.ird.observe.services.dto.seine.NonTargetCatchRelease]
    
    238
    -reasonForDiscard.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto
    
    239
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto
    
    240
    -sex.attributeGeneric = fr.ird.observe.services.dto.referential.SexDto
    
    241
    -speciesGroupReleaseMode.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroupReleaseModeDto
    
    242
    -nonTargetCatchReleaseStatus.ordered = true
    
    243
    -
    
    244
    -[class fr.ird.observe.services.dto.seine.NonTargetCatchReleaseStatus]
    
    245
    -speciesGroupReleaseStatus.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroupReleaseStatusDto
    
    246
    -
    
    247
    -[class fr.ird.observe.services.dto.seine.NonTargetLength]
    
    248
    -sex.attributeGeneric = fr.ird.observe.services.dto.referential.Sex
    
    249
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.Species
    
    250
    -speciesFate.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesFate
    
    251
    -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType
    
    252
    -
    
    253
    -[class fr.ird.observe.services.dto.seine.NonTargetSample]
    
    254
    -nonTargetLength.unique = true
    
    255
    -speciesFate.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesFateDto
    
    256
    -
    
    257
    -[class fr.ird.observe.services.dto.seine.ObjectObservedSpecies]
    
    258
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto
    
    259
    -speciesStatus.attributeGeneric = fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto
    
    260
    -
    
    261
    -[class fr.ird.observe.services.dto.seine.ObjectSchoolEstimate]
    
    262
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto
    
    263
    -
    
    264
    -[class fr.ird.observe.services.dto.seine.Route]
    
    265
    -activitySeine.ordered = true
    
    266
    -activitySeine.unique = true
    
    267
    -
    
    268
    -[class fr.ird.observe.services.dto.seine.SchoolEstimate]
    
    269
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto
    
    270
    -
    
    271
    -[class fr.ird.observe.services.dto.seine.SetSeine]
    
    272
    -reasonForNullSet.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto
    
    273
    -
    
    274
    -[class fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchRelease]
    
    275
    -nonTargetCatchRelease.ordered = true
    
    276
    -
    
    277
    -[class fr.ird.observe.services.dto.seine.TargetCatch]
    
    278
    -reasonForDiscard.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto
    
    279
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto
    
    280
    -weightCategory.attributeGeneric = fr.ird.observe.services.dto.referential.seine.WeightCategoryDto
    
    281
    -
    
    282
    -[class fr.ird.observe.services.dto.seine.TargetLength]
    
    283
    -sex.attributeGeneric = fr.ird.observe.services.dto.referential.SexDto
    
    284
    -species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto
    
    285
    -sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureTypeDto
    
    286
    -
    
    287
    -[class fr.ird.observe.services.dto.seine.TargetSample]
    
    288
    -targetLength.unique = true
    
    289
    -
    
    290
    -[class fr.ird.observe.services.dto.seine.TransmittingBuoy]
    
    291
    -country.attributeGeneric = fr.ird.observe.services.dto.referential.CountryDto
    
    292
    -transmittingBuoyOperation.attributeGeneric = fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto
    
    293
    -transmittingBuoyType.attributeGeneric = fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto
    
    294
    -
    
    295
    -[class fr.ird.observe.services.dto.seine.TripSeine]
    
    296
    -captain.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto
    
    297
    -dataEntryOperator.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto
    
    298
    -departureHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto
    
    299
    -landingHarbour.attributeGeneric = fr.ird.observe.services.dto.referential.HarbourDto
    
    300
    -observer.attributeGeneric = fr.ird.observe.services.dto.referential.PersonDto
    
    301
    -ocean.attributeGeneric = fr.ird.observe.services.dto.referential.OceanDto
    
    302
    -program.attributeGeneric = fr.ird.observe.services.dto.referential.ProgramDto
    
    303
    -route.ordered = true
    
    304
    -route.unique = true
    
    305
    -vessel.attributeGeneric = fr.ird.observe.services.dto.referential.VesselDto
    
    306
    -
    
    307
    -[class fr.ird.observe.services.dto.seine.TripSeineGearUse]
    
    308
    -gearUseFeaturesSeine.ordered = true
    
    309
    -gearUseFeaturesSeine.unique = true

  • src/site/markdown/model.md
    1
    +# ObServe - model
    
    2
    +
    
    3
    +Vous trouverez sur cette page les liens vers la modélisation de la couche de persistence.
    
    4
    +
    
    5
    +Nous maintenons pour le moment deux versions de ce modèle sur le format *zargo*.
    
    6
    +
    
    7
    +## Version 5
    
    8
    +
    
    9
    +* [model commun](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo/v5/observe-common.zargo)
    
    10
    +* [model senne](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo/v5/observe-seine.zargo)
    
    11
    +* [model palangre](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo/v5/observe-longline.zargo)
    
    12
    +* [model properties](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo/v5/observe.ini)
    
    13
    +
    
    14
    +## Version 7
    
    15
    +
    
    16
    +* [model commun](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo/v7/observe-common.zargo)
    
    17
    +* [model senne](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo/v7/observe-seine.zargo)
    
    18
    +* [model palangre](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo/v7/observe-longline.zargo)
    
    19
    +* [model properties](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo/v7/observe.ini)