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

Commits:

3 changed files:

Changes:

  • dto/src/main/models/Observe.model
    ... ... @@ -12,16 +12,6 @@ package fr.ird.observe.dto.form
    12 12
    13 13 
     enum constants.ObserveDbRole
    14 14
    15 
    -enum data.seine.SetSeineConstants
    16 
    -targetSampleCapture
    17 
    -endSetDate
    18 
    -endPursingDate
    19 
    -endSetTime
    20 
    -endPursingTime
    21 
    -
    22 
    -enum data.seine.TargetLengthConstants
    23 
    -totalWeight
    24 
    -
    25 15 
     interface ObserveDto
    26 16
    27 17 
     interface WithComment
    ... ... @@ -791,7 +781,7 @@ meanWeight + {*:1} Integer
    791 781 
     species {*:1} fr.ird.observe.dto.referential.SpeciesReference
    792 782 
     weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.WeightMeasureMethodReference
    793 783
    794 
    -data.seine.SetSeine > data.Commentable | references=comment
    784 
    +data.seine.SetSeine > data.Commentable | references=comment constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime
    795 785 
     startTime + {*:1} Date
    796 786 
     endPursingTimeStamp + {*:1} Date
    797 787 
     endSetTimeStamp + {*:1} Date
    ... ... @@ -837,7 +827,7 @@ reasonForDiscard {*:0..1} fr.ird.observe.dto.referential.seine.ReasonForDiscardR
    837 827 
     species {*:1} fr.ird.observe.dto.referential.SpeciesReference
    838 828 
     weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.WeightMeasureMethodReference
    839 829
    840 
    -data.seine.TargetLength > data.Data | references=speciesLabel,length,count
    830 
    +data.seine.TargetLength > data.Data | references=speciesLabel,length,count constants=totalWeight
    841 831 
     length + {*:1} Float
    842 832 
     isLengthComputed + {*:1} boolean
    843 833 
     count + {*:1} Integer

  • persistence/src/main/models/Observe.model
    ... ... @@ -25,62 +25,6 @@ enum !fr.ird.observe.dto.data.seine.TypeTransmittingBuoyOperation
    25 25
    26 26 
     enum !fr.ird.observe.dto.data.seine.DcpComputedValue
    27 27
    28 
    -enum longline.ActivityLonglineObsConstants
    29 
    -date
    30 
    -time
    31 
    -
    32 
    -enum longline.BranchlineObsConstants
    33 
    -timerTimeOnBoardDate
    34 
    -timerTimeOnBoardTime
    35 
    -
    36 
    -enum longline.SetLonglineObsConstants
    37 
    -settingStartDate
    38 
    -settingStartTime
    39 
    -settingStartQuadrant
    40 
    -settingEndDate
    41 
    -settingEndTime
    42 
    -settingEndQuadrant
    43 
    -haulingStartDate
    44 
    -haulingStartTime
    45 
    -haulingStartQuadrant
    46 
    -haulingEndDate
    47 
    -haulingEndTime
    48 
    -haulingEndQuadrant
    49 
    -floatlinesCompositionProportionSum
    50 
    -branchlinesCompositionProportionSum
    51 
    -hooksCompositionProportionSum
    52 
    -baitsCompositionProportionSum
    53 
    -
    54 
    -enum longline.TdrObsConstants
    55 
    -deployementStartDate
    56 
    -deployementStartTime
    57 
    -deployementEndDate
    58 
    -deployementEndTime
    59 
    -fishingStartDate
    60 
    -fishingStartTime
    61 
    -fishingEndDate
    62 
    -fishingEndTime
    63 
    -
    64 
    -enum referentiel.FormulaSupportConstants
    65 
    -formulaOneValid
    66 
    -formulaTwoValid
    67 
    -
    68 
    -enum referentiel.HarbourConstants
    69 
    -quadrant
    70 
    -
    71 
    -enum referentiel.ProgramConstants
    72 
    -gearTypePrefix
    73 
    -
    74 
    -enum seine.SetConstants
    75 
    -targetSampleCapture
    76 
    -endSetDate
    77 
    -endPursingDate
    78 
    -endSetTime
    79 
    -endPursingTime
    80 
    -
    81 
    -enum seine.TargetLengthConstants
    82 
    -totalWeight
    83 
    -
    84 28 
     interface Activity
    85 29
    86 30 
     interface LengthWeightComputable
    ... ... @@ -119,7 +63,7 @@ abstract ObserveDataEntity > ObserveEntity | entity
    119 63 
     abstract ObserveEntity >> fr.ird.observe.dto.reference.DtoReferenceAware | entity
    120 64 
     lastUpdateDate + {*:1} Date | notNull
    121 65
    122 
    -longline.ActivityLonglineObs > ObserveDataEntity >> Activity | entity dbName=ActivityObs
    66 
    +longline.ActivityLonglineObs > ObserveDataEntity >> Activity | entity dbName=ActivityObs constants=date,time
    123 67 
     comment + {*:1} String | hibernateAttributeType=text
    124 68 
     timeStamp + {*:1} Date
    125 69 
     latitude + {*:1} Float
    ... ... @@ -154,7 +98,7 @@ catchLongline {*} longline.CatchLonglineObs | reverseDbName=basket
    154 98 
     tdr {*} longline.TdrObs | reverseDbName=basket
    155 99 
     setLongline {*:1} longline.SetLonglineObs | dbName=set
    156 100
    157 
    -longline.BranchlineObs > ObserveDataEntity >> longline.LonglineCompositionEntity | entity
    101 
    +longline.BranchlineObs > ObserveDataEntity >> longline.LonglineCompositionEntity | entity constants=timerTimeOnBoardDate,timerTimeOnBoardTime
    158 102 
     comment + {*:1} String | hibernateAttributeType=text
    159 103 
     settingIdentifier + {*:1} Integer | notNull
    160 104 
     haulingIdentifier + {*:1} Integer
    ... ... @@ -267,7 +211,7 @@ sensorType {*:1} referentiel.longline.SensorType
    267 211 
     sensorDataFormat {*:0..1} referentiel.longline.SensorDataFormat
    268 212 
     sensorBrand {*:1} referentiel.longline.SensorBrand
    269 213
    270 
    -longline.SetLonglineObs > ObserveDataEntity >> ObserveSet | entity dbName=SetObs
    214 
    +longline.SetLonglineObs > ObserveDataEntity >> ObserveSet | entity dbName=SetObs constants=settingStartDate,settingStartTime,settingStartQuadrant,settingEndDate,settingEndTime,settingEndQuadrant,haulingStartDate,haulingStartTime,haulingStartQuadrant,haulingEndDate,haulingEndTime,haulingEndQuadrant,floatlinesCompositionProportionSum,branchlinesCompositionProportionSum,hooksCompositionProportionSum,baitsCompositionProportionSum
    271 215 
     comment + {*:1} String | hibernateAttributeType=text
    272 216 
     homeId + {*:1} String
    273 217 
     number + {*:1} Integer
    ... ... @@ -351,7 +295,7 @@ size + {*:1} Float | sqlType=numeric
    351 295 
     sizeMeasureType {*:1} referentiel.SizeMeasureType
    352 296 
     lengthMeasureMethod {*:0..1} referentiel.LengthMeasureMethod
    353 297
    354 
    -longline.TdrObs > ObserveDataEntity >> longline.LonglinePositionAware | entity
    298 
    +longline.TdrObs > ObserveDataEntity >> longline.LonglinePositionAware | entity constants=deployementStartDate,deployementStartTime,deployementEndDate,deployementEndTime,fishingStartDate,fishingStartTime,fishingEndDate,fishingEndTime
    355 299 
     homeId + {*:1} String
    356 300 
     floatline1Length + {*:1} Float | sqlType=numeric
    357 301 
     floatline2Length + {*:1} Float | sqlType=numeric
    ... ... @@ -447,7 +391,7 @@ iso3Code + {*:1} String
    447 391
    448 392 
     referentiel.DataQuality > referentiel.I18nReferentialEntity | entity
    449 393
    450 
    -abstract referentiel.FormulaSupport > referentiel.ObserveReferentialEntity | entity
    394 
    +abstract referentiel.FormulaSupport > referentiel.ObserveReferentialEntity | entity constants=formulaOneValid,formulaTwoValid
    451 395 
     coefficients + {*:1} String
    452 396 
     source + {*:1} String | hibernateAttributeType=text
    453 397 
     getCoefficientNames() Set<String>
    ... ... @@ -477,7 +421,7 @@ gearCaracteristicType {*:1} referentiel.GearCaracteristicType | lazy=false
    477 421
    478 422 
     referentiel.GearCaracteristicType > referentiel.I18nReferentialEntity | entity
    479 423
    480 
    -referentiel.Harbour > referentiel.ObserveReferentialEntity | entity
    424 
    +referentiel.Harbour > referentiel.ObserveReferentialEntity | entity constants=quadrant
    481 425 
     country {*:1} referentiel.Country
    482 426 
     locode + {*:1} String
    483 427 
     name + {*:1} String
    ... ... @@ -544,7 +488,7 @@ dataEntryOperator + {*:1} boolean
    544 488 
     dataSource + {*:1} boolean
    545 489 
     country {*:0..1} referentiel.Country
    546 490
    547 
    -referentiel.Program > referentiel.I18nReferentialEntity | entity
    491 
    +referentiel.Program > referentiel.I18nReferentialEntity | entity constants=gearTypePrefix
    548 492 
     organism {*:1} referentiel.Organism | lazy=false
    549 493 
     nonTargetObservation + {*:1} int
    550 494 
     targetDiscardsObservation + {*:1} int
    ... ... @@ -891,7 +835,7 @@ setSeine {*:1} seine.SetSeine | naturalId dbName=set
    891 835 
     species {*:1} referentiel.Species | naturalId
    892 836 
     weightMeasureMethod {*:0..1} referentiel.WeightMeasureMethod
    893 837
    894 
    -seine.SetSeine > ObserveDataEntity >> ObserveSet | entity dbName=Set
    838 
    +seine.SetSeine > ObserveDataEntity >> ObserveSet | entity dbName=Set constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime
    895 839 
     comment + {*:1} String | hibernateAttributeType=text
    896 840 
     startTime + {*:1} Date | hibernateAttributeType.java.util.Date=time
    897 841 
     endPursingTimeStamp + {*:1} Date
    ... ... @@ -946,7 +890,7 @@ weightMeasureMethod {*:0..1} referentiel.WeightMeasureMethod
    946 890 
     getSpecies() referentiel.Species
    947 891 
     setSpecies(species referentiel.Species)
    948 892
    949 
    -seine.TargetLength > ObserveDataEntity >> LengthWeightComputable | entity
    893 
    +seine.TargetLength > ObserveDataEntity >> LengthWeightComputable | entity constants=totalWeight
    950 894 
     length + {*:1} Float | sqlType=numeric
    951 895 
     isLengthComputed + {*:1} boolean
    952 896 
     count + {*:1} Integer

  • pom.xml
    ... ... @@ -138,6 +138,8 @@
    138 138
    139 139 
       <properties>
    140 140
    141 
    +    <lib.version.java4all.eugene>3.0-alpha-22-SNAPSHOT</lib.version.java4all.eugene>
    142 
    +
    141 143 
         <organizationId>ultreiaio</organizationId>
    142 144 
         <projectId>ird-observe</projectId>
    143 145 
         <stageId>frirdobserve</stageId>
    ... ... @@ -163,7 +165,6 @@
    163 165 
         <!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->
    164 166 
         <!--can't use 1.4.197 (date has changed + blob also-->
    165 167 
         <lib.version.h2>1.4.196</lib.version.h2>
    166 
    -    <lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>
    167 168
    168 169 
         <!-- license header configuration -->
    169 170 
         <license.licenseName>gpl_v3</license.licenseName>

    • —
    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.