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

Commits:

13 changed files:

Changes:

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-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

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml
    ... ... @@ -83,7 +83,7 @@
    83 83 
         <field-validator type="quadrantDto" short-circuit="true">
    84 84 
           <param name="ocean">currentTripLongline.ocean</param>
    85 85 
           <message>
    86 
    -        observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    86 
    +        observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label}
    87 87 
           </message>
    88 88 
         </field-validator>
    89 89

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml
    ... ... @@ -99,7 +99,7 @@
    99 99 
         <field-validator type="quadrantDto" short-circuit="true">
    100 100 
           <param name="ocean">currentTripLongline.ocean</param>
    101 101 
           <message>
    102 
    -        observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    102 
    +        observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label}
    103 103 
           </message>
    104 104 
         </field-validator>
    105 105

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-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

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml
    ... ... @@ -43,7 +43,7 @@
    43 43 
         <field-validator type="quadrantDto" short-circuit="true">
    44 44 
           <param name="ocean">currentTripLongline.ocean</param>
    45 45 
           <message>
    46 
    -        observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    46 
    +        observe.validation.sample.invalid.quadrant##${currentTripLongline.ocean.label}
    47 47 
           </message>
    48 48 
         </field-validator>
    49 49

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml
    ... ... @@ -44,7 +44,7 @@
    44 44 
         <field-validator type="quadrantDto" short-circuit="true">
    45 45 
           <param name="ocean">currentTripLongline.ocean</param>
    46 46 
           <message>
    47 
    -        observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    47 
    +        observe.validation.sample.invalid.quadrant##${currentTripLongline.ocean.label}
    48 48 
           </message>
    49 49 
         </field-validator>
    50 50

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml
    ... ... @@ -217,7 +217,7 @@
    217 217 
         <field-validator type="quadrantDto" short-circuit="true">
    218 218 
           <param name="ocean">currentTripLongline.ocean</param>
    219 219 
           <message>
    220 
    -        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    220 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    221 221 
           </message>
    222 222 
         </field-validator>
    223 223
    ... ... @@ -283,7 +283,7 @@
    283 283 
         <field-validator type="quadrantDto" short-circuit="true">
    284 284 
           <param name="ocean">currentTripLongline.ocean</param>
    285 285 
           <message>
    286 
    -        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    286 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    287 287 
           </message>
    288 288 
         </field-validator>
    289 289
    ... ... @@ -349,7 +349,7 @@
    349 349 
         <field-validator type="quadrantDto" short-circuit="true">
    350 350 
           <param name="ocean">currentTripLongline.ocean</param>
    351 351 
           <message>
    352 
    -        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    352 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    353 353 
           </message>
    354 354 
         </field-validator>
    355 355
    ... ... @@ -415,7 +415,7 @@
    415 415 
         <field-validator type="quadrantDto" short-circuit="true">
    416 416 
           <param name="ocean">currentTripLongline.ocean</param>
    417 417 
           <message>
    418 
    -        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    418 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    419 419 
           </message>
    420 420 
         </field-validator>
    421 421

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml
    ... ... @@ -250,20 +250,6 @@
    250 250 
           </message>
    251 251 
         </field-validator>
    252 252
    253 
    -    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    254 
    -    <field-validator type="fieldexpression" short-circuit="true">
    255 
    -      <param name="expression"><![CDATA[
    256 
    -                currentTripLongline.ocean == null || settingStartLongitude == null || settingStartLatitude == null
    257 
    -                || (currentTripLongline.ocean.getCode() == 3)
    258 
    -                || (currentTripLongline.ocean.getCode() == 1)
    259 
    -                || (currentTripLongline.ocean.getCode() == 2 && ( settingStartLongitude >= 0))
    260 
    -             ]]>
    261 
    -      </param>
    262 
    -      <message>
    263 
    -        observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
    264 
    -      </message>
    265 
    -    </field-validator>
    266 
    -
    267 253 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    268 254 
           <param name="editorName">settingStart</param>
    269 255 
           <message/>
    ... ... @@ -271,6 +257,23 @@
    271 257
    272 258 
       </field>
    273 259
    260 
    +  <field name="settingStartQuadrant">
    261 
    +
    262 
    +    <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    263 
    +    <field-validator type="required" short-circuit="true">
    264 
    +      <message>observe.validation.activity.required.quadrant</message>
    265 
    +    </field-validator>
    266 
    +
    267 
    +    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    268 
    +    <field-validator type="quadrantDto" short-circuit="true">
    269 
    +      <param name="ocean">currentTripLongline.ocean</param>
    270 
    +      <message>
    271 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    272 
    +      </message>
    273 
    +    </field-validator>
    274 
    +
    275 
    +  </field>
    276 
    +
    274 277 
       <field name="settingEndLatitude">
    275 278
    276 279 
         <!-- settingEndLatitude obligatoire -->
    ... ... @@ -314,20 +317,6 @@
    314 317 
           </message>
    315 318 
         </field-validator>
    316 319
    317 
    -    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    318 
    -    <field-validator type="fieldexpression" short-circuit="true">
    319 
    -      <param name="expression"><![CDATA[
    320 
    -                currentTripLongline.ocean == null || settingEndLongitude == null || settingEndLatitude == null
    321 
    -                || (currentTripLongline.ocean.getCode() == 3)
    322 
    -                || (currentTripLongline.ocean.getCode() == 1)
    323 
    -                || (currentTripLongline.ocean.getCode() == 2 && ( settingEndLongitude >= 0))
    324 
    -             ]]>
    325 
    -      </param>
    326 
    -      <message>
    327 
    -        observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
    328 
    -      </message>
    329 
    -    </field-validator>
    330 
    -
    331 320 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    332 321 
           <param name="editorName">settingEnd</param>
    333 322 
           <message/>
    ... ... @@ -335,6 +324,23 @@
    335 324
    336 325 
       </field>
    337 326
    327 
    +  <field name="settingEndQuadrant">
    328 
    +
    329 
    +    <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    330 
    +    <field-validator type="required" short-circuit="true">
    331 
    +      <message>observe.validation.activity.required.quadrant</message>
    332 
    +    </field-validator>
    333 
    +
    334 
    +    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    335 
    +    <field-validator type="quadrantDto" short-circuit="true">
    336 
    +      <param name="ocean">currentTripLongline.ocean</param>
    337 
    +      <message>
    338 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    339 
    +      </message>
    340 
    +    </field-validator>
    341 
    +
    342 
    +  </field>
    343 
    +
    338 344 
       <field name="haulingStartLatitude">
    339 345
    340 346 
         <!-- haulingStartLatitude obligatoire -->
    ... ... @@ -378,20 +384,6 @@
    378 384 
           </message>
    379 385 
         </field-validator>
    380 386
    381 
    -    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    382 
    -    <field-validator type="fieldexpression" short-circuit="true">
    383 
    -      <param name="expression"><![CDATA[
    384 
    -                currentTripLongline.ocean == null || haulingStartLongitude == null || haulingStartLatitude == null
    385 
    -                || (currentTripLongline.ocean.getCode() == 3)
    386 
    -                || (currentTripLongline.ocean.getCode() == 1)
    387 
    -                || (currentTripLongline.ocean.getCode() == 2 && ( haulingStartLongitude >= 0))
    388 
    -             ]]>
    389 
    -      </param>
    390 
    -      <message>
    391 
    -        observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
    392 
    -      </message>
    393 
    -    </field-validator>
    394 
    -
    395 387 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    396 388 
           <param name="editorName">haulingStart</param>
    397 389 
           <message/>
    ... ... @@ -399,6 +391,22 @@
    399 391
    400 392 
       </field>
    401 393
    394 
    +  <field name="haulingStartQuadrant">
    395 
    +
    396 
    +    <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    397 
    +    <field-validator type="required" short-circuit="true">
    398 
    +      <message>observe.validation.activity.required.quadrant</message>
    399 
    +    </field-validator>
    400 
    +
    401 
    +    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    402 
    +    <field-validator type="quadrantDto" short-circuit="true">
    403 
    +      <param name="ocean">currentTripLongline.ocean</param>
    404 
    +      <message>
    405 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    406 
    +      </message>
    407 
    +    </field-validator>
    408 
    +
    409 
    +  </field>
    402 410
    403 411 
       <field name="haulingEndLatitude">
    404 412
    ... ... @@ -443,20 +451,6 @@
    443 451 
           </message>
    444 452 
         </field-validator>
    445 453
    446 
    -    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    447 
    -    <field-validator type="fieldexpression" short-circuit="true">
    448 
    -      <param name="expression"><![CDATA[
    449 
    -                currentTripLongline.ocean == null || haulingEndLongitude == null || haulingEndLatitude == null
    450 
    -                || (currentTripLongline.ocean.getCode() == 3)
    451 
    -                || (currentTripLongline.ocean.getCode() == 1)
    452 
    -                || (currentTripLongline.ocean.getCode() == 2 && ( haulingEndLongitude >= 0))
    453 
    -             ]]>
    454 
    -      </param>
    455 
    -      <message>
    456 
    -        observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
    457 
    -      </message>
    458 
    -    </field-validator>
    459 
    -
    460 454 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    461 455 
           <param name="editorName">haulingEnd</param>
    462 456 
           <message/>
    ... ... @@ -464,6 +458,23 @@
    464 458
    465 459 
       </field>
    466 460
    461 
    +  <field name="haulingEndQuadrant">
    462 
    +
    463 
    +    <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    464 
    +    <field-validator type="required" short-circuit="true">
    465 
    +      <message>observe.validation.activity.required.quadrant</message>
    466 
    +    </field-validator>
    467 
    +
    468 
    +    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    469 
    +    <field-validator type="quadrantDto" short-circuit="true">
    470 
    +      <param name="ocean">currentTripLongline.ocean</param>
    471 
    +      <message>
    472 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    473 
    +      </message>
    474 
    +    </field-validator>
    475 
    +
    476 
    +  </field>
    477 
    +
    467 478 
       <field name="settingShape">
    468 479
    469 480 
         <!-- settingShape desactive -->

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml
    ... ... @@ -217,7 +217,7 @@
    217 217 
         <field-validator type="quadrantDto" short-circuit="true">
    218 218 
           <param name="ocean">currentTripLongline.ocean</param>
    219 219 
           <message>
    220 
    -        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    220 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    221 221 
           </message>
    222 222 
         </field-validator>
    223 223
    ... ... @@ -283,7 +283,7 @@
    283 283 
         <field-validator type="quadrantDto" short-circuit="true">
    284 284 
           <param name="ocean">currentTripLongline.ocean</param>
    285 285 
           <message>
    286 
    -        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    286 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    287 287 
           </message>
    288 288 
         </field-validator>
    289 289
    ... ... @@ -349,7 +349,7 @@
    349 349 
         <field-validator type="quadrantDto" short-circuit="true">
    350 350 
           <param name="ocean">currentTripLongline.ocean</param>
    351 351 
           <message>
    352 
    -        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    352 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    353 353 
           </message>
    354 354 
         </field-validator>
    355 355
    ... ... @@ -415,7 +415,7 @@
    415 415 
         <field-validator type="quadrantDto" short-circuit="true">
    416 416 
           <param name="ocean">currentTripLongline.ocean</param>
    417 417 
           <message>
    418 
    -        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
    418 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    419 419 
           </message>
    420 420 
         </field-validator>
    421 421

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml
    ... ... @@ -250,20 +250,6 @@
    250 250 
           </message>
    251 251 
         </field-validator>
    252 252
    253 
    -    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    254 
    -    <field-validator type="fieldexpression" short-circuit="true">
    255 
    -      <param name="expression"><![CDATA[
    256 
    -                currentTripLongline.ocean == null || settingStartLongitude == null || settingStartLatitude == null
    257 
    -                || (currentTripLongline.ocean.getCode() == 3)
    258 
    -                || (currentTripLongline.ocean.getCode() == 1)
    259 
    -                || (currentTripLongline.ocean.getCode() == 2 && ( settingStartLongitude >= 0))
    260 
    -             ]]>
    261 
    -      </param>
    262 
    -      <message>
    263 
    -        observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
    264 
    -      </message>
    265 
    -    </field-validator>
    266 
    -
    267 253 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    268 254 
           <param name="editorName">settingStart</param>
    269 255 
           <message/>
    ... ... @@ -271,6 +257,23 @@
    271 257
    272 258 
       </field>
    273 259
    260 
    +  <field name="settingStartQuadrant">
    261 
    +
    262 
    +    <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    263 
    +    <field-validator type="required" short-circuit="true">
    264 
    +      <message>observe.validation.activity.required.quadrant</message>
    265 
    +    </field-validator>
    266 
    +
    267 
    +    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    268 
    +    <field-validator type="quadrantDto" short-circuit="true">
    269 
    +      <param name="ocean">currentTripLongline.ocean</param>
    270 
    +      <message>
    271 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    272 
    +      </message>
    273 
    +    </field-validator>
    274 
    +
    275 
    +  </field>
    276 
    +
    274 277 
       <field name="settingEndLatitude">
    275 278
    276 279 
         <!-- settingEndLatitude obligatoire -->
    ... ... @@ -314,24 +317,26 @@
    314 317 
           </message>
    315 318 
         </field-validator>
    316 319
    317 
    -    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    318 
    -    <field-validator type="fieldexpression" short-circuit="true">
    319 
    -      <param name="expression"><![CDATA[
    320 
    -                currentTripLongline.ocean == null || settingEndLongitude == null || settingEndLatitude == null
    321 
    -                || (currentTripLongline.ocean.getCode() == 3)
    322 
    -                || (currentTripLongline.ocean.getCode() == 1)
    323 
    -                || (currentTripLongline.ocean.getCode() == 2 && ( settingEndLongitude >= 0))
    324 
    -             ]]>
    325 
    -      </param>
    326 
    -      <message>
    327 
    -        observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
    328 
    -      </message>
    329 
    -    </field-validator>
    330 
    -
    331 320 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    332 321 
           <param name="editorName">settingEnd</param>
    333 322 
           <message/>
    334 323 
         </field-validator>
    324 
    +  </field>
    325 
    +
    326 
    +  <field name="settingEndQuadrant">
    327 
    +
    328 
    +    <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    329 
    +    <field-validator type="required" short-circuit="true">
    330 
    +      <message>observe.validation.activity.required.quadrant</message>
    331 
    +    </field-validator>
    332 
    +
    333 
    +    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    334 
    +    <field-validator type="quadrantDto" short-circuit="true">
    335 
    +      <param name="ocean">currentTripLongline.ocean</param>
    336 
    +      <message>
    337 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    338 
    +      </message>
    339 
    +    </field-validator>
    335 340
    336 341 
       </field>
    337 342
    ... ... @@ -378,20 +383,6 @@
    378 383 
           </message>
    379 384 
         </field-validator>
    380 385
    381 
    -    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    382 
    -    <field-validator type="fieldexpression" short-circuit="true">
    383 
    -      <param name="expression"><![CDATA[
    384 
    -                currentTripLongline.ocean == null || haulingStartLongitude == null || haulingStartLatitude == null
    385 
    -                || (currentTripLongline.ocean.getCode() == 3)
    386 
    -                || (currentTripLongline.ocean.getCode() == 1)
    387 
    -                || (currentTripLongline.ocean.getCode() == 2 && ( haulingStartLongitude >= 0))
    388 
    -             ]]>
    389 
    -      </param>
    390 
    -      <message>
    391 
    -        observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
    392 
    -      </message>
    393 
    -    </field-validator>
    394 
    -
    395 386 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    396 387 
           <param name="editorName">haulingStart</param>
    397 388 
           <message/>
    ... ... @@ -399,6 +390,22 @@
    399 390
    400 391 
       </field>
    401 392
    393 
    +  <field name="haulingStartQuadrant">
    394 
    +
    395 
    +    <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    396 
    +    <field-validator type="required" short-circuit="true">
    397 
    +      <message>observe.validation.activity.required.quadrant</message>
    398 
    +    </field-validator>
    399 
    +
    400 
    +    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    401 
    +    <field-validator type="quadrantDto" short-circuit="true">
    402 
    +      <param name="ocean">currentTripLongline.ocean</param>
    403 
    +      <message>
    404 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    405 
    +      </message>
    406 
    +    </field-validator>
    407 
    +
    408 
    +  </field>
    402 409
    403 410 
       <field name="haulingEndLatitude">
    404 411
    ... ... @@ -443,20 +450,6 @@
    443 450 
           </message>
    444 451 
         </field-validator>
    445 452
    446 
    -    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    447 
    -    <field-validator type="fieldexpression" short-circuit="true">
    448 
    -      <param name="expression"><![CDATA[
    449 
    -                currentTripLongline.ocean == null || haulingEndLongitude == null || haulingEndLatitude == null
    450 
    -                || (currentTripLongline.ocean.getCode() == 3)
    451 
    -                || (currentTripLongline.ocean.getCode() == 1)
    452 
    -                || (currentTripLongline.ocean.getCode() == 2 && ( haulingEndLongitude >= 0))
    453 
    -             ]]>
    454 
    -      </param>
    455 
    -      <message>
    456 
    -        observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
    457 
    -      </message>
    458 
    -    </field-validator>
    459 
    -
    460 453 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    461 454 
           <param name="editorName">haulingEnd</param>
    462 455 
           <message/>
    ... ... @@ -464,6 +457,24 @@
    464 457
    465 458 
       </field>
    466 459
    460 
    +  <field name="haulingEndQuadrant">
    461 
    +
    462 
    +    <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    463 
    +    <field-validator type="required" short-circuit="true">
    464 
    +      <message>observe.validation.activity.required.quadrant</message>
    465 
    +    </field-validator>
    466 
    +
    467 
    +    <!-- coherence quadrant par rapport a l'ocean de la maree -->
    468 
    +    <field-validator type="quadrantDto" short-circuit="true">
    469 
    +      <param name="ocean">currentTripLongline.ocean</param>
    470 
    +      <message>
    471 
    +        observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
    472 
    +      </message>
    473 
    +    </field-validator>
    474 
    +
    475 
    +  </field>
    476 
    +
    477 
    +
    467 478 
       <field name="settingShape">
    468 479
    469 480 
         <!-- settingShape desactive -->

  • validation/src/main/resources/i18n/validation_en_GB.properties
    ... ... @@ -731,6 +731,7 @@ observe.validation.route.null.comment=Comment is not filled.
    731 731 
     observe.validation.route.positive.startLogValue=Start log value must be strictly positive
    732 732 
     observe.validation.route.required.date=Date must be filled.
    733 733 
     observe.validation.route.unclosed.activity=There is an open activity on route (%1$s).
    734 
    +observe.validation.sample.invalid.quadrant=Quadrant is not coherent with ocean (%1$s) of trip (indian\: 1,2, atlantic 1,2,3,4).
    734 735 
     observe.validation.sampleLogbook.null.parts=Aucune donnée saisie
    735 736 
     observe.validation.sampleLogbook.required.date=La date est obligatoire
    736 737 
     observe.validation.samplePart.desactivated.weightMeasureType=Selected weight mesure type is disabled.

  • validation/src/main/resources/i18n/validation_es_ES.properties
    ... ... @@ -733,6 +733,7 @@ observe.validation.route.null.comment=No hay comentario especificado.
    733 733 
     observe.validation.route.positive.startLogValue=La corredera de mañana debe ser un entero positivo.
    734 734 
     observe.validation.route.required.date=Se debe especificar el día de observación.
    735 735 
     observe.validation.route.unclosed.activity=Existe una actividad no cerrada (%1$s).
    736 
    +observe.validation.sample.invalid.quadrant=El cuadrante no es coherente con el informe del oceano (%1$s) de la marea (indico \: 1,2, atlantico \: 1, 2, 3, 4)
    736 737 
     observe.validation.sampleLogbook.null.parts=Aucune donnée saisie
    737 738 
     observe.validation.sampleLogbook.required.date=La date est obligatoire
    738 739 
     observe.validation.samplePart.desactivated.weightMeasureType=Selected weight mesure type is disabled. \#TODO

  • validation/src/main/resources/i18n/validation_fr_FR.properties
    ... ... @@ -731,6 +731,7 @@ observe.validation.route.null.comment=Aucun commentaire renseigné.
    731 731 
     observe.validation.route.positive.startLogValue=Le loch du matin doit être un entier strictement positif.
    732 732 
     observe.validation.route.required.date=Le jour d'observation doit être renseigné.
    733 733 
     observe.validation.route.unclosed.activity=Il existe une activité non clôturée (%1$s).
    734 
    +observe.validation.sample.invalid.quadrant=Le quadrant n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4)
    734 735 
     observe.validation.sampleLogbook.null.parts=Aucune donnée saisie
    735 736 
     observe.validation.sampleLogbook.required.date=La date est obligatoire
    736 737 
     observe.validation.samplePart.desactivated.weightMeasureType=Le type de mesure de poids sélectionné est désactivé.

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