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

Commits:

7 changed files:

Changes:

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    1 
    +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date
    1 2 
     ClientConfig.description=ObServe configuration
    2 3 
     ObserveWebApplicationConfig.description=ObServe Web configuration
    3 4 
     observe.TripLongline.action.generateHomeId.tip=Generate a new id

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    1 
    +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date#TODO
    1 2 
     ClientConfig.description=Configuración de ObServe
    2 3 
     ObserveWebApplicationConfig.description=Configuración de Observe web
    3 4 
     observe.TripLongline.action.generateHomeId.tip=Génerer un identifiant \#TODO

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -11,6 +11,7 @@ observe.action.auto.copy.to.clipboard.tip=Mettre à jour automatiquement le cont
    11 11 
     observe.action.back.to.list=Retour à la liste
    12 12 
     observe.action.back.to.list.tip=Retour à la liste des données
    13 13 
     observe.action.cancel=Annuler
    14 
    +observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être après supérieure ou égale à la date de fin de marée
    14 15 
     observe.action.cancel.remote.tip=Annuler la création de la configuration
    15 16 
     observe.action.cancel.server.tip=Annuler la création de la configuration
    16 17 
     observe.action.change.storage=Changer la source de données

  • validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-error-validation.xml
    ... ... @@ -25,27 +25,26 @@
    25 25 
     <validators>
    26 26
    27 27 
       <field name="vesselActivityLongline">
    28 
    -
    29 
    -    <!-- pas de vesselActivityLongline selectionne -->
    30 
    -    <field-validator type="required" short-circuit="true">
    31 
    -      <message>observe.validation.activity.required.vesselActivity</message>
    28 
    +    <field-validator type="mandatory" short-circuit="true">
    29 
    +      <message/>
    32 30 
         </field-validator>
    33 31 
       </field>
    34 32
    35 33 
       <field name="startDate">
    36 
    -
    37 
    -    <!-- pas de date selectionne -->
    38 
    -    <field-validator type="required" short-circuit="true">
    39 
    -      <message>observe.validation.activity.required.date</message>
    34 
    +    <field-validator type="mandatory" short-circuit="true">
    35 
    +      <message/>
    36 
    +    </field-validator>
    37 
    +    <field-validator type="fieldexpression" short-circuit="true">
    38 
    +      <param name="expression">
    39 
    +        <![CDATA[ currentTripLongline.endDate.time <= startDate.time ]]>
    40 
    +      </param>
    41 
    +      <message>observe.validation.activityLongline.startDate.before.currentTrip.endDate</message>
    40 42 
         </field-validator>
    41 
    -
    42 43 
       </field>
    43 44
    44 45 
       <field name="startTime">
    45 
    -
    46 
    -    <!-- pas d'heure d'observation selectionne -->
    47 
    -    <field-validator type="required" short-circuit="true">
    48 
    -      <message>observe.validation.activity.required.time</message>
    46 
    +    <field-validator type="mandatory" short-circuit="true">
    47 
    +      <message/>
    49 48 
         </field-validator>
    50 49
    51 50 
         <!-- heure observation non duplique -->
    ... ... @@ -67,7 +66,7 @@
    67 66
    68 67 
       <field name="seaSurfaceTemperature">
    69 68 
         <field-validator type="temperatureBound" short-circuit="true">
    70 
    -      <param name="min">12.0</param>
    69 
    +      <param name="min">15.0</param>
    71 70 
           <param name="max">35.0</param>
    72 71 
           <param name="defaultTemperatureFormat">C</param>
    73 72 
           <message/>

  • validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-error-validation.xml
    ... ... @@ -34,6 +34,12 @@
    34 34 
         <field-validator type="mandatory" short-circuit="true">
    35 35 
           <message/>
    36 36 
         </field-validator>
    37 
    +    <field-validator type="fieldexpression" short-circuit="true">
    38 
    +      <param name="expression">
    39 
    +        <![CDATA[ currentTripLongline.endDate.time <= startDate.time ]]>
    40 
    +      </param>
    41 
    +      <message>observe.validation.activityLongline.startDate.before.currentTrip.endDate</message>
    42 
    +    </field-validator>
    37 43 
       </field>
    38 44
    39 45 
       <field name="startTime">
    ... ... @@ -44,7 +50,7 @@
    44 50
    45 51 
       <field name="seaSurfaceTemperature">
    46 52 
         <field-validator type="temperatureBound" short-circuit="true">
    47 
    -      <param name="min">12.0</param>
    53 
    +      <param name="min">15.0</param>
    48 54 
           <param name="max">35.0</param>
    49 55 
           <param name="defaultTemperatureFormat">C</param>
    50 56 
           <message/>

  • validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-create-error-validation.xml
    ... ... @@ -343,8 +343,8 @@
    343 343 
       </field>
    344 344 
       <field name="totalHooksCount">
    345 345 
         <field-validator type="boundNumber" short-circuit="true">
    346 
    -      <param name="min">0.0</param>
    347 
    -      <param name="max">5000.0</param>
    346 
    +      <param name="min">500.0</param>
    347 
    +      <param name="max">5500.0</param>
    348 348 
           <message/>
    349 349 
         </field-validator>
    350 350 
       </field>

  • validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-update-error-validation.xml
    ... ... @@ -343,8 +343,8 @@
    343 343 
       </field>
    344 344 
       <field name="totalHooksCount">
    345 345 
         <field-validator type="boundNumber" short-circuit="true">
    346 
    -      <param name="min">0.0</param>
    347 
    -      <param name="max">5000.0</param>
    346 
    +      <param name="min">500.0</param>
    347 
    +      <param name="max">5500.0</param>
    348 348 
           <message/>
    349 349 
         </field-validator>
    350 350 
       </field>

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