Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
fb0090f8
by Tony Chemit at 2020-12-17T22:52:49+01:00
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:
| ... | ... | @@ -105,7 +105,7 @@ |
| 105 | 105 |
<field name="quadrant">
|
| 106 | 106 |
<field-validator type="fieldexpression" short-circuit="true">
|
| 107 | 107 |
<param name="expression">
|
| 108 |
- <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
|
|
| 108 |
+ <![CDATA[ quadrant != null || (latitude == null && longitude == null )]]>
|
|
| 109 | 109 |
</param>
|
| 110 | 110 |
<message>observe.data.Data.validation.required.quadrant</message>
|
| 111 | 111 |
</field-validator>
|
| ... | ... | @@ -117,7 +117,7 @@ |
| 117 | 117 |
<field name="latitude">
|
| 118 | 118 |
<field-validator type="fieldexpression" short-circuit="true">
|
| 119 | 119 |
<param name="expression">
|
| 120 |
- <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
|
|
| 120 |
+ <![CDATA[ latitude != null || ( quadrant == null && longitude == null )]]>
|
|
| 121 | 121 |
</param>
|
| 122 | 122 |
<message>observe.Id.validation.required.latitude</message>
|
| 123 | 123 |
</field-validator>
|
| ... | ... | @@ -129,7 +129,7 @@ |
| 129 | 129 |
<field name="longitude">
|
| 130 | 130 |
<field-validator type="fieldexpression" short-circuit="true">
|
| 131 | 131 |
<param name="expression">
|
| 132 |
- <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
|
|
| 132 |
+ <![CDATA[ longitude != null || ( quadrant == null && latitude == null )]]>
|
|
| 133 | 133 |
</param>
|
| 134 | 134 |
<message>observe.Id.validation.required.longitude</message>
|
| 135 | 135 |
</field-validator>
|
| ... | ... | @@ -60,7 +60,7 @@ |
| 60 | 60 |
<field name="quadrant">
|
| 61 | 61 |
<field-validator type="fieldexpression" short-circuit="true">
|
| 62 | 62 |
<param name="expression">
|
| 63 |
- <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
|
|
| 63 |
+ <![CDATA[ quadrant != null || (latitude == null && longitude == null )]]>
|
|
| 64 | 64 |
</param>
|
| 65 | 65 |
<message>observe.data.Data.validation.required.quadrant</message>
|
| 66 | 66 |
</field-validator>
|
| ... | ... | @@ -72,7 +72,7 @@ |
| 72 | 72 |
<field name="latitude">
|
| 73 | 73 |
<field-validator type="fieldexpression" short-circuit="true">
|
| 74 | 74 |
<param name="expression">
|
| 75 |
- <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
|
|
| 75 |
+ <![CDATA[ latitude != null || ( quadrant == null && longitude == null )]]>
|
|
| 76 | 76 |
</param>
|
| 77 | 77 |
<message>observe.Id.validation.required.latitude</message>
|
| 78 | 78 |
</field-validator>
|
| ... | ... | @@ -84,7 +84,7 @@ |
| 84 | 84 |
<field name="longitude">
|
| 85 | 85 |
<field-validator type="fieldexpression" short-circuit="true">
|
| 86 | 86 |
<param name="expression">
|
| 87 |
- <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
|
|
| 87 |
+ <![CDATA[ longitude != null || ( quadrant == null && latitude == null )]]>
|
|
| 88 | 88 |
</param>
|
| 89 | 89 |
<message>observe.Id.validation.required.longitude</message>
|
| 90 | 90 |
</field-validator>
|