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

Commits:

9 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss
    ... ... @@ -41,6 +41,7 @@ DateTimeEditor {
    41 41 
     CoordinatesEditor {
    42 42 
       bean: {bean};
    43 43 
       displayZeroWhenNull: true;
    44 
    +  showGlobalResetButton:true;
    44 45 
     }
    45 46
    46 47 
     NumberEditor {

  • dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
    ... ... @@ -626,7 +626,7 @@ public class DecoratorService extends DecoratorProvider {
    626 626 
             @Override
    627 627 
             public void initSpeciesDto() {
    628 628 
                 registerDecorator(new SpeciesDecorator());
    629 
    -            registerReferentialReferenceDecorator(SpeciesReference.class, "${faoCode}$s##${scientificLabel}$s");
    629 
    +            registerReferentialReferenceDecorator(SpeciesReference.class, "${faoCode}$s##${scientificLabel}$s##${label}$s");
    630 630 
             }
    631 631
    632 632 
             @Override

  • persistence/src/main/models/Observe.model
    ... ... @@ -72,10 +72,10 @@ latitude + {*:1} Float
    72 72 
     longitude + {*:1} Float
    73 73 
     seaSurfaceTemperature + {*:1} Float
    74 74 
     setLongline + {0..1} longline.SetLongline | dbName=set
    75 
    -encounter + {*} longline.Encounter | reverseDbName=activity
    75 
    +encounter + {*} longline.Encounter | reverseDbName=activity orderBy=topiaCreateDate
    76 76 
     vesselActivityLongline {*:1} referentiel.longline.VesselActivityLongline | dbName=vesselActivity lazy=false
    77 77 
     dataQuality {*:0..1} referentiel.DataQuality
    78 
    -sensorUsed + {*} longline.SensorUsed | reverseDbName=activity
    78 
    +sensorUsed + {*} longline.SensorUsed | reverseDbName=activity orderBy=topiaCreateDate
    79 79 
     fpaZone {*:1} referentiel.FpaZone
    80 80 
     getDate() Date
    81 81 
     getTime() Date
    ... ... @@ -153,14 +153,14 @@ basket {*:0..1} longline.Basket
    153 153 
     branchline {*:0..1} longline.Branchline
    154 154 
     catchFateLongline {*:1} referentiel.longline.CatchFateLongline | dbName=catchFate
    155 155 
     discardHealthness {*:1} referentiel.longline.Healthness
    156 
    -sizeMeasure + {*} longline.SizeMeasure | reverseDbName=catch
    156 
    +sizeMeasure + {*} longline.SizeMeasure | reverseDbName=catch orderBy=topiaCreateDate
    157 157 
     speciesCatch {*:1} referentiel.Species
    158 158 
     predator {*:*} referentiel.Species | manyToManyTableName=catch_predator reverseDbName=catch
    159 159 
     section {*:0..1} longline.Section
    160 160 
     maturityStatus {*:0..1} referentiel.longline.MaturityStatus
    161 161 
     stomacFullness {*:0..1} referentiel.longline.StomacFullness
    162 162 
     hookPosition {*:0..1} referentiel.longline.HookPosition
    163 
    -weightMeasure + {*} longline.WeightMeasure | reverseDbName=catch
    163 
    +weightMeasure + {*} longline.WeightMeasure | reverseDbName=catch orderBy=topiaCreateDate
    164 164 
     catchHealthness {*:1} referentiel.longline.Healthness
    165 165 
     sex {*:0..1} referentiel.Sex
    166 166
    ... ... @@ -242,18 +242,18 @@ haulingEndLatitude + {*:1} Float | sqlType=numeric
    242 242 
     haulingEndLongitude + {*:1} Float | sqlType=numeric
    243 243 
     haulingBreaks + {*:1} Integer
    244 244 
     monitored + {*:1} Boolean
    245 
    -baitsComposition + {*} longline.BaitsComposition | reverseDbName=set
    246 
    -floatlinesComposition + {*} longline.FloatlinesComposition | reverseDbName=set
    247 
    -hooksComposition + {*} longline.HooksComposition | reverseDbName=set
    245 
    +baitsComposition + {*} longline.BaitsComposition | reverseDbName=set orderBy=topiaCreateDate
    246 
    +floatlinesComposition + {*} longline.FloatlinesComposition | reverseDbName=set orderBy=topiaCreateDate
    247 
    +hooksComposition + {*} longline.HooksComposition | reverseDbName=set orderBy=topiaCreateDate
    248 248 
     section + {*} longline.Section | unique orderBy=settingIdentifier reverseDbName=set
    249 249 
     settingShape {*:1} referentiel.longline.SettingShape
    250 
    -tdr + {*} longline.Tdr | reverseDbName=set
    250 
    +tdr + {*} longline.Tdr | reverseDbName=set orderBy=topiaCreateDate
    251 251 
     catchLongline + {*} longline.CatchLongline | ordered reverseDbName=set
    252 252 
     lineType {*:0..1} referentiel.longline.LineType
    253 253 
     lightsticksType {*:0..1} referentiel.longline.LightsticksType
    254 254 
     lightsticksColor {*:0..1} referentiel.longline.LightsticksColor
    255 255 
     mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_set reverseDbName=set
    256 
    -branchlinesComposition + {*} longline.BranchlinesComposition | reverseDbName=set
    256 
    +branchlinesComposition + {*} longline.BranchlinesComposition | reverseDbName=set orderBy=topiaCreateDate
    257 257 
     getSettingStartTime() Date
    258 258 
     getSettingStartDate() Date
    259 259 
     setSettingStartDate(date Date)
    ... ... @@ -312,7 +312,7 @@ maxFishingDepth + {*:1} Float
    312 312 
     meanFishingDepth + {*:1} Float
    313 313 
     medianFishingDepth + {*:1} Float
    314 314 
     branchline {*:0..1} longline.Branchline
    315 
    -tdrRecord + {*} longline.TdrRecord
    315 
    +tdrRecord + {*} longline.TdrRecord | orderBy=topiaCreateDate
    316 316 
     sensorBrand {*:0..1} referentiel.longline.SensorBrand
    317 317 
     species {*:*} referentiel.Species
    318 318 
     section {*:0..1} longline.Section
    ... ... @@ -671,8 +671,8 @@ isActivityFinDePeche() boolean
    671 671 
     isChangedZoneOperation() boolean
    672 672
    673 673 
     seine.FloatingObject > CommentableEntity | entity
    674 
    -objectSchoolEstimate + {*} seine.ObjectSchoolEstimate
    675 
    -objectObservedSpecies + {*} seine.ObjectObservedSpecies
    674 
    +objectSchoolEstimate + {*} seine.ObjectSchoolEstimate | orderBy=topiaCreateDate
    675 
    +objectObservedSpecies + {*} seine.ObjectObservedSpecies | orderBy=topiaCreateDate
    676 676 
     objectOperation {*:1} referentiel.seine.ObjectOperation
    677 677 
     supportVesselName + {*:1} String
    678 678 
     transmittingBuoy + {*} seine.TransmittingBuoy | unique
    ... ... @@ -793,7 +793,7 @@ reasonForNullSet {*:0..1} referentiel.seine.ReasonForNullSet
    793 793 
     nonTargetSample + {*} seine.NonTargetSample | unique reverseDbName=set
    794 794 
     targetSample + {*} seine.TargetSample | unique reverseDbName=set
    795 795 
     targetCatch + {*} seine.TargetCatch | ordered reverseDbName=set
    796 
    -schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set
    796 
    +schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set orderBy=topiaCreateDate
    797 797 
     nonTargetCatchRelease + {*} seine.NonTargetCatchRelease | ordered reverseDbName=set
    798 798 
     hasTargetCatch() boolean
    799 799 
     hasRejetThon() boolean

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-create-error-validation.xml
    ... ... @@ -98,7 +98,7 @@
    98 98 
         <field-validator type="quadrantDto" short-circuit="true">
    99 99 
           <param name="ocean">currentTripLongline.ocean</param>
    100 100 
           <message>
    101 
    -        observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    101 
    +        observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label}
    102 102 
           </message>
    103 103 
         </field-validator>
    104 104
    ... ... @@ -112,16 +112,6 @@
    112 112 
         </field-validator>
    113 113
    114 114 
         <!-- 0 <= latitude <= 90 -->
    115 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    116 
    -      <param name="doubleParams">min:-90.0|max:90.0</param>
    117 
    -      <param name="expression">
    118 
    -        <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
    119 
    -      </param>
    120 
    -      <message>
    121 
    -        observe.validation.activity.bound.latitude##0.0##${doubles.max}
    122 
    -      </message>
    123 
    -    </field-validator>
    124 
    -
    125 115 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    126 116 
           <param name="editorName">coordinate</param>
    127 117 
           <message/>
    ... ... @@ -137,16 +127,6 @@
    137 127 
         </field-validator>
    138 128
    139 129 
         <!-- 0 <= longitude <= 180 -->
    140 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    141 
    -      <param name="doubleParams">min:-180.0|max:180.0</param>
    142 
    -      <param name="expression">
    143 
    -        <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
    144 
    -      </param>
    145 
    -      <message>
    146 
    -        observe.validation.activity.bound.longitude##0.0##${doubles.max}
    147 
    -      </message>
    148 
    -    </field-validator>
    149 
    -
    150 130 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    151 131 
           <param name="editorName">coordinate</param>
    152 132 
           <message/>

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-update-error-validation.xml
    ... ... @@ -84,7 +84,7 @@
    84 84 
         <field-validator type="quadrantDto" short-circuit="true">
    85 85 
           <param name="ocean">currentTripLongline.ocean</param>
    86 86 
           <message>
    87 
    -        observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    87 
    +        observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label}
    88 88 
           </message>
    89 89 
         </field-validator>
    90 90
    ... ... @@ -98,17 +98,6 @@
    98 98 
         </field-validator>
    99 99
    100 100 
         <!-- 0 <= latitude <= 90 -->
    101 
    -
    102 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    103 
    -      <param name="doubleParams">min:-90.0|max:90.0</param>
    104 
    -      <param name="expression">
    105 
    -        <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
    106 
    -      </param>
    107 
    -      <message>
    108 
    -        observe.validation.activity.bound.latitude##0.0##${doubles.max}
    109 
    -      </message>
    110 
    -    </field-validator>
    111 
    -
    112 101 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    113 102 
           <param name="editorName">coordinate</param>
    114 103 
           <message/>
    ... ... @@ -124,16 +113,6 @@
    124 113 
         </field-validator>
    125 114
    126 115 
         <!-- 0 <= longitude <= 180 -->
    127 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    128 
    -      <param name="doubleParams">min:-180.0|max:180.0</param>
    129 
    -      <param name="expression">
    130 
    -        <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
    131 
    -      </param>
    132 
    -      <message>
    133 
    -        observe.validation.activity.bound.longitude##0.0##${doubles.max}
    134 
    -      </message>
    135 
    -    </field-validator>
    136 
    -
    137 116 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    138 117 
           <param name="editorName">coordinate</param>
    139 118 
           <message/>

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-create-error-validation.xml
    ... ... @@ -211,7 +211,7 @@
    211 211 
         <field-validator type="quadrantDto" short-circuit="true">
    212 212 
           <param name="ocean">currentTripLongline.ocean</param>
    213 213 
           <message>
    214 
    -        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    214 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    215 215 
           </message>
    216 216 
         </field-validator>
    217 217
    ... ... @@ -225,16 +225,6 @@
    225 225 
         </field-validator>
    226 226
    227 227 
         <!-- 0 <= settingStartLatitude <= 90 -->
    228 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    229 
    -      <param name="doubleParams">min:-90.0|max:90.0</param>
    230 
    -      <param name="expression">
    231 
    -        <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]>
    232 
    -      </param>
    233 
    -      <message>
    234 
    -        observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max}
    235 
    -      </message>
    236 
    -    </field-validator>
    237 
    -
    238 228 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    239 229 
           <param name="editorName">settingStart</param>
    240 230 
           <message/>
    ... ... @@ -250,16 +240,6 @@
    250 240 
         </field-validator>
    251 241
    252 242 
         <!-- 0 <= settingStartLongitude <= 180 -->
    253 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    254 
    -      <param name="doubleParams">min:-180.0|max:180.0</param>
    255 
    -      <param name="expression">
    256 
    -        <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]>
    257 
    -      </param>
    258 
    -      <message>
    259 
    -        observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max}
    260 
    -      </message>
    261 
    -    </field-validator>
    262 
    -
    263 243 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    264 244 
           <param name="editorName">settingStart</param>
    265 245 
           <message/>
    ... ... @@ -277,7 +257,7 @@
    277 257 
         <field-validator type="quadrantDto" short-circuit="true">
    278 258 
           <param name="ocean">currentTripLongline.ocean</param>
    279 259 
           <message>
    280 
    -        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    260 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    281 261 
           </message>
    282 262 
         </field-validator>
    283 263
    ... ... @@ -291,16 +271,6 @@
    291 271 
         </field-validator>
    292 272
    293 273 
         <!-- 0 <= settingEndLatitude <= 90 -->
    294 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    295 
    -      <param name="doubleParams">min:-90.0|max:90.0</param>
    296 
    -      <param name="expression">
    297 
    -        <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]>
    298 
    -      </param>
    299 
    -      <message>
    300 
    -        observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max}
    301 
    -      </message>
    302 
    -    </field-validator>
    303 
    -
    304 274 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    305 275 
           <param name="editorName">settingEnd</param>
    306 276 
           <message/>
    ... ... @@ -316,16 +286,6 @@
    316 286 
         </field-validator>
    317 287
    318 288 
         <!-- 0 <= settingEndLongitude <= 180 -->
    319 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    320 
    -      <param name="doubleParams">min:-180.0|max:180.0</param>
    321 
    -      <param name="expression">
    322 
    -        <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]>
    323 
    -      </param>
    324 
    -      <message>
    325 
    -        observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max}
    326 
    -      </message>
    327 
    -    </field-validator>
    328 
    -
    329 289 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    330 290 
           <param name="editorName">settingEnd</param>
    331 291 
           <message/>
    ... ... @@ -343,7 +303,7 @@
    343 303 
         <field-validator type="quadrantDto" short-circuit="true">
    344 304 
           <param name="ocean">currentTripLongline.ocean</param>
    345 305 
           <message>
    346 
    -        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    306 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    347 307 
           </message>
    348 308 
         </field-validator>
    349 309
    ... ... @@ -357,16 +317,6 @@
    357 317 
         </field-validator>
    358 318
    359 319 
         <!-- 0 <= haulingStartLatitude <= 90 -->
    360 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    361 
    -      <param name="doubleParams">min:-90.0|max:90.0</param>
    362 
    -      <param name="expression">
    363 
    -        <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]>
    364 
    -      </param>
    365 
    -      <message>
    366 
    -        observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max}
    367 
    -      </message>
    368 
    -    </field-validator>
    369 
    -
    370 320 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    371 321 
           <param name="editorName">haulingStart</param>
    372 322 
           <message/>
    ... ... @@ -382,16 +332,6 @@
    382 332 
         </field-validator>
    383 333
    384 334 
         <!-- 0 <= haulingStartLongitude <= 180 -->
    385 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    386 
    -      <param name="doubleParams">min:-180.0|max:180.0</param>
    387 
    -      <param name="expression">
    388 
    -        <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]>
    389 
    -      </param>
    390 
    -      <message>
    391 
    -        observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max}
    392 
    -      </message>
    393 
    -    </field-validator>
    394 
    -
    395 335 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    396 336 
           <param name="editorName">haulingStart</param>
    397 337 
           <message/>
    ... ... @@ -409,7 +349,7 @@
    409 349 
         <field-validator type="quadrantDto" short-circuit="true">
    410 350 
           <param name="ocean">currentTripLongline.ocean</param>
    411 351 
           <message>
    412 
    -        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    352 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    413 353 
           </message>
    414 354 
         </field-validator>
    415 355
    ... ... @@ -423,16 +363,6 @@
    423 363 
         </field-validator>
    424 364
    425 365 
         <!-- 0 <= haulingEndLatitude <= 90 -->
    426 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    427 
    -      <param name="doubleParams">min:-90.0|max:90.0</param>
    428 
    -      <param name="expression">
    429 
    -        <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]>
    430 
    -      </param>
    431 
    -      <message>
    432 
    -        observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max}
    433 
    -      </message>
    434 
    -    </field-validator>
    435 
    -
    436 366 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    437 367 
           <param name="editorName">haulingEnd</param>
    438 368 
           <message/>
    ... ... @@ -448,16 +378,6 @@
    448 378 
         </field-validator>
    449 379
    450 380 
         <!-- 0 <= haulingEndLongitude <= 180 -->
    451 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    452 
    -      <param name="doubleParams">min:-180.0|max:180.0</param>
    453 
    -      <param name="expression">
    454 
    -        <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]>
    455 
    -      </param>
    456 
    -      <message>
    457 
    -        observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max}
    458 
    -      </message>
    459 
    -    </field-validator>
    460 
    -
    461 381 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    462 382 
           <param name="editorName">haulingEnd</param>
    463 383 
           <message/>

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-update-error-validation.xml
    ... ... @@ -234,35 +234,28 @@
    234 234 
         </field-validator>
    235 235
    236 236 
         <!-- 0 <= settingStartLongitude <= 180 -->
    237 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    238 
    -      <param name="doubleParams">min:-180.0|max:180.0</param>
    239 
    -      <param name="expression">
    240 
    -        <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]>
    241 
    -      </param>
    242 
    -      <message>
    243 
    -        observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max}
    244 
    -      </message>
    237 
    +    <field-validator type="coordinateLongitudeDto" short-circuit="true">
    238 
    +      <param name="editorName">settingStart</param>
    239 
    +      <message/>
    240 
    +    </field-validator>
    241 
    +
    242 
    +  </field>
    243 
    +
    244 
    +  <field name="settingStartQuadrant">
    245 
    +
    246 
    +    <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    247 
    +    <field-validator type="required" short-circuit="true">
    248 
    +      <message>observe.validation.activity.required.quadrant</message>
    245 249 
         </field-validator>
    246 250
    247 251 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    248 
    -    <field-validator type="fieldexpression" short-circuit="true">
    249 
    -      <param name="expression"><![CDATA[
    250 
    -                currentTripLongline.ocean == null || settingStartLongitude == null || settingStartLatitude == null
    251 
    -                || (currentTripLongline.ocean.getCode() == 3)
    252 
    -                || (currentTripLongline.ocean.getCode() == 1)
    253 
    -                || (currentTripLongline.ocean.getCode() == 2 && ( settingStartLongitude >= 0))
    254 
    -             ]]>
    255 
    -      </param>
    252 
    +    <field-validator type="quadrantDto" short-circuit="true">
    253 
    +      <param name="ocean">currentTripLongline.ocean</param>
    256 254 
           <message>
    257 
    -        observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
    255 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    258 256 
           </message>
    259 257 
         </field-validator>
    260 258
    261 
    -    <field-validator type="coordinateLongitudeDto" short-circuit="true">
    262 
    -      <param name="editorName">settingStart</param>
    263 
    -      <message/>
    264 
    -    </field-validator>
    265 
    -
    266 259 
       </field>
    267 260
    268 261 
       <field name="settingEndLatitude">
    ... ... @@ -273,16 +266,6 @@
    273 266 
         </field-validator>
    274 267
    275 268 
         <!-- 0 <= settingEndLatitude <= 90 -->
    276 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    277 
    -      <param name="doubleParams">min:-90.0|max:90.0</param>
    278 
    -      <param name="expression">
    279 
    -        <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]>
    280 
    -      </param>
    281 
    -      <message>
    282 
    -        observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max}
    283 
    -      </message>
    284 
    -    </field-validator>
    285 
    -
    286 269 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    287 270 
           <param name="editorName">settingEnd</param>
    288 271 
           <message/>
    ... ... @@ -298,35 +281,28 @@
    298 281 
         </field-validator>
    299 282
    300 283 
         <!-- 0 <= settingEndLongitude <= 180 -->
    301 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    302 
    -      <param name="doubleParams">min:-180.0|max:180.0</param>
    303 
    -      <param name="expression">
    304 
    -        <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]>
    305 
    -      </param>
    306 
    -      <message>
    307 
    -        observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max}
    308 
    -      </message>
    284 
    +    <field-validator type="coordinateLongitudeDto" short-circuit="true">
    285 
    +      <param name="editorName">settingEnd</param>
    286 
    +      <message/>
    287 
    +    </field-validator>
    288 
    +
    289 
    +  </field>
    290 
    +
    291 
    +  <field name="settingEndQuadrant">
    292 
    +
    293 
    +    <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    294 
    +    <field-validator type="required" short-circuit="true">
    295 
    +      <message>observe.validation.activity.required.quadrant</message>
    309 296 
         </field-validator>
    310 297
    311 298 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    312 
    -    <field-validator type="fieldexpression" short-circuit="true">
    313 
    -      <param name="expression"><![CDATA[
    314 
    -                currentTripLongline.ocean == null || settingEndLongitude == null || settingEndLatitude == null
    315 
    -                || (currentTripLongline.ocean.getCode() == 3)
    316 
    -                || (currentTripLongline.ocean.getCode() == 1)
    317 
    -                || (currentTripLongline.ocean.getCode() == 2 && ( settingEndLongitude >= 0))
    318 
    -             ]]>
    319 
    -      </param>
    299 
    +    <field-validator type="quadrantDto" short-circuit="true">
    300 
    +      <param name="ocean">currentTripLongline.ocean</param>
    320 301 
           <message>
    321 
    -        observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
    302 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    322 303 
           </message>
    323 304 
         </field-validator>
    324 305
    325 
    -    <field-validator type="coordinateLongitudeDto" short-circuit="true">
    326 
    -      <param name="editorName">settingEnd</param>
    327 
    -      <message/>
    328 
    -    </field-validator>
    329 
    -
    330 306 
       </field>
    331 307
    332 308 
       <field name="haulingStartLatitude">
    ... ... @@ -337,16 +313,6 @@
    337 313 
         </field-validator>
    338 314
    339 315 
         <!-- 0 <= haulingStartLatitude <= 90 -->
    340 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    341 
    -      <param name="doubleParams">min:-90.0|max:90.0</param>
    342 
    -      <param name="expression">
    343 
    -        <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]>
    344 
    -      </param>
    345 
    -      <message>
    346 
    -        observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max}
    347 
    -      </message>
    348 
    -    </field-validator>
    349 
    -
    350 316 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    351 317 
           <param name="editorName">haulingStart</param>
    352 318 
           <message/>
    ... ... @@ -362,35 +328,27 @@
    362 328 
         </field-validator>
    363 329
    364 330 
         <!-- 0 <= haulingStartLongitude <= 180 -->
    365 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    366 
    -      <param name="doubleParams">min:-180.0|max:180.0</param>
    367 
    -      <param name="expression">
    368 
    -        <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]>
    369 
    -      </param>
    370 
    -      <message>
    371 
    -        observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max}
    372 
    -      </message>
    331 
    +    <field-validator type="coordinateLongitudeDto" short-circuit="true">
    332 
    +      <param name="editorName">haulingStart</param>
    333 
    +      <message/>
    334 
    +    </field-validator>
    335 
    +
    336 
    +  </field>
    337 
    +  <field name="haulingStartQuadrant">
    338 
    +
    339 
    +    <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    340 
    +    <field-validator type="required" short-circuit="true">
    341 
    +      <message>observe.validation.activity.required.quadrant</message>
    373 342 
         </field-validator>
    374 343
    375 344 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    376 
    -    <field-validator type="fieldexpression" short-circuit="true">
    377 
    -      <param name="expression"><![CDATA[
    378 
    -                currentTripLongline.ocean == null || haulingStartLongitude == null || haulingStartLatitude == null
    379 
    -                || (currentTripLongline.ocean.getCode() == 3)
    380 
    -                || (currentTripLongline.ocean.getCode() == 1)
    381 
    -                || (currentTripLongline.ocean.getCode() == 2 && ( haulingStartLongitude >= 0))
    382 
    -             ]]>
    383 
    -      </param>
    345 
    +    <field-validator type="quadrantDto" short-circuit="true">
    346 
    +      <param name="ocean">currentTripLongline.ocean</param>
    384 347 
           <message>
    385 
    -        observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
    348 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    386 349 
           </message>
    387 350 
         </field-validator>
    388 351
    389 
    -    <field-validator type="coordinateLongitudeDto" short-circuit="true">
    390 
    -      <param name="editorName">haulingStart</param>
    391 
    -      <message/>
    392 
    -    </field-validator>
    393 
    -
    394 352 
       </field>
    395 353
    396 354
    ... ... @@ -402,16 +360,6 @@
    402 360 
         </field-validator>
    403 361
    404 362 
         <!-- 0 <= haulingEndLatitude <= 90 -->
    405 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    406 
    -      <param name="doubleParams">min:-90.0|max:90.0</param>
    407 
    -      <param name="expression">
    408 
    -        <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]>
    409 
    -      </param>
    410 
    -      <message>
    411 
    -        observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max}
    412 
    -      </message>
    413 
    -    </field-validator>
    414 
    -
    415 363 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    416 364 
           <param name="editorName">haulingEnd</param>
    417 365 
           <message/>
    ... ... @@ -427,35 +375,28 @@
    427 375 
         </field-validator>
    428 376
    429 377 
         <!-- 0 <= haulingEndLongitude <= 180 -->
    430 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    431 
    -      <param name="doubleParams">min:-180.0|max:180.0</param>
    432 
    -      <param name="expression">
    433 
    -        <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]>
    434 
    -      </param>
    435 
    -      <message>
    436 
    -        observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max}
    437 
    -      </message>
    378 
    +    <field-validator type="coordinateLongitudeDto" short-circuit="true">
    379 
    +      <param name="editorName">haulingEnd</param>
    380 
    +      <message/>
    381 
    +    </field-validator>
    382 
    +
    383 
    +  </field>
    384 
    +
    385 
    +  <field name="haulingEndQuadrant">
    386 
    +
    387 
    +    <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    388 
    +    <field-validator type="required" short-circuit="true">
    389 
    +      <message>observe.validation.activity.required.quadrant</message>
    438 390 
         </field-validator>
    439 391
    440 392 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    441 
    -    <field-validator type="fieldexpression" short-circuit="true">
    442 
    -      <param name="expression"><![CDATA[
    443 
    -                currentTripLongline.ocean == null || haulingEndLongitude == null || haulingEndLatitude == null
    444 
    -                || (currentTripLongline.ocean.getCode() == 3)
    445 
    -                || (currentTripLongline.ocean.getCode() == 1)
    446 
    -                || (currentTripLongline.ocean.getCode() == 2 && ( haulingEndLongitude >= 0))
    447 
    -             ]]>
    448 
    -      </param>
    393 
    +    <field-validator type="quadrantDto" short-circuit="true">
    394 
    +      <param name="ocean">currentTripLongline.ocean</param>
    449 395 
           <message>
    450 
    -        observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
    396 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    451 397 
           </message>
    452 398 
         </field-validator>
    453 399
    454 
    -    <field-validator type="coordinateLongitudeDto" short-circuit="true">
    455 
    -      <param name="editorName">haulingEnd</param>
    456 
    -      <message/>
    457 
    -    </field-validator>
    458 
    -
    459 400 
       </field>
    460 401
    461 402 
       <field name="settingShape">

  • validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml
    ... ... @@ -193,16 +193,6 @@
    193 193 
         </field-validator>
    194 194
    195 195 
         <!-- 0 <= latitude <= 90 -->
    196 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    197 
    -      <param name="doubleParams">min:-90.0|max:90.0</param>
    198 
    -      <param name="expression">
    199 
    -        <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
    200 
    -      </param>
    201 
    -      <message>
    202 
    -        observe.validation.activity.bound.latitude##0.0##${doubles.max}
    203 
    -      </message>
    204 
    -    </field-validator>
    205 
    -
    206 196 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    207 197 
           <param name="editorName">coordinate</param>
    208 198 
           <message/>
    ... ... @@ -218,16 +208,6 @@
    218 208 
         </field-validator>
    219 209
    220 210 
         <!-- 0 <= longitude <= 180 -->
    221 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    222 
    -      <param name="doubleParams">min:-180.0|max:180.0</param>
    223 
    -      <param name="expression">
    224 
    -        <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
    225 
    -      </param>
    226 
    -      <message>
    227 
    -        observe.validation.activity.bound.longitude##0.0##${doubles.max}
    228 
    -      </message>
    229 
    -    </field-validator>
    230 
    -
    231 211 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    232 212 
           <param name="editorName">coordinate</param>
    233 213 
           <message/>

  • validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml
    ... ... @@ -51,17 +51,6 @@
    51 51 
         </field-validator>
    52 52
    53 53 
         <!-- 0 <= latitude <= 90 -->
    54 
    -
    55 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    56 
    -      <param name="doubleParams">min:-90.0|max:90.0</param>
    57 
    -      <param name="expression">
    58 
    -        <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
    59 
    -      </param>
    60 
    -      <message>
    61 
    -        observe.validation.activity.bound.latitude##0.0##${doubles.max}
    62 
    -      </message>
    63 
    -    </field-validator>
    64 
    -
    65 54 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    66 55 
           <param name="editorName">coordinate</param>
    67 56 
           <message/>
    ... ... @@ -77,16 +66,6 @@
    77 66 
         </field-validator>
    78 67
    79 68 
         <!-- 0 <= longitude <= 180 -->
    80 
    -    <field-validator type="fieldexpressionwithparams" short-circuit="true">
    81 
    -      <param name="doubleParams">min:-180.0|max:180.0</param>
    82 
    -      <param name="expression">
    83 
    -        <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
    84 
    -      </param>
    85 
    -      <message>
    86 
    -        observe.validation.activity.bound.longitude##0.0##${doubles.max}
    87 
    -      </message>
    88 
    -    </field-validator>
    89 
    -
    90 69 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    91 70 
           <param name="editorName">coordinate</param>
    92 71 
           <message/>

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