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

Commits:

8 changed files:

Changes:

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -3277,7 +3277,10 @@ observe.validation.activity.required.vesselActivity=must be filled.
    3277 3277 
     observe.validation.activity.speed.bound=Activity speed is %s nd, which is more than the maximum authorized which is %s nd.
    3278 3278 
     observe.validation.activity.speed.bound.inter=Speed between two activities can't exceed %1$s nd, (activity %2$s speed is %3$s).
    3279 3279 
     observe.validation.activityLongline.desactivated.fpaZone=Fpa zone is disabled.
    3280 
    -observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date
    3280 
    +observe.validation.activityLongline.endDate.after.currentTrip.startDate=End date must be after current trip start date
    3281 
    +observe.validation.activityLongline.endDate.before.currentTrip.endDate=End date must be before current trip end date
    3282 
    +observe.validation.activityLongline.startDate.after.currentTrip.startDate=Start date must be after current trip start date
    3283 
    +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be before current trip end date
    3281 3284 
     observe.validation.baitsComposition.bound.individualSize=Size must be bound between %s and %s.
    3282 3285 
     observe.validation.baitsComposition.bound.individualWeight=Weight must be bound between %s and %s.
    3283 3286 
     observe.validation.baitsComposition.bound.proportion=Proportion must be bound between %s and %s.

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -3277,7 +3277,10 @@ observe.validation.activity.required.vesselActivity=Se debe seleccionar la activ
    3277 3277 
     observe.validation.activity.speed.bound=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos.
    3278 3278 
     observe.validation.activity.speed.bound.inter=la velocidad entre dos actividades no debe sobrepasar %1$s nd, (actividad %2$s incorrecta, velocidad  \: %3$s nd).
    3279 3279 
     observe.validation.activityLongline.desactivated.fpaZone=La zona FPA seleccionada está desactivada.
    3280 
    -observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date\#TODO
    3280 
    +observe.validation.activityLongline.endDate.after.currentTrip.startDate=End date must be after current trip start date \#TODO
    3281 
    +observe.validation.activityLongline.endDate.before.currentTrip.endDate=End date must be before current trip end date \#TODO
    3282 
    +observe.validation.activityLongline.startDate.after.currentTrip.startDate=Start date must be after current trip start date \#TODO
    3283 
    +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be before current trip end date \#TODO
    3281 3284 
     observe.validation.baitsComposition.bound.individualSize=El tamaño debe ser entre %s y %s.
    3282 3285 
     observe.validation.baitsComposition.bound.individualWeight=El peso debe ser entre %s y %s.
    3283 3286 
     observe.validation.baitsComposition.bound.proportion=La proporción debe ser entre %s y %s.

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -3277,7 +3277,10 @@ observe.validation.activity.required.vesselActivity=L'activité du navire est ob
    3277 3277 
     observe.validation.activity.speed.bound=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd.
    3278 3278 
     observe.validation.activity.speed.bound.inter=La vitesse entre deux activités ne doit pas dépasser %1$s nd, (l'activité %2$s a une vitesse de %3$s nd).
    3279 3279 
     observe.validation.activityLongline.desactivated.fpaZone=La zone FPA sélectionnée est désactivée.
    3280 
    -observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être après supérieure ou égale à la date de fin de marée
    3280 
    +observe.validation.activityLongline.endDate.after.currentTrip.startDate=La date de fin doit être supérieure ou égale à la date de début de marée
    3281 
    +observe.validation.activityLongline.endDate.before.currentTrip.endDate=La date de fin doit être inférieur ou égale à la date de fin de marée
    3282 
    +observe.validation.activityLongline.startDate.after.currentTrip.startDate=La date doit être supérieure ou égale à la date de début de marée
    3283 
    +observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être inférieure ou égale à la date de fin de marée
    3281 3284 
     observe.validation.baitsComposition.bound.individualSize=La taille doit être comprise entre %s et %s.
    3282 3285 
     observe.validation.baitsComposition.bound.individualWeight=Le poids doit être comprise entre %s et %s.
    3283 3286 
     observe.validation.baitsComposition.bound.proportion=La proportion doit être comprise entre %s et %s.

  • validation/src/main/i18n/getters/validation-messages.getter
    1 1 
     observe.validation.activity.duplicated.time
    2 2 
     observe.validation.activity.null.dcp
    3 3 
     observe.validation.activity.required.observedSystem.for.nonTargetCatch
    4 
    +observe.validation.activityLongline.endDate.after.currentTrip.startDate
    5 
    +observe.validation.activityLongline.endDate.before.currentTrip.endDate
    6 
    +observe.validation.activityLongline.startDate.after.currentTrip.startDate
    4 7 
     observe.validation.activityLongline.startDate.before.currentTrip.endDate
    5 8 
     observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped
    6 9 
     observe.validation.catchLongline.required.position

  • validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-error-validation.xml
    ... ... @@ -36,10 +36,16 @@
    36 36 
         </field-validator>
    37 37 
         <field-validator type="fieldexpression" short-circuit="true">
    38 38 
           <param name="expression">
    39 
    -        <![CDATA[ currentTripLongline.endDate.time <= startDate.time ]]>
    39 
    +        <![CDATA[ currentTripLongline.endDate.time >= startDate.time ]]>
    40 40 
           </param>
    41 41 
           <message>observe.validation.activityLongline.startDate.before.currentTrip.endDate</message>
    42 42 
         </field-validator>
    43 
    +    <field-validator type="fieldexpression" short-circuit="true">
    44 
    +      <param name="expression">
    45 
    +        <![CDATA[ currentTripLongline.startDate.time <= startDate.time ]]>
    46 
    +      </param>
    47 
    +      <message>observe.validation.activityLongline.startDate.after.currentTrip.startDate</message>
    48 
    +    </field-validator>
    43 49 
       </field>
    44 50
    45 51 
       <field name="startTime">
    ... ... @@ -64,6 +70,21 @@
    64 70
    65 71 
       </field>
    66 72
    73 
    +  <field name="endDate">
    74 
    +    <field-validator type="fieldexpression" short-circuit="true">
    75 
    +      <param name="expression">
    76 
    +        <![CDATA[ endDate == null || currentTripLongline.endDate.time >= endDate.time ]]>
    77 
    +      </param>
    78 
    +      <message>observe.validation.activityLongline.endDate.before.currentTrip.endDate</message>
    79 
    +    </field-validator>
    80 
    +    <field-validator type="fieldexpression" short-circuit="true">
    81 
    +      <param name="expression">
    82 
    +        <![CDATA[ endDate == null || currentTripLongline.startDate.time <= endDate.time ]]>
    83 
    +      </param>
    84 
    +      <message>observe.validation.activityLongline.endDate.after.currentTrip.startDate</message>
    85 
    +    </field-validator>
    86 
    +  </field>
    87 
    +
    67 88 
       <field name="seaSurfaceTemperature">
    68 89 
         <field-validator type="temperatureBound" short-circuit="true">
    69 90 
           <param name="min">15.0</param>
    ... ... @@ -73,27 +94,18 @@
    73 94 
         </field-validator>
    74 95 
       </field>
    75 96 
       <field name="quadrant">
    76 
    -    <field-validator type="mandatory" short-circuit="true">
    77 
    -      <message/>
    78 
    -    </field-validator>
    79 97 
         <field-validator type="quadrantDto" short-circuit="true">
    80 98 
           <param name="ocean">currentTripLongline.ocean</param>
    81 99 
           <message/>
    82 100 
         </field-validator>
    83 101 
       </field>
    84 102 
       <field name="latitude">
    85 
    -    <field-validator type="mandatory" short-circuit="true">
    86 
    -      <message/>
    87 
    -    </field-validator>
    88 103 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    89 104 
           <param name="editorName">coordinate</param>
    90 105 
           <message/>
    91 106 
         </field-validator>
    92 107 
       </field>
    93 108 
       <field name="longitude">
    94 
    -    <field-validator type="mandatory" short-circuit="true">
    95 
    -      <message/>
    96 
    -    </field-validator>
    97 109 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    98 110 
           <param name="editorName">coordinate</param>
    99 111 
           <message/>

  • validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-warning-validation.xml
    ... ... @@ -24,6 +24,28 @@
    24 24 
         "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 25 
     <validators>
    26 26
    27 
    +  <field name="quadrant">
    28 
    +    <field-validator type="notFilled" short-circuit="true">
    29 
    +      <message/>
    30 
    +    </field-validator>
    31 
    +  </field>
    32 
    +  <field name="latitude">
    33 
    +    <field-validator type="notFilled" short-circuit="true">
    34 
    +      <message/>
    35 
    +    </field-validator>
    36 
    +  </field>
    37 
    +  <field name="longitude">
    38 
    +    <field-validator type="notFilled" short-circuit="true">
    39 
    +      <message/>
    40 
    +    </field-validator>
    41 
    +  </field>
    42 
    +
    43 
    +  <field name="endDate">
    44 
    +    <field-validator type="mandatory" short-circuit="true">
    45 
    +      <message/>
    46 
    +    </field-validator>
    47 
    +  </field>
    48 
    +
    27 49 
       <field name="seaSurfaceTemperature">
    28 50 
         <field-validator type="notFilled" short-circuit="true">
    29 51 
           <message/>

  • validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-error-validation.xml
    ... ... @@ -36,10 +36,16 @@
    36 36 
         </field-validator>
    37 37 
         <field-validator type="fieldexpression" short-circuit="true">
    38 38 
           <param name="expression">
    39 
    -        <![CDATA[ currentTripLongline.endDate.time <= startDate.time ]]>
    39 
    +        <![CDATA[ currentTripLongline.endDate.time >= startDate.time ]]>
    40 40 
           </param>
    41 41 
           <message>observe.validation.activityLongline.startDate.before.currentTrip.endDate</message>
    42 42 
         </field-validator>
    43 
    +    <field-validator type="fieldexpression" short-circuit="true">
    44 
    +      <param name="expression">
    45 
    +        <![CDATA[ currentTripLongline.startDate.time <= startDate.time ]]>
    46 
    +      </param>
    47 
    +      <message>observe.validation.activityLongline.startDate.after.currentTrip.startDate</message>
    48 
    +    </field-validator>
    43 49 
       </field>
    44 50
    45 51 
       <field name="startTime">
    ... ... @@ -57,33 +63,39 @@
    57 63 
         </field-validator>
    58 64 
       </field>
    59 65 
       <field name="quadrant">
    60 
    -    <field-validator type="mandatory" short-circuit="true">
    61 
    -      <message/>
    62 
    -    </field-validator>
    63 66 
         <field-validator type="quadrantDto" short-circuit="true">
    64 67 
           <param name="ocean">currentTripLongline.ocean</param>
    65 68 
           <message/>
    66 69 
         </field-validator>
    67 70 
       </field>
    68 71 
       <field name="latitude">
    69 
    -    <field-validator type="mandatory" short-circuit="true">
    70 
    -      <message/>
    71 
    -    </field-validator>
    72 72 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    73 73 
           <param name="editorName">coordinate</param>
    74 74 
           <message/>
    75 75 
         </field-validator>
    76 76 
       </field>
    77 77 
       <field name="longitude">
    78 
    -    <field-validator type="mandatory" short-circuit="true">
    79 
    -      <message/>
    80 
    -    </field-validator>
    81 78 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    82 79 
           <param name="editorName">coordinate</param>
    83 80 
           <message/>
    84 81 
         </field-validator>
    85 82 
       </field>
    86 83
    84 
    +  <field name="endDate">
    85 
    +    <field-validator type="fieldexpression" short-circuit="true">
    86 
    +      <param name="expression">
    87 
    +        <![CDATA[ endDate == null || currentTripLongline.endDate.time >= endDate.time ]]>
    88 
    +      </param>
    89 
    +      <message>observe.validation.activityLongline.endDate.before.currentTrip.endDate</message>
    90 
    +    </field-validator>
    91 
    +    <field-validator type="fieldexpression" short-circuit="true">
    92 
    +      <param name="expression">
    93 
    +        <![CDATA[ endDate == null || currentTripLongline.startDate.time <= endDate.time ]]>
    94 
    +      </param>
    95 
    +      <message>observe.validation.activityLongline.endDate.after.currentTrip.startDate</message>
    96 
    +    </field-validator>
    97 
    +  </field>
    98 
    +
    87 99 
       <field name="currentDirection">
    88 100 
         <field-validator type="boundNumber" short-circuit="true">
    89 101 
           <param name="min">0</param>

  • validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-warning-validation.xml
    ... ... @@ -24,6 +24,28 @@
    24 24 
         "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 25 
     <validators>
    26 26
    27 
    +  <field name="quadrant">
    28 
    +    <field-validator type="notFilled" short-circuit="true">
    29 
    +      <message/>
    30 
    +    </field-validator>
    31 
    +  </field>
    32 
    +  <field name="latitude">
    33 
    +    <field-validator type="notFilled" short-circuit="true">
    34 
    +      <message/>
    35 
    +    </field-validator>
    36 
    +  </field>
    37 
    +  <field name="longitude">
    38 
    +    <field-validator type="notFilled" short-circuit="true">
    39 
    +      <message/>
    40 
    +    </field-validator>
    41 
    +  </field>
    42 
    +
    43 
    +  <field name="endDate">
    44 
    +    <field-validator type="mandatory" short-circuit="true">
    45 
    +      <message/>
    46 
    +    </field-validator>
    47 
    +  </field>
    48 
    +
    27 49 
       <field name="seaSurfaceTemperature">
    28 50 
         <field-validator type="notFilled" short-circuit="true">
    29 51 
           <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.