Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fb0090f8 by Tony Chemit at 2020-12-17T22:52:49+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 ===================================== @@ -105,7 +105,7 @@ <field name="quadrant"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + <![CDATA[ quadrant != null || (latitude == null && longitude == null )]]> </param> <message>observe.data.Data.validation.required.quadrant</message> </field-validator> @@ -117,7 +117,7 @@ <field name="latitude"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + <![CDATA[ latitude != null || ( quadrant == null && longitude == null )]]> </param> <message>observe.Id.validation.required.latitude</message> </field-validator> @@ -129,7 +129,7 @@ <field name="longitude"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + <![CDATA[ longitude != null || ( quadrant == null && latitude == null )]]> </param> <message>observe.Id.validation.required.longitude</message> </field-validator> ===================================== services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml ===================================== @@ -60,7 +60,7 @@ <field name="quadrant"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + <![CDATA[ quadrant != null || (latitude == null && longitude == null )]]> </param> <message>observe.data.Data.validation.required.quadrant</message> </field-validator> @@ -72,7 +72,7 @@ <field name="latitude"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + <![CDATA[ latitude != null || ( quadrant == null && longitude == null )]]> </param> <message>observe.Id.validation.required.latitude</message> </field-validator> @@ -84,7 +84,7 @@ <field name="longitude"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + <![CDATA[ longitude != null || ( quadrant == null && latitude == null )]]> </param> <message>observe.Id.validation.required.longitude</message> </field-validator> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fb0090f8d4acbb49eb2c8c1bbd... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fb0090f8d4acbb49eb2c8c1bbd... You're receiving this email because of your account on gitlab.com.