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

Commits:

2 changed files:

Changes:

  • services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml
    ... ... @@ -103,18 +103,36 @@
    103 103 
         </field-validator>
    104 104 
       </field>
    105 105 
       <field name="quadrant">
    106 
    +    <field-validator type="fieldexpression" short-circuit="true">
    107 
    +      <param name="expression">
    108 
    +        <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
    109 
    +      </param>
    110 
    +      <message>observe.data.Data.validation.required.quadrant</message>
    111 
    +    </field-validator>
    106 112 
         <field-validator type="quadrantDto" short-circuit="true">
    107 113 
           <param name="ocean">currentLlCommonTrip.ocean</param>
    108 114 
           <message/>
    109 115 
         </field-validator>
    110 116 
       </field>
    111 117 
       <field name="latitude">
    118 
    +    <field-validator type="fieldexpression" short-circuit="true">
    119 
    +      <param name="expression">
    120 
    +        <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
    121 
    +      </param>
    122 
    +      <message>observe.Id.validation.required.latitude</message>
    123 
    +    </field-validator>
    112 124 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    113 125 
           <param name="editorName">coordinate</param>
    114 126 
           <message/>
    115 127 
         </field-validator>
    116 128 
       </field>
    117 129 
       <field name="longitude">
    130 
    +    <field-validator type="fieldexpression" short-circuit="true">
    131 
    +      <param name="expression">
    132 
    +        <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
    133 
    +      </param>
    134 
    +      <message>observe.Id.validation.required.longitude</message>
    135 
    +    </field-validator>
    118 136 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    119 137 
           <param name="editorName">coordinate</param>
    120 138 
           <message/>

  • services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml
    ... ... @@ -56,19 +56,38 @@
    56 56 
           <message/>
    57 57 
         </field-validator>
    58 58 
       </field>
    59 
    +
    59 60 
       <field name="quadrant">
    61 
    +    <field-validator type="fieldexpression" short-circuit="true">
    62 
    +      <param name="expression">
    63 
    +        <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
    64 
    +      </param>
    65 
    +      <message>observe.data.Data.validation.required.quadrant</message>
    66 
    +    </field-validator>
    60 67 
         <field-validator type="quadrantDto" short-circuit="true">
    61 68 
           <param name="ocean">currentLlCommonTrip.ocean</param>
    62 69 
           <message/>
    63 70 
         </field-validator>
    64 71 
       </field>
    65 72 
       <field name="latitude">
    73 
    +    <field-validator type="fieldexpression" short-circuit="true">
    74 
    +      <param name="expression">
    75 
    +        <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
    76 
    +      </param>
    77 
    +      <message>observe.Id.validation.required.latitude</message>
    78 
    +    </field-validator>
    66 79 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    67 80 
           <param name="editorName">coordinate</param>
    68 81 
           <message/>
    69 82 
         </field-validator>
    70 83 
       </field>
    71 84 
       <field name="longitude">
    85 
    +    <field-validator type="fieldexpression" short-circuit="true">
    86 
    +      <param name="expression">
    87 
    +        <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
    88 
    +      </param>
    89 
    +      <message>observe.Id.validation.required.longitude</message>
    90 
    +    </field-validator>
    72 91 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    73 92 
           <param name="editorName">coordinate</param>
    74 93 
           <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.