Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a5ac56b6 by Tony Chemit at 2020-12-17T22:37:40+01:00 [LL][Logbook] Quadrant - Closes #1675 - - - - - 2 changed files: - services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml - services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml Changes: ===================================== services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml ===================================== @@ -103,18 +103,36 @@ </field-validator> </field> <field name="quadrant"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.data.Data.validation.required.quadrant</message> + </field-validator> <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentLlCommonTrip.ocean</param> <message/> </field-validator> </field> <field name="latitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.Id.validation.required.latitude</message> + </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> </field-validator> </field> <field name="longitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.Id.validation.required.longitude</message> + </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml ===================================== @@ -56,19 +56,38 @@ <message/> </field-validator> </field> + <field name="quadrant"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.data.Data.validation.required.quadrant</message> + </field-validator> <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentLlCommonTrip.ocean</param> <message/> </field-validator> </field> <field name="latitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.Id.validation.required.latitude</message> + </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> </field-validator> </field> <field name="longitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.Id.validation.required.longitude</message> + </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a5ac56b6f5f569078b3ed0a3c6... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a5ac56b6f5f569078b3ed0a3c6... You're receiving this email because of your account on gitlab.com.