Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
22 changed files:
- + services/.mvn/i18n-generate
- + services/.mvn/i18n-parse-java
- + services/src/main/resources/i18n/services_en_GB.properties
- + services/src/main/resources/i18n/services_es_ES.properties
- + services/src/main/resources/i18n/services_fr_FR.properties
- validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml
- validation/src/main/resources/i18n/validation_en_GB.properties
- validation/src/main/resources/i18n/validation_es_ES.properties
- validation/src/main/resources/i18n/validation_fr_FR.properties
Changes:
| 1 |
+observe.validation.coordinate.degree.latitude.outOfBound=Latitude must be between 0 and 90.
|
|
| 2 |
+observe.validation.coordinate.degree.longitude.outOfBound=Longitude must be between 0 and 180.
|
|
| 3 |
+observe.validation.coordinate.minute.latitude.outOfBound=Latitude must be between 0 and 90.
|
|
| 4 |
+observe.validation.coordinate.minute.longitude.outOfBound=Longitude must be between 0 and 180.
|
|
| 5 |
+observe.validation.coordinate.second.latitude.outOfBound=Latitude must be between 0 and 90.
|
|
| 6 |
+observe.validation.coordinate.second.longitude.outOfBound=Longitude must be between 0 and 180.
|
| 1 |
+observe.validation.coordinate.degree.latitude.outOfBound=La latitud estar comprendida entre 0 y 90.
|
|
| 2 |
+observe.validation.coordinate.degree.longitude.outOfBound=La longitud estar comprendida entre 0 y 180.
|
|
| 3 |
+observe.validation.coordinate.minute.latitude.outOfBound=La latitud estar comprendida entre 0 y 90.
|
|
| 4 |
+observe.validation.coordinate.minute.longitude.outOfBound=La longitud estar comprendida entre 0 y 180.
|
|
| 5 |
+observe.validation.coordinate.second.latitude.outOfBound=La latitud estar comprendida entre 0 y 90.
|
|
| 6 |
+observe.validation.coordinate.second.longitude.outOfBound=La longitud estar comprendida entre 0 y 180.
|
| 1 |
+observe.validation.coordinate.degree.latitude.outOfBound=La latitude doit être comprise entre 0 et 90.
|
|
| 2 |
+observe.validation.coordinate.degree.longitude.outOfBound=La longitude doit être comprise entre 0 et 180.
|
|
| 3 |
+observe.validation.coordinate.minute.latitude.outOfBound=La latitude doit être comprise entre 0 et 90.
|
|
| 4 |
+observe.validation.coordinate.minute.longitude.outOfBound=La longitude doit être comprise entre 0 et 180.
|
|
| 5 |
+observe.validation.coordinate.second.latitude.outOfBound=La latitude doit être comprise entre 0 et 90.
|
|
| 6 |
+observe.validation.coordinate.second.longitude.outOfBound=La longitude doit être comprise entre 0 et 180.
|
| ... | ... | @@ -111,17 +111,6 @@ |
| 111 | 111 |
<message>observe.validation.activity.required.latitude</message>
|
| 112 | 112 |
</field-validator>
|
| 113 | 113 |
|
| 114 |
- <!-- 0 <= latitude <= 90 -->
|
|
| 115 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 116 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 117 |
- <param name="expression">
|
|
| 118 |
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
|
|
| 119 |
- </param>
|
|
| 120 |
- <message>
|
|
| 121 |
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
|
|
| 122 |
- </message>
|
|
| 123 |
- </field-validator>
|
|
| 124 |
- |
|
| 125 | 114 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 126 | 115 |
<param name="editorName">coordinate</param>
|
| 127 | 116 |
<message/>
|
| ... | ... | @@ -136,17 +125,6 @@ |
| 136 | 125 |
<message>observe.validation.activity.required.longitude</message>
|
| 137 | 126 |
</field-validator>
|
| 138 | 127 |
|
| 139 |
- <!-- 0 <= longitude <= 180 -->
|
|
| 140 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 141 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 142 |
- <param name="expression">
|
|
| 143 |
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
|
|
| 144 |
- </param>
|
|
| 145 |
- <message>
|
|
| 146 |
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
|
|
| 147 |
- </message>
|
|
| 148 |
- </field-validator>
|
|
| 149 |
- |
|
| 150 | 128 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 151 | 129 |
<param name="editorName">coordinate</param>
|
| 152 | 130 |
<message/>
|
| ... | ... | @@ -96,18 +96,6 @@ |
| 96 | 96 |
<message>observe.validation.activity.required.latitude</message>
|
| 97 | 97 |
</field-validator>
|
| 98 | 98 |
|
| 99 |
- <!-- 0 <= latitude <= 90 -->
|
|
| 100 |
- |
|
| 101 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 102 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 103 |
- <param name="expression">
|
|
| 104 |
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
|
|
| 105 |
- </param>
|
|
| 106 |
- <message>
|
|
| 107 |
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
|
|
| 108 |
- </message>
|
|
| 109 |
- </field-validator>
|
|
| 110 |
- |
|
| 111 | 99 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 112 | 100 |
<param name="editorName">coordinate</param>
|
| 113 | 101 |
<message/>
|
| ... | ... | @@ -122,17 +110,6 @@ |
| 122 | 110 |
<message>observe.validation.activity.required.longitude</message>
|
| 123 | 111 |
</field-validator>
|
| 124 | 112 |
|
| 125 |
- <!-- 0 <= longitude <= 180 -->
|
|
| 126 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 127 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 128 |
- <param name="expression">
|
|
| 129 |
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
|
|
| 130 |
- </param>
|
|
| 131 |
- <message>
|
|
| 132 |
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
|
|
| 133 |
- </message>
|
|
| 134 |
- </field-validator>
|
|
| 135 |
- |
|
| 136 | 113 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 137 | 114 |
<param name="editorName">coordinate</param>
|
| 138 | 115 |
<message/>
|
| ... | ... | @@ -112,17 +112,6 @@ |
| 112 | 112 |
<message>observe.validation.activity.required.latitude</message>
|
| 113 | 113 |
</field-validator>
|
| 114 | 114 |
|
| 115 |
- <!-- 0 <= latitude <= 90 -->
|
|
| 116 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 117 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 118 |
- <param name="expression">
|
|
| 119 |
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
|
|
| 120 |
- </param>
|
|
| 121 |
- <message>
|
|
| 122 |
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
|
|
| 123 |
- </message>
|
|
| 124 |
- </field-validator>
|
|
| 125 |
- |
|
| 126 | 115 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 127 | 116 |
<param name="editorName">coordinate</param>
|
| 128 | 117 |
<message/>
|
| ... | ... | @@ -137,17 +126,6 @@ |
| 137 | 126 |
<message>observe.validation.activity.required.longitude</message>
|
| 138 | 127 |
</field-validator>
|
| 139 | 128 |
|
| 140 |
- <!-- 0 <= longitude <= 180 -->
|
|
| 141 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 142 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 143 |
- <param name="expression">
|
|
| 144 |
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
|
|
| 145 |
- </param>
|
|
| 146 |
- <message>
|
|
| 147 |
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
|
|
| 148 |
- </message>
|
|
| 149 |
- </field-validator>
|
|
| 150 |
- |
|
| 151 | 129 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 152 | 130 |
<param name="editorName">coordinate</param>
|
| 153 | 131 |
<message/>
|
| ... | ... | @@ -97,18 +97,6 @@ |
| 97 | 97 |
<message>observe.validation.activity.required.latitude</message>
|
| 98 | 98 |
</field-validator>
|
| 99 | 99 |
|
| 100 |
- <!-- 0 <= latitude <= 90 -->
|
|
| 101 |
- |
|
| 102 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 103 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 104 |
- <param name="expression">
|
|
| 105 |
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
|
|
| 106 |
- </param>
|
|
| 107 |
- <message>
|
|
| 108 |
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
|
|
| 109 |
- </message>
|
|
| 110 |
- </field-validator>
|
|
| 111 |
- |
|
| 112 | 100 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 113 | 101 |
<param name="editorName">coordinate</param>
|
| 114 | 102 |
<message/>
|
| ... | ... | @@ -123,17 +111,6 @@ |
| 123 | 111 |
<message>observe.validation.activity.required.longitude</message>
|
| 124 | 112 |
</field-validator>
|
| 125 | 113 |
|
| 126 |
- <!-- 0 <= longitude <= 180 -->
|
|
| 127 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 128 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 129 |
- <param name="expression">
|
|
| 130 |
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
|
|
| 131 |
- </param>
|
|
| 132 |
- <message>
|
|
| 133 |
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
|
|
| 134 |
- </message>
|
|
| 135 |
- </field-validator>
|
|
| 136 |
- |
|
| 137 | 114 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 138 | 115 |
<param name="editorName">coordinate</param>
|
| 139 | 116 |
<message/>
|
| ... | ... | @@ -56,17 +56,6 @@ |
| 56 | 56 |
<message>observe.validation.activity.required.latitude</message>
|
| 57 | 57 |
</field-validator>
|
| 58 | 58 |
|
| 59 |
- <!-- 0 <= latitude <= 90 -->
|
|
| 60 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 61 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 62 |
- <param name="expression">
|
|
| 63 |
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
|
|
| 64 |
- </param>
|
|
| 65 |
- <message>
|
|
| 66 |
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
|
|
| 67 |
- </message>
|
|
| 68 |
- </field-validator>
|
|
| 69 |
- |
|
| 70 | 59 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 71 | 60 |
<param name="editorName">coordinate</param>
|
| 72 | 61 |
<message/>
|
| ... | ... | @@ -81,15 +70,9 @@ |
| 81 | 70 |
<message>observe.validation.activity.required.longitude</message>
|
| 82 | 71 |
</field-validator>
|
| 83 | 72 |
|
| 84 |
- <!-- 0 <= longitude <= 180 -->
|
|
| 85 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 86 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 87 |
- <param name="expression">
|
|
| 88 |
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
|
|
| 89 |
- </param>
|
|
| 90 |
- <message>
|
|
| 91 |
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
|
|
| 92 |
- </message>
|
|
| 73 |
+ <field-validator type="coordinateLongitudeDto" short-circuit="true">
|
|
| 74 |
+ <param name="editorName">coordinate</param>
|
|
| 75 |
+ <message/>
|
|
| 93 | 76 |
</field-validator>
|
| 94 | 77 |
|
| 95 | 78 |
</field>
|
| ... | ... | @@ -57,17 +57,6 @@ |
| 57 | 57 |
<message>observe.validation.activity.required.latitude</message>
|
| 58 | 58 |
</field-validator>
|
| 59 | 59 |
|
| 60 |
- <!-- 0 <= latitude <= 90 -->
|
|
| 61 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 62 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 63 |
- <param name="expression">
|
|
| 64 |
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
|
|
| 65 |
- </param>
|
|
| 66 |
- <message>
|
|
| 67 |
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
|
|
| 68 |
- </message>
|
|
| 69 |
- </field-validator>
|
|
| 70 |
- |
|
| 71 | 60 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 72 | 61 |
<param name="editorName">coordinate</param>
|
| 73 | 62 |
<message/>
|
| ... | ... | @@ -82,17 +71,6 @@ |
| 82 | 71 |
<message>observe.validation.activity.required.longitude</message>
|
| 83 | 72 |
</field-validator>
|
| 84 | 73 |
|
| 85 |
- <!-- 0 <= longitude <= 180 -->
|
|
| 86 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 87 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 88 |
- <param name="expression">
|
|
| 89 |
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
|
|
| 90 |
- </param>
|
|
| 91 |
- <message>
|
|
| 92 |
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
|
|
| 93 |
- </message>
|
|
| 94 |
- </field-validator>
|
|
| 95 |
- |
|
| 96 | 74 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 97 | 75 |
<param name="editorName">coordinate</param>
|
| 98 | 76 |
<message/>
|
| ... | ... | @@ -230,17 +230,6 @@ |
| 230 | 230 |
<message>observe.validation.setLongline.required.settingStartLatitude</message>
|
| 231 | 231 |
</field-validator>
|
| 232 | 232 |
|
| 233 |
- <!-- 0 <= settingStartLatitude <= 90 -->
|
|
| 234 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 235 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 236 |
- <param name="expression">
|
|
| 237 |
- <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]>
|
|
| 238 |
- </param>
|
|
| 239 |
- <message>
|
|
| 240 |
- observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max}
|
|
| 241 |
- </message>
|
|
| 242 |
- </field-validator>
|
|
| 243 |
- |
|
| 244 | 233 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 245 | 234 |
<param name="editorName">settingStart</param>
|
| 246 | 235 |
<message/>
|
| ... | ... | @@ -255,17 +244,6 @@ |
| 255 | 244 |
<message>observe.validation.setLongline.required.settingStartLongitude</message>
|
| 256 | 245 |
</field-validator>
|
| 257 | 246 |
|
| 258 |
- <!-- 0 <= settingStartLongitude <= 180 -->
|
|
| 259 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 260 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 261 |
- <param name="expression">
|
|
| 262 |
- <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]>
|
|
| 263 |
- </param>
|
|
| 264 |
- <message>
|
|
| 265 |
- observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max}
|
|
| 266 |
- </message>
|
|
| 267 |
- </field-validator>
|
|
| 268 |
- |
|
| 269 | 247 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 270 | 248 |
<param name="editorName">settingStart</param>
|
| 271 | 249 |
<message/>
|
| ... | ... | @@ -275,7 +253,10 @@ |
| 275 | 253 |
|
| 276 | 254 |
<field name="settingEndQuadrant">
|
| 277 | 255 |
|
| 278 |
- <field-validator type="required" short-circuit="true">
|
|
| 256 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 257 |
+ <param name="expression">
|
|
| 258 |
+ <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]>
|
|
| 259 |
+ </param>
|
|
| 279 | 260 |
<message>observe.validation.setLongline.required.quadrant</message>
|
| 280 | 261 |
</field-validator>
|
| 281 | 262 |
|
| ... | ... | @@ -291,20 +272,11 @@ |
| 291 | 272 |
|
| 292 | 273 |
<field name="settingEndLatitude">
|
| 293 | 274 |
|
| 294 |
- <!-- settingEndLatitude obligatoire -->
|
|
| 295 |
- <field-validator type="required" short-circuit="true">
|
|
| 296 |
- <message>observe.validation.setLongline.required.settingEndLatitude</message>
|
|
| 297 |
- </field-validator>
|
|
| 298 |
- |
|
| 299 |
- <!-- 0 <= settingEndLatitude <= 90 -->
|
|
| 300 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 301 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 275 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 302 | 276 |
<param name="expression">
|
| 303 |
- <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]>
|
|
| 277 |
+ <![CDATA[ settingEndLatitude != null || ( settingEndQuadrant == null && settingEndLongitude == null )]]>
|
|
| 304 | 278 |
</param>
|
| 305 |
- <message>
|
|
| 306 |
- observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max}
|
|
| 307 |
- </message>
|
|
| 279 |
+ <message>observe.validation.setLongline.required.settingEndLatitude</message>
|
|
| 308 | 280 |
</field-validator>
|
| 309 | 281 |
|
| 310 | 282 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| ... | ... | @@ -316,20 +288,11 @@ |
| 316 | 288 |
|
| 317 | 289 |
<field name="settingEndLongitude">
|
| 318 | 290 |
|
| 319 |
- <!-- settingEndLongitude obligatoire -->
|
|
| 320 |
- <field-validator type="required" short-circuit="true">
|
|
| 321 |
- <message>observe.validation.setLongline.required.settingEndLongitude</message>
|
|
| 322 |
- </field-validator>
|
|
| 323 |
- |
|
| 324 |
- <!-- 0 <= settingEndLongitude <= 180 -->
|
|
| 325 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 326 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 291 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 327 | 292 |
<param name="expression">
|
| 328 |
- <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]>
|
|
| 293 |
+ <![CDATA[ settingEndLongitude != null || ( settingEndQuadrant == null && settingEndLatitude == null )]]>
|
|
| 329 | 294 |
</param>
|
| 330 |
- <message>
|
|
| 331 |
- observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max}
|
|
| 332 |
- </message>
|
|
| 295 |
+ <message>observe.validation.setLongline.required.settingEndLongitude</message>
|
|
| 333 | 296 |
</field-validator>
|
| 334 | 297 |
|
| 335 | 298 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| ... | ... | @@ -341,7 +304,10 @@ |
| 341 | 304 |
|
| 342 | 305 |
<field name="haulingStartQuadrant">
|
| 343 | 306 |
|
| 344 |
- <field-validator type="required" short-circuit="true">
|
|
| 307 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 308 |
+ <param name="expression">
|
|
| 309 |
+ <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]>
|
|
| 310 |
+ </param>
|
|
| 345 | 311 |
<message>observe.validation.setLongline.required.quadrant</message>
|
| 346 | 312 |
</field-validator>
|
| 347 | 313 |
|
| ... | ... | @@ -357,20 +323,11 @@ |
| 357 | 323 |
|
| 358 | 324 |
<field name="haulingStartLatitude">
|
| 359 | 325 |
|
| 360 |
- <!-- haulingStartLatitude obligatoire -->
|
|
| 361 |
- <field-validator type="required" short-circuit="true">
|
|
| 362 |
- <message>observe.validation.setLongline.required.haulingStartLatitude</message>
|
|
| 363 |
- </field-validator>
|
|
| 364 |
- |
|
| 365 |
- <!-- 0 <= haulingStartLatitude <= 90 -->
|
|
| 366 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 367 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 326 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 368 | 327 |
<param name="expression">
|
| 369 |
- <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]>
|
|
| 328 |
+ <![CDATA[ haulingStartLatitude != null || ( haulingStartQuadrant == null && haulingStartLongitude == null )]]>
|
|
| 370 | 329 |
</param>
|
| 371 |
- <message>
|
|
| 372 |
- observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max}
|
|
| 373 |
- </message>
|
|
| 330 |
+ <message>observe.validation.setLongline.required.haulingStartLatitude</message>
|
|
| 374 | 331 |
</field-validator>
|
| 375 | 332 |
|
| 376 | 333 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| ... | ... | @@ -382,20 +339,11 @@ |
| 382 | 339 |
|
| 383 | 340 |
<field name="haulingStartLongitude">
|
| 384 | 341 |
|
| 385 |
- <!-- haulingStartLongitude obligatoire -->
|
|
| 386 |
- <field-validator type="required" short-circuit="true">
|
|
| 387 |
- <message>observe.validation.setLongline.required.haulingStartLongitude</message>
|
|
| 388 |
- </field-validator>
|
|
| 389 |
- |
|
| 390 |
- <!-- 0 <= haulingStartLongitude <= 180 -->
|
|
| 391 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 392 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 342 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 393 | 343 |
<param name="expression">
|
| 394 |
- <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]>
|
|
| 344 |
+ <![CDATA[ haulingStartLongitude != null || ( haulingStartQuadrant == null && haulingStartLatitude == null )]]>
|
|
| 395 | 345 |
</param>
|
| 396 |
- <message>
|
|
| 397 |
- observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max}
|
|
| 398 |
- </message>
|
|
| 346 |
+ <message>observe.validation.setLongline.required.haulingStartLongitude</message>
|
|
| 399 | 347 |
</field-validator>
|
| 400 | 348 |
|
| 401 | 349 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| ... | ... | @@ -407,7 +355,10 @@ |
| 407 | 355 |
|
| 408 | 356 |
<field name="haulingEndQuadrant">
|
| 409 | 357 |
|
| 410 |
- <field-validator type="required" short-circuit="true">
|
|
| 358 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 359 |
+ <param name="expression">
|
|
| 360 |
+ <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]>
|
|
| 361 |
+ </param>
|
|
| 411 | 362 |
<message>observe.validation.setLongline.required.quadrant</message>
|
| 412 | 363 |
</field-validator>
|
| 413 | 364 |
|
| ... | ... | @@ -423,20 +374,11 @@ |
| 423 | 374 |
|
| 424 | 375 |
<field name="haulingEndLatitude">
|
| 425 | 376 |
|
| 426 |
- <!-- haulingEndLatitude obligatoire -->
|
|
| 427 |
- <field-validator type="required" short-circuit="true">
|
|
| 428 |
- <message>observe.validation.setLongline.required.haulingEndLatitude</message>
|
|
| 429 |
- </field-validator>
|
|
| 430 |
- |
|
| 431 |
- <!-- 0 <= haulingEndLatitude <= 90 -->
|
|
| 432 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 433 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 377 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 434 | 378 |
<param name="expression">
|
| 435 |
- <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]>
|
|
| 379 |
+ <![CDATA[ haulingEndLatitude != null || ( haulingEndQuadrant == null && haulingEndLongitude == null )]]>
|
|
| 436 | 380 |
</param>
|
| 437 |
- <message>
|
|
| 438 |
- observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max}
|
|
| 439 |
- </message>
|
|
| 381 |
+ <message>observe.validation.setLongline.required.haulingEndLatitude</message>
|
|
| 440 | 382 |
</field-validator>
|
| 441 | 383 |
|
| 442 | 384 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| ... | ... | @@ -448,20 +390,11 @@ |
| 448 | 390 |
|
| 449 | 391 |
<field name="haulingEndLongitude">
|
| 450 | 392 |
|
| 451 |
- <!-- haulingEndLongitude obligatoire -->
|
|
| 452 |
- <field-validator type="required" short-circuit="true">
|
|
| 453 |
- <message>observe.validation.setLongline.required.haulingEndLongitude</message>
|
|
| 454 |
- </field-validator>
|
|
| 455 |
- |
|
| 456 |
- <!-- 0 <= haulingEndLongitude <= 180 -->
|
|
| 457 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 458 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 393 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 459 | 394 |
<param name="expression">
|
| 460 |
- <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]>
|
|
| 395 |
+ <![CDATA[ haulingEndLongitude != null || ( haulingEndQuadrant == null && haulingEndLatitude == null )]]>
|
|
| 461 | 396 |
</param>
|
| 462 |
- <message>
|
|
| 463 |
- observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max}
|
|
| 464 |
- </message>
|
|
| 397 |
+ <message>observe.validation.setLongline.required.haulingEndLongitude</message>
|
|
| 465 | 398 |
</field-validator>
|
| 466 | 399 |
|
| 467 | 400 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| ... | ... | @@ -42,4 +42,102 @@ |
| 42 | 42 |
|
| 43 | 43 |
</field>
|
| 44 | 44 |
|
| 45 |
+ <field name="settingEndQuadrant">
|
|
| 46 |
+ |
|
| 47 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 48 |
+ <param name="expression">
|
|
| 49 |
+ <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
|
|
| 50 |
+ </param>
|
|
| 51 |
+ <message>observe.validation.setLongline.required.quadrant</message>
|
|
| 52 |
+ </field-validator>
|
|
| 53 |
+ |
|
| 54 |
+ </field>
|
|
| 55 |
+ |
|
| 56 |
+ <field name="settingEndLatitude">
|
|
| 57 |
+ |
|
| 58 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 59 |
+ <param name="expression">
|
|
| 60 |
+ <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
|
|
| 61 |
+ </param>
|
|
| 62 |
+ <message>observe.validation.setLongline.required.settingEndLatitude</message>
|
|
| 63 |
+ </field-validator>
|
|
| 64 |
+ |
|
| 65 |
+ </field>
|
|
| 66 |
+ |
|
| 67 |
+ <field name="settingEndLongitude">
|
|
| 68 |
+ |
|
| 69 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 70 |
+ <param name="expression">
|
|
| 71 |
+ <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
|
|
| 72 |
+ </param>
|
|
| 73 |
+ <message>observe.validation.setLongline.required.settingEndLongitude</message>
|
|
| 74 |
+ </field-validator>
|
|
| 75 |
+ |
|
| 76 |
+ </field>
|
|
| 77 |
+ |
|
| 78 |
+ <field name="haulingStartQuadrant">
|
|
| 79 |
+ |
|
| 80 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 81 |
+ <param name="expression">
|
|
| 82 |
+ <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
|
|
| 83 |
+ </param>
|
|
| 84 |
+ <message>observe.validation.setLongline.required.quadrant</message>
|
|
| 85 |
+ </field-validator>
|
|
| 86 |
+ |
|
| 87 |
+ </field>
|
|
| 88 |
+ |
|
| 89 |
+ <field name="haulingStartLatitude">
|
|
| 90 |
+ |
|
| 91 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 92 |
+ <param name="expression">
|
|
| 93 |
+ <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
|
|
| 94 |
+ </param>
|
|
| 95 |
+ <message>observe.validation.setLongline.required.haulingStartLatitude</message>
|
|
| 96 |
+ </field-validator>
|
|
| 97 |
+ |
|
| 98 |
+ </field>
|
|
| 99 |
+ |
|
| 100 |
+ <field name="haulingStartLongitude">
|
|
| 101 |
+ |
|
| 102 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 103 |
+ <param name="expression">
|
|
| 104 |
+ <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
|
|
| 105 |
+ </param>
|
|
| 106 |
+ <message>observe.validation.setLongline.required.haulingStartLongitude</message>
|
|
| 107 |
+ </field-validator>
|
|
| 108 |
+ |
|
| 109 |
+ </field>
|
|
| 110 |
+ |
|
| 111 |
+ <field name="haulingEndQuadrant">
|
|
| 112 |
+ |
|
| 113 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 114 |
+ <param name="expression">
|
|
| 115 |
+ <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
|
|
| 116 |
+ </param>
|
|
| 117 |
+ <message>observe.validation.setLongline.required.quadrant</message>
|
|
| 118 |
+ </field-validator>
|
|
| 119 |
+ |
|
| 120 |
+ </field>
|
|
| 121 |
+ |
|
| 122 |
+ <field name="haulingEndLatitude">
|
|
| 123 |
+ |
|
| 124 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 125 |
+ <param name="expression">
|
|
| 126 |
+ <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
|
|
| 127 |
+ </param>
|
|
| 128 |
+ <message>observe.validation.setLongline.required.haulingEndLatitude</message>
|
|
| 129 |
+ </field-validator>
|
|
| 130 |
+ </field>
|
|
| 131 |
+ |
|
| 132 |
+ <field name="haulingEndLongitude">
|
|
| 133 |
+ |
|
| 134 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 135 |
+ <param name="expression">
|
|
| 136 |
+ <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
|
|
| 137 |
+ </param>
|
|
| 138 |
+ <message>observe.validation.setLongline.required.haulingEndLongitude</message>
|
|
| 139 |
+ </field-validator>
|
|
| 140 |
+ |
|
| 141 |
+ </field>
|
|
| 142 |
+ |
|
| 45 | 143 |
</validators>
|
| ... | ... | @@ -214,17 +214,6 @@ |
| 214 | 214 |
<message>observe.validation.setLongline.required.settingStartLatitude</message>
|
| 215 | 215 |
</field-validator>
|
| 216 | 216 |
|
| 217 |
- <!-- 0 <= settingStartLatitude <= 90 -->
|
|
| 218 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 219 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 220 |
- <param name="expression">
|
|
| 221 |
- <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]>
|
|
| 222 |
- </param>
|
|
| 223 |
- <message>
|
|
| 224 |
- observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max}
|
|
| 225 |
- </message>
|
|
| 226 |
- </field-validator>
|
|
| 227 |
- |
|
| 228 | 217 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 229 | 218 |
<param name="editorName">settingStart</param>
|
| 230 | 219 |
<message/>
|
| ... | ... | @@ -239,17 +228,6 @@ |
| 239 | 228 |
<message>observe.validation.setLongline.required.settingStartLongitude</message>
|
| 240 | 229 |
</field-validator>
|
| 241 | 230 |
|
| 242 |
- <!-- 0 <= settingStartLongitude <= 180 -->
|
|
| 243 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 244 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 245 |
- <param name="expression">
|
|
| 246 |
- <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]>
|
|
| 247 |
- </param>
|
|
| 248 |
- <message>
|
|
| 249 |
- observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max}
|
|
| 250 |
- </message>
|
|
| 251 |
- </field-validator>
|
|
| 252 |
- |
|
| 253 | 231 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 254 | 232 |
<param name="editorName">settingStart</param>
|
| 255 | 233 |
<message/>
|
| ... | ... | @@ -257,11 +235,13 @@ |
| 257 | 235 |
|
| 258 | 236 |
</field>
|
| 259 | 237 |
|
| 260 |
- <field name="settingStartQuadrant">
|
|
| 238 |
+ <field name="settingEndQuadrant">
|
|
| 261 | 239 |
|
| 262 |
- <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
|
|
| 263 |
- <field-validator type="required" short-circuit="true">
|
|
| 264 |
- <message>observe.validation.activity.required.quadrant</message>
|
|
| 240 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 241 |
+ <param name="expression">
|
|
| 242 |
+ <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]>
|
|
| 243 |
+ </param>
|
|
| 244 |
+ <message>observe.validation.setLongline.required.quadrant</message>
|
|
| 265 | 245 |
</field-validator>
|
| 266 | 246 |
|
| 267 | 247 |
<!-- coherence quadrant par rapport a l'ocean de la maree -->
|
| ... | ... | @@ -276,20 +256,11 @@ |
| 276 | 256 |
|
| 277 | 257 |
<field name="settingEndLatitude">
|
| 278 | 258 |
|
| 279 |
- <!-- settingEndLatitude obligatoire -->
|
|
| 280 |
- <field-validator type="required" short-circuit="true">
|
|
| 281 |
- <message>observe.validation.setLongline.required.settingEndLatitude</message>
|
|
| 282 |
- </field-validator>
|
|
| 283 |
- |
|
| 284 |
- <!-- 0 <= settingEndLatitude <= 90 -->
|
|
| 285 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 286 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 259 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 287 | 260 |
<param name="expression">
|
| 288 |
- <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]>
|
|
| 261 |
+ <![CDATA[ settingEndLatitude != null || ( settingEndQuadrant == null && settingEndLongitude == null )]]>
|
|
| 289 | 262 |
</param>
|
| 290 |
- <message>
|
|
| 291 |
- observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max}
|
|
| 292 |
- </message>
|
|
| 263 |
+ <message>observe.validation.setLongline.required.settingEndLatitude</message>
|
|
| 293 | 264 |
</field-validator>
|
| 294 | 265 |
|
| 295 | 266 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| ... | ... | @@ -301,20 +272,11 @@ |
| 301 | 272 |
|
| 302 | 273 |
<field name="settingEndLongitude">
|
| 303 | 274 |
|
| 304 |
- <!-- settingEndLongitude obligatoire -->
|
|
| 305 |
- <field-validator type="required" short-circuit="true">
|
|
| 306 |
- <message>observe.validation.setLongline.required.settingEndLongitude</message>
|
|
| 307 |
- </field-validator>
|
|
| 308 |
- |
|
| 309 |
- <!-- 0 <= settingEndLongitude <= 180 -->
|
|
| 310 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 311 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 275 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 312 | 276 |
<param name="expression">
|
| 313 |
- <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]>
|
|
| 277 |
+ <![CDATA[ settingEndLongitude != null || ( settingEndQuadrant == null && settingEndLatitude == null )]]>
|
|
| 314 | 278 |
</param>
|
| 315 |
- <message>
|
|
| 316 |
- observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max}
|
|
| 317 |
- </message>
|
|
| 279 |
+ <message>observe.validation.setLongline.required.settingEndLongitude</message>
|
|
| 318 | 280 |
</field-validator>
|
| 319 | 281 |
|
| 320 | 282 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| ... | ... | @@ -324,11 +286,13 @@ |
| 324 | 286 |
|
| 325 | 287 |
</field>
|
| 326 | 288 |
|
| 327 |
- <field name="settingEndQuadrant">
|
|
| 289 |
+ <field name="haulingStartQuadrant">
|
|
| 328 | 290 |
|
| 329 |
- <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
|
|
| 330 |
- <field-validator type="required" short-circuit="true">
|
|
| 331 |
- <message>observe.validation.activity.required.quadrant</message>
|
|
| 291 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 292 |
+ <param name="expression">
|
|
| 293 |
+ <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]>
|
|
| 294 |
+ </param>
|
|
| 295 |
+ <message>observe.validation.setLongline.required.quadrant</message>
|
|
| 332 | 296 |
</field-validator>
|
| 333 | 297 |
|
| 334 | 298 |
<!-- coherence quadrant par rapport a l'ocean de la maree -->
|
| ... | ... | @@ -343,20 +307,11 @@ |
| 343 | 307 |
|
| 344 | 308 |
<field name="haulingStartLatitude">
|
| 345 | 309 |
|
| 346 |
- <!-- haulingStartLatitude obligatoire -->
|
|
| 347 |
- <field-validator type="required" short-circuit="true">
|
|
| 348 |
- <message>observe.validation.setLongline.required.haulingStartLatitude</message>
|
|
| 349 |
- </field-validator>
|
|
| 350 |
- |
|
| 351 |
- <!-- 0 <= haulingStartLatitude <= 90 -->
|
|
| 352 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 353 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 310 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 354 | 311 |
<param name="expression">
|
| 355 |
- <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]>
|
|
| 312 |
+ <![CDATA[ haulingStartLatitude != null || ( haulingStartQuadrant == null && haulingStartLongitude == null )]]>
|
|
| 356 | 313 |
</param>
|
| 357 |
- <message>
|
|
| 358 |
- observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max}
|
|
| 359 |
- </message>
|
|
| 314 |
+ <message>observe.validation.setLongline.required.haulingStartLatitude</message>
|
|
| 360 | 315 |
</field-validator>
|
| 361 | 316 |
|
| 362 | 317 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| ... | ... | @@ -368,20 +323,11 @@ |
| 368 | 323 |
|
| 369 | 324 |
<field name="haulingStartLongitude">
|
| 370 | 325 |
|
| 371 |
- <!-- haulingStartLongitude obligatoire -->
|
|
| 372 |
- <field-validator type="required" short-circuit="true">
|
|
| 373 |
- <message>observe.validation.setLongline.required.haulingStartLongitude</message>
|
|
| 374 |
- </field-validator>
|
|
| 375 |
- |
|
| 376 |
- <!-- 0 <= haulingStartLongitude <= 180 -->
|
|
| 377 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 378 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 326 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 379 | 327 |
<param name="expression">
|
| 380 |
- <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]>
|
|
| 328 |
+ <![CDATA[ haulingStartLongitude != null || ( haulingStartQuadrant == null && haulingStartLatitude == null )]]>
|
|
| 381 | 329 |
</param>
|
| 382 |
- <message>
|
|
| 383 |
- observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max}
|
|
| 384 |
- </message>
|
|
| 330 |
+ <message>observe.validation.setLongline.required.haulingStartLongitude</message>
|
|
| 385 | 331 |
</field-validator>
|
| 386 | 332 |
|
| 387 | 333 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| ... | ... | @@ -391,11 +337,13 @@ |
| 391 | 337 |
|
| 392 | 338 |
</field>
|
| 393 | 339 |
|
| 394 |
- <field name="haulingStartQuadrant">
|
|
| 340 |
+ <field name="haulingEndQuadrant">
|
|
| 395 | 341 |
|
| 396 |
- <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
|
|
| 397 |
- <field-validator type="required" short-circuit="true">
|
|
| 398 |
- <message>observe.validation.activity.required.quadrant</message>
|
|
| 342 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 343 |
+ <param name="expression">
|
|
| 344 |
+ <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]>
|
|
| 345 |
+ </param>
|
|
| 346 |
+ <message>observe.validation.setLongline.required.quadrant</message>
|
|
| 399 | 347 |
</field-validator>
|
| 400 | 348 |
|
| 401 | 349 |
<!-- coherence quadrant par rapport a l'ocean de la maree -->
|
| ... | ... | @@ -410,20 +358,11 @@ |
| 410 | 358 |
|
| 411 | 359 |
<field name="haulingEndLatitude">
|
| 412 | 360 |
|
| 413 |
- <!-- haulingEndLatitude obligatoire -->
|
|
| 414 |
- <field-validator type="required" short-circuit="true">
|
|
| 415 |
- <message>observe.validation.setLongline.required.haulingEndLatitude</message>
|
|
| 416 |
- </field-validator>
|
|
| 417 |
- |
|
| 418 |
- <!-- 0 <= haulingEndLatitude <= 90 -->
|
|
| 419 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 420 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 361 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 421 | 362 |
<param name="expression">
|
| 422 |
- <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]>
|
|
| 363 |
+ <![CDATA[ haulingEndLatitude != null || ( haulingEndQuadrant == null && haulingEndLongitude == null )]]>
|
|
| 423 | 364 |
</param>
|
| 424 |
- <message>
|
|
| 425 |
- observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max}
|
|
| 426 |
- </message>
|
|
| 365 |
+ <message>observe.validation.setLongline.required.haulingEndLatitude</message>
|
|
| 427 | 366 |
</field-validator>
|
| 428 | 367 |
|
| 429 | 368 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| ... | ... | @@ -435,20 +374,11 @@ |
| 435 | 374 |
|
| 436 | 375 |
<field name="haulingEndLongitude">
|
| 437 | 376 |
|
| 438 |
- <!-- haulingEndLongitude obligatoire -->
|
|
| 439 |
- <field-validator type="required" short-circuit="true">
|
|
| 440 |
- <message>observe.validation.setLongline.required.haulingEndLongitude</message>
|
|
| 441 |
- </field-validator>
|
|
| 442 |
- |
|
| 443 |
- <!-- 0 <= haulingEndLongitude <= 180 -->
|
|
| 444 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 445 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 377 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 446 | 378 |
<param name="expression">
|
| 447 |
- <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]>
|
|
| 379 |
+ <![CDATA[ haulingEndLongitude != null || ( haulingEndQuadrant == null && haulingEndLatitude == null )]]>
|
|
| 448 | 380 |
</param>
|
| 449 |
- <message>
|
|
| 450 |
- observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max}
|
|
| 451 |
- </message>
|
|
| 381 |
+ <message>observe.validation.setLongline.required.haulingEndLongitude</message>
|
|
| 452 | 382 |
</field-validator>
|
| 453 | 383 |
|
| 454 | 384 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| ... | ... | @@ -458,23 +388,6 @@ |
| 458 | 388 |
|
| 459 | 389 |
</field>
|
| 460 | 390 |
|
| 461 |
- <field name="haulingEndQuadrant">
|
|
| 462 |
- |
|
| 463 |
- <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
|
|
| 464 |
- <field-validator type="required" short-circuit="true">
|
|
| 465 |
- <message>observe.validation.activity.required.quadrant</message>
|
|
| 466 |
- </field-validator>
|
|
| 467 |
- |
|
| 468 |
- <!-- coherence quadrant par rapport a l'ocean de la maree -->
|
|
| 469 |
- <field-validator type="quadrantDto" short-circuit="true">
|
|
| 470 |
- <param name="ocean">currentTripLongline.ocean</param>
|
|
| 471 |
- <message>
|
|
| 472 |
- observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
|
|
| 473 |
- </message>
|
|
| 474 |
- </field-validator>
|
|
| 475 |
- |
|
| 476 |
- </field>
|
|
| 477 |
- |
|
| 478 | 391 |
<field name="settingShape">
|
| 479 | 392 |
|
| 480 | 393 |
<!-- settingShape desactive -->
|
| ... | ... | @@ -42,4 +42,102 @@ |
| 42 | 42 |
|
| 43 | 43 |
</field>
|
| 44 | 44 |
|
| 45 |
+ <field name="settingEndQuadrant">
|
|
| 46 |
+ |
|
| 47 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 48 |
+ <param name="expression">
|
|
| 49 |
+ <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
|
|
| 50 |
+ </param>
|
|
| 51 |
+ <message>observe.validation.setLongline.required.quadrant</message>
|
|
| 52 |
+ </field-validator>
|
|
| 53 |
+ |
|
| 54 |
+ </field>
|
|
| 55 |
+ |
|
| 56 |
+ <field name="settingEndLatitude">
|
|
| 57 |
+ |
|
| 58 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 59 |
+ <param name="expression">
|
|
| 60 |
+ <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
|
|
| 61 |
+ </param>
|
|
| 62 |
+ <message>observe.validation.setLongline.required.settingEndLatitude</message>
|
|
| 63 |
+ </field-validator>
|
|
| 64 |
+ |
|
| 65 |
+ </field>
|
|
| 66 |
+ |
|
| 67 |
+ <field name="settingEndLongitude">
|
|
| 68 |
+ |
|
| 69 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 70 |
+ <param name="expression">
|
|
| 71 |
+ <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
|
|
| 72 |
+ </param>
|
|
| 73 |
+ <message>observe.validation.setLongline.required.settingEndLongitude</message>
|
|
| 74 |
+ </field-validator>
|
|
| 75 |
+ |
|
| 76 |
+ </field>
|
|
| 77 |
+ |
|
| 78 |
+ <field name="haulingStartQuadrant">
|
|
| 79 |
+ |
|
| 80 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 81 |
+ <param name="expression">
|
|
| 82 |
+ <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
|
|
| 83 |
+ </param>
|
|
| 84 |
+ <message>observe.validation.setLongline.required.quadrant</message>
|
|
| 85 |
+ </field-validator>
|
|
| 86 |
+ |
|
| 87 |
+ </field>
|
|
| 88 |
+ |
|
| 89 |
+ <field name="haulingStartLatitude">
|
|
| 90 |
+ |
|
| 91 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 92 |
+ <param name="expression">
|
|
| 93 |
+ <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
|
|
| 94 |
+ </param>
|
|
| 95 |
+ <message>observe.validation.setLongline.required.haulingStartLatitude</message>
|
|
| 96 |
+ </field-validator>
|
|
| 97 |
+ |
|
| 98 |
+ </field>
|
|
| 99 |
+ |
|
| 100 |
+ <field name="haulingStartLongitude">
|
|
| 101 |
+ |
|
| 102 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 103 |
+ <param name="expression">
|
|
| 104 |
+ <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
|
|
| 105 |
+ </param>
|
|
| 106 |
+ <message>observe.validation.setLongline.required.haulingStartLongitude</message>
|
|
| 107 |
+ </field-validator>
|
|
| 108 |
+ |
|
| 109 |
+ </field>
|
|
| 110 |
+ |
|
| 111 |
+ <field name="haulingEndQuadrant">
|
|
| 112 |
+ |
|
| 113 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 114 |
+ <param name="expression">
|
|
| 115 |
+ <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
|
|
| 116 |
+ </param>
|
|
| 117 |
+ <message>observe.validation.setLongline.required.quadrant</message>
|
|
| 118 |
+ </field-validator>
|
|
| 119 |
+ |
|
| 120 |
+ </field>
|
|
| 121 |
+ |
|
| 122 |
+ <field name="haulingEndLatitude">
|
|
| 123 |
+ |
|
| 124 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 125 |
+ <param name="expression">
|
|
| 126 |
+ <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
|
|
| 127 |
+ </param>
|
|
| 128 |
+ <message>observe.validation.setLongline.required.haulingEndLatitude</message>
|
|
| 129 |
+ </field-validator>
|
|
| 130 |
+ </field>
|
|
| 131 |
+ |
|
| 132 |
+ <field name="haulingEndLongitude">
|
|
| 133 |
+ |
|
| 134 |
+ <field-validator type="fieldexpression" short-circuit="true">
|
|
| 135 |
+ <param name="expression">
|
|
| 136 |
+ <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
|
|
| 137 |
+ </param>
|
|
| 138 |
+ <message>observe.validation.setLongline.required.haulingEndLongitude</message>
|
|
| 139 |
+ </field-validator>
|
|
| 140 |
+ |
|
| 141 |
+ </field>
|
|
| 142 |
+ |
|
| 45 | 143 |
</validators>
|
| ... | ... | @@ -230,17 +230,6 @@ |
| 230 | 230 |
<message>observe.validation.setLongline.required.settingStartLatitude</message>
|
| 231 | 231 |
</field-validator>
|
| 232 | 232 |
|
| 233 |
- <!-- 0 <= settingStartLatitude <= 90 -->
|
|
| 234 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 235 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 236 |
- <param name="expression">
|
|
| 237 |
- <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]>
|
|
| 238 |
- </param>
|
|
| 239 |
- <message>
|
|
| 240 |
- observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max}
|
|
| 241 |
- </message>
|
|
| 242 |
- </field-validator>
|
|
| 243 |
- |
|
| 244 | 233 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 245 | 234 |
<param name="editorName">settingStart</param>
|
| 246 | 235 |
<message/>
|
| ... | ... | @@ -255,17 +244,6 @@ |
| 255 | 244 |
<message>observe.validation.setLongline.required.settingStartLongitude</message>
|
| 256 | 245 |
</field-validator>
|
| 257 | 246 |
|
| 258 |
- <!-- 0 <= settingStartLongitude <= 180 -->
|
|
| 259 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 260 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 261 |
- <param name="expression">
|
|
| 262 |
- <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]>
|
|
| 263 |
- </param>
|
|
| 264 |
- <message>
|
|
| 265 |
- observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max}
|
|
| 266 |
- </message>
|
|
| 267 |
- </field-validator>
|
|
| 268 |
- |
|
| 269 | 247 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 270 | 248 |
<param name="editorName">settingStart</param>
|
| 271 | 249 |
<message/>
|
| ... | ... | @@ -296,17 +274,6 @@ |
| 296 | 274 |
<message>observe.validation.setLongline.required.settingEndLatitude</message>
|
| 297 | 275 |
</field-validator>
|
| 298 | 276 |
|
| 299 |
- <!-- 0 <= settingEndLatitude <= 90 -->
|
|
| 300 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 301 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 302 |
- <param name="expression">
|
|
| 303 |
- <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]>
|
|
| 304 |
- </param>
|
|
| 305 |
- <message>
|
|
| 306 |
- observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max}
|
|
| 307 |
- </message>
|
|
| 308 |
- </field-validator>
|
|
| 309 |
- |
|
| 310 | 277 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 311 | 278 |
<param name="editorName">settingEnd</param>
|
| 312 | 279 |
<message/>
|
| ... | ... | @@ -321,17 +288,6 @@ |
| 321 | 288 |
<message>observe.validation.setLongline.required.settingEndLongitude</message>
|
| 322 | 289 |
</field-validator>
|
| 323 | 290 |
|
| 324 |
- <!-- 0 <= settingEndLongitude <= 180 -->
|
|
| 325 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 326 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 327 |
- <param name="expression">
|
|
| 328 |
- <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]>
|
|
| 329 |
- </param>
|
|
| 330 |
- <message>
|
|
| 331 |
- observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max}
|
|
| 332 |
- </message>
|
|
| 333 |
- </field-validator>
|
|
| 334 |
- |
|
| 335 | 291 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 336 | 292 |
<param name="editorName">settingEnd</param>
|
| 337 | 293 |
<message/>
|
| ... | ... | @@ -362,17 +318,6 @@ |
| 362 | 318 |
<message>observe.validation.setLongline.required.haulingStartLatitude</message>
|
| 363 | 319 |
</field-validator>
|
| 364 | 320 |
|
| 365 |
- <!-- 0 <= haulingStartLatitude <= 90 -->
|
|
| 366 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 367 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 368 |
- <param name="expression">
|
|
| 369 |
- <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]>
|
|
| 370 |
- </param>
|
|
| 371 |
- <message>
|
|
| 372 |
- observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max}
|
|
| 373 |
- </message>
|
|
| 374 |
- </field-validator>
|
|
| 375 |
- |
|
| 376 | 321 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 377 | 322 |
<param name="editorName">haulingStart</param>
|
| 378 | 323 |
<message/>
|
| ... | ... | @@ -387,17 +332,6 @@ |
| 387 | 332 |
<message>observe.validation.setLongline.required.haulingStartLongitude</message>
|
| 388 | 333 |
</field-validator>
|
| 389 | 334 |
|
| 390 |
- <!-- 0 <= haulingStartLongitude <= 180 -->
|
|
| 391 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 392 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 393 |
- <param name="expression">
|
|
| 394 |
- <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]>
|
|
| 395 |
- </param>
|
|
| 396 |
- <message>
|
|
| 397 |
- observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max}
|
|
| 398 |
- </message>
|
|
| 399 |
- </field-validator>
|
|
| 400 |
- |
|
| 401 | 335 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 402 | 336 |
<param name="editorName">haulingStart</param>
|
| 403 | 337 |
<message/>
|
| ... | ... | @@ -428,17 +362,6 @@ |
| 428 | 362 |
<message>observe.validation.setLongline.required.haulingEndLatitude</message>
|
| 429 | 363 |
</field-validator>
|
| 430 | 364 |
|
| 431 |
- <!-- 0 <= haulingEndLatitude <= 90 -->
|
|
| 432 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 433 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 434 |
- <param name="expression">
|
|
| 435 |
- <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]>
|
|
| 436 |
- </param>
|
|
| 437 |
- <message>
|
|
| 438 |
- observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max}
|
|
| 439 |
- </message>
|
|
| 440 |
- </field-validator>
|
|
| 441 |
- |
|
| 442 | 365 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 443 | 366 |
<param name="editorName">haulingEnd</param>
|
| 444 | 367 |
<message/>
|
| ... | ... | @@ -453,17 +376,6 @@ |
| 453 | 376 |
<message>observe.validation.setLongline.required.haulingEndLongitude</message>
|
| 454 | 377 |
</field-validator>
|
| 455 | 378 |
|
| 456 |
- <!-- 0 <= haulingEndLongitude <= 180 -->
|
|
| 457 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 458 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 459 |
- <param name="expression">
|
|
| 460 |
- <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]>
|
|
| 461 |
- </param>
|
|
| 462 |
- <message>
|
|
| 463 |
- observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max}
|
|
| 464 |
- </message>
|
|
| 465 |
- </field-validator>
|
|
| 466 |
- |
|
| 467 | 379 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 468 | 380 |
<param name="editorName">haulingEnd</param>
|
| 469 | 381 |
<message/>
|
| ... | ... | @@ -214,17 +214,6 @@ |
| 214 | 214 |
<message>observe.validation.setLongline.required.settingStartLatitude</message>
|
| 215 | 215 |
</field-validator>
|
| 216 | 216 |
|
| 217 |
- <!-- 0 <= settingStartLatitude <= 90 -->
|
|
| 218 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 219 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 220 |
- <param name="expression">
|
|
| 221 |
- <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]>
|
|
| 222 |
- </param>
|
|
| 223 |
- <message>
|
|
| 224 |
- observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max}
|
|
| 225 |
- </message>
|
|
| 226 |
- </field-validator>
|
|
| 227 |
- |
|
| 228 | 217 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 229 | 218 |
<param name="editorName">settingStart</param>
|
| 230 | 219 |
<message/>
|
| ... | ... | @@ -239,17 +228,6 @@ |
| 239 | 228 |
<message>observe.validation.setLongline.required.settingStartLongitude</message>
|
| 240 | 229 |
</field-validator>
|
| 241 | 230 |
|
| 242 |
- <!-- 0 <= settingStartLongitude <= 180 -->
|
|
| 243 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 244 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 245 |
- <param name="expression">
|
|
| 246 |
- <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]>
|
|
| 247 |
- </param>
|
|
| 248 |
- <message>
|
|
| 249 |
- observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max}
|
|
| 250 |
- </message>
|
|
| 251 |
- </field-validator>
|
|
| 252 |
- |
|
| 253 | 231 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 254 | 232 |
<param name="editorName">settingStart</param>
|
| 255 | 233 |
<message/>
|
| ... | ... | @@ -281,17 +259,6 @@ |
| 281 | 259 |
<message>observe.validation.setLongline.required.settingEndLatitude</message>
|
| 282 | 260 |
</field-validator>
|
| 283 | 261 |
|
| 284 |
- <!-- 0 <= settingEndLatitude <= 90 -->
|
|
| 285 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 286 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 287 |
- <param name="expression">
|
|
| 288 |
- <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]>
|
|
| 289 |
- </param>
|
|
| 290 |
- <message>
|
|
| 291 |
- observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max}
|
|
| 292 |
- </message>
|
|
| 293 |
- </field-validator>
|
|
| 294 |
- |
|
| 295 | 262 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 296 | 263 |
<param name="editorName">settingEnd</param>
|
| 297 | 264 |
<message/>
|
| ... | ... | @@ -306,17 +273,6 @@ |
| 306 | 273 |
<message>observe.validation.setLongline.required.settingEndLongitude</message>
|
| 307 | 274 |
</field-validator>
|
| 308 | 275 |
|
| 309 |
- <!-- 0 <= settingEndLongitude <= 180 -->
|
|
| 310 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 311 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 312 |
- <param name="expression">
|
|
| 313 |
- <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]>
|
|
| 314 |
- </param>
|
|
| 315 |
- <message>
|
|
| 316 |
- observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max}
|
|
| 317 |
- </message>
|
|
| 318 |
- </field-validator>
|
|
| 319 |
- |
|
| 320 | 276 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 321 | 277 |
<param name="editorName">settingEnd</param>
|
| 322 | 278 |
<message/>
|
| ... | ... | @@ -347,17 +303,6 @@ |
| 347 | 303 |
<message>observe.validation.setLongline.required.haulingStartLatitude</message>
|
| 348 | 304 |
</field-validator>
|
| 349 | 305 |
|
| 350 |
- <!-- 0 <= haulingStartLatitude <= 90 -->
|
|
| 351 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 352 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 353 |
- <param name="expression">
|
|
| 354 |
- <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]>
|
|
| 355 |
- </param>
|
|
| 356 |
- <message>
|
|
| 357 |
- observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max}
|
|
| 358 |
- </message>
|
|
| 359 |
- </field-validator>
|
|
| 360 |
- |
|
| 361 | 306 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 362 | 307 |
<param name="editorName">haulingStart</param>
|
| 363 | 308 |
<message/>
|
| ... | ... | @@ -372,17 +317,6 @@ |
| 372 | 317 |
<message>observe.validation.setLongline.required.haulingStartLongitude</message>
|
| 373 | 318 |
</field-validator>
|
| 374 | 319 |
|
| 375 |
- <!-- 0 <= haulingStartLongitude <= 180 -->
|
|
| 376 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 377 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 378 |
- <param name="expression">
|
|
| 379 |
- <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]>
|
|
| 380 |
- </param>
|
|
| 381 |
- <message>
|
|
| 382 |
- observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max}
|
|
| 383 |
- </message>
|
|
| 384 |
- </field-validator>
|
|
| 385 |
- |
|
| 386 | 320 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 387 | 321 |
<param name="editorName">haulingStart</param>
|
| 388 | 322 |
<message/>
|
| ... | ... | @@ -414,17 +348,6 @@ |
| 414 | 348 |
<message>observe.validation.setLongline.required.haulingEndLatitude</message>
|
| 415 | 349 |
</field-validator>
|
| 416 | 350 |
|
| 417 |
- <!-- 0 <= haulingEndLatitude <= 90 -->
|
|
| 418 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 419 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 420 |
- <param name="expression">
|
|
| 421 |
- <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]>
|
|
| 422 |
- </param>
|
|
| 423 |
- <message>
|
|
| 424 |
- observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max}
|
|
| 425 |
- </message>
|
|
| 426 |
- </field-validator>
|
|
| 427 |
- |
|
| 428 | 351 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 429 | 352 |
<param name="editorName">haulingEnd</param>
|
| 430 | 353 |
<message/>
|
| ... | ... | @@ -439,17 +362,6 @@ |
| 439 | 362 |
<message>observe.validation.setLongline.required.haulingEndLongitude</message>
|
| 440 | 363 |
</field-validator>
|
| 441 | 364 |
|
| 442 |
- <!-- 0 <= haulingEndLongitude <= 180 -->
|
|
| 443 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 444 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 445 |
- <param name="expression">
|
|
| 446 |
- <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]>
|
|
| 447 |
- </param>
|
|
| 448 |
- <message>
|
|
| 449 |
- observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max}
|
|
| 450 |
- </message>
|
|
| 451 |
- </field-validator>
|
|
| 452 |
- |
|
| 453 | 365 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 454 | 366 |
<param name="editorName">haulingEnd</param>
|
| 455 | 367 |
<message/>
|
| ... | ... | @@ -192,17 +192,6 @@ |
| 192 | 192 |
<message>observe.validation.activity.required.latitude</message>
|
| 193 | 193 |
</field-validator>
|
| 194 | 194 |
|
| 195 |
- <!-- 0 <= latitude <= 90 -->
|
|
| 196 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 197 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 198 |
- <param name="expression">
|
|
| 199 |
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
|
|
| 200 |
- </param>
|
|
| 201 |
- <message>
|
|
| 202 |
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
|
|
| 203 |
- </message>
|
|
| 204 |
- </field-validator>
|
|
| 205 |
- |
|
| 206 | 195 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 207 | 196 |
<param name="editorName">coordinate</param>
|
| 208 | 197 |
<message/>
|
| ... | ... | @@ -217,17 +206,6 @@ |
| 217 | 206 |
<message>observe.validation.activity.required.longitude</message>
|
| 218 | 207 |
</field-validator>
|
| 219 | 208 |
|
| 220 |
- <!-- 0 <= longitude <= 180 -->
|
|
| 221 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 222 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 223 |
- <param name="expression">
|
|
| 224 |
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
|
|
| 225 |
- </param>
|
|
| 226 |
- <message>
|
|
| 227 |
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
|
|
| 228 |
- </message>
|
|
| 229 |
- </field-validator>
|
|
| 230 |
- |
|
| 231 | 209 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 232 | 210 |
<param name="editorName">coordinate</param>
|
| 233 | 211 |
<message/>
|
| ... | ... | @@ -50,18 +50,6 @@ |
| 50 | 50 |
<message>observe.validation.activity.required.latitude</message>
|
| 51 | 51 |
</field-validator>
|
| 52 | 52 |
|
| 53 |
- <!-- 0 <= latitude <= 90 -->
|
|
| 54 |
- |
|
| 55 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 56 |
- <param name="doubleParams">min:-90.0|max:90.0</param>
|
|
| 57 |
- <param name="expression">
|
|
| 58 |
- <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]>
|
|
| 59 |
- </param>
|
|
| 60 |
- <message>
|
|
| 61 |
- observe.validation.activity.bound.latitude##0.0##${doubles.max}
|
|
| 62 |
- </message>
|
|
| 63 |
- </field-validator>
|
|
| 64 |
- |
|
| 65 | 53 |
<field-validator type="coordinateLatitudeDto" short-circuit="true">
|
| 66 | 54 |
<param name="editorName">coordinate</param>
|
| 67 | 55 |
<message/>
|
| ... | ... | @@ -76,17 +64,6 @@ |
| 76 | 64 |
<message>observe.validation.activity.required.longitude</message>
|
| 77 | 65 |
</field-validator>
|
| 78 | 66 |
|
| 79 |
- <!-- 0 <= longitude <= 180 -->
|
|
| 80 |
- <field-validator type="fieldexpressionwithparams" short-circuit="true">
|
|
| 81 |
- <param name="doubleParams">min:-180.0|max:180.0</param>
|
|
| 82 |
- <param name="expression">
|
|
| 83 |
- <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]>
|
|
| 84 |
- </param>
|
|
| 85 |
- <message>
|
|
| 86 |
- observe.validation.activity.bound.longitude##0.0##${doubles.max}
|
|
| 87 |
- </message>
|
|
| 88 |
- </field-validator>
|
|
| 89 |
- |
|
| 90 | 67 |
<field-validator type="coordinateLongitudeDto" short-circuit="true">
|
| 91 | 68 |
<param name="editorName">coordinate</param>
|
| 92 | 69 |
<message/>
|
| ... | ... | @@ -70,21 +70,13 @@ observe.common.BranchlinesCompositionObsDto.length=Length |
| 70 | 70 |
observe.common.BranchlinesCompositionObsDto.proportion=Proportion
|
| 71 | 71 |
observe.common.BranchlinesCompositionObsDto.topType=Top part type
|
| 72 | 72 |
observe.common.BranchlinesCompositionObsDto.tracelineType=Traceline type
|
| 73 |
-observe.common.CatchLonglineLogbookDto.basket=Basket
|
|
| 74 |
-observe.common.CatchLonglineLogbookDto.branchline=Branchline
|
|
| 75 | 73 |
observe.common.CatchLonglineLogbookDto.catchFateLongline=Fate
|
| 76 | 74 |
observe.common.CatchLonglineLogbookDto.catchHealthness=Catch healthness
|
| 77 | 75 |
observe.common.CatchLonglineLogbookDto.comment=Comment
|
| 78 | 76 |
observe.common.CatchLonglineLogbookDto.count=Count
|
| 79 | 77 |
observe.common.CatchLonglineLogbookDto.discardHealthness=Discard healthness
|
| 80 |
-observe.common.CatchLonglineLogbookDto.gonadeWeight=Gonade weight (g)
|
|
| 81 |
-observe.common.CatchLonglineLogbookDto.hookPosition=Hook position
|
|
| 82 |
-observe.common.CatchLonglineLogbookDto.maturityStatus=Sexual maturity
|
|
| 83 | 78 |
observe.common.CatchLonglineLogbookDto.onBoardProcessing=On board processing
|
| 84 |
-observe.common.CatchLonglineLogbookDto.section=Section
|
|
| 85 |
-observe.common.CatchLonglineLogbookDto.sex=Sex
|
|
| 86 | 79 |
observe.common.CatchLonglineLogbookDto.speciesCatch=Species
|
| 87 |
-observe.common.CatchLonglineLogbookDto.stomacFullness=Stomac fullness
|
|
| 88 | 80 |
observe.common.CatchLonglineObsDto.basket=Basket
|
| 89 | 81 |
observe.common.CatchLonglineObsDto.branchline=Branchline
|
| 90 | 82 |
observe.common.CatchLonglineObsDto.catchFateLongline=Fate
|
| ... | ... | @@ -444,8 +436,6 @@ observe.common.VesselSizeCategoryDto.gaugeLabel=Gauge label |
| 444 | 436 |
observe.common.WeightCategorySeineDto.species=Thuna species
|
| 445 | 437 |
observe.common.WindDto.speedRange=Speed range
|
| 446 | 438 |
observe.common.WindDto.waveHeight=Wave weight
|
| 447 |
-observe.validation.activity.bound.latitude=Latitude must be between %1$s and %2$s.
|
|
| 448 |
-observe.validation.activity.bound.longitude=Longitude must be between %1$s and %2$s.
|
|
| 449 | 439 |
observe.validation.activity.bound.seaSurfaceTemperature=Temperature must be between %1$s%3$s and %2$s%3$s.
|
| 450 | 440 |
observe.validation.activity.bound.vesselSpeed=Vessel speed must be between %1$s and %2$s.
|
| 451 | 441 |
observe.validation.activity.comment.tobig=Comment size is bound to 1024 characters.
|
| ... | ... | @@ -461,7 +451,6 @@ observe.validation.activity.desactivated.vesselActivity=Selected vessel activity |
| 461 | 451 |
observe.validation.activity.desactivated.wind=Selected wind is disabled.
|
| 462 | 452 |
observe.validation.activity.duplicated.time=There is already another activity at this time.
|
| 463 | 453 |
observe.validation.activity.invalid.quadrant=Quadrant is not coherent with ocean (%1$s) of trip (indian\: 1,2, atlantic 1,2,3,4).
|
| 464 |
-observe.validation.activity.invalid.seaSurfaceTemperature=Previous activity (%1$s) sea temperature was %2$s%5$s, current temperature must be between %3$s%5$s and %4$s%5$s.
|
|
| 465 | 454 |
observe.validation.activity.invalid.speed=Activity speed is %s nb, which is more than the maximum authorized which is %s nd.
|
| 466 | 455 |
observe.validation.activity.null.dcp=No floating object selected.
|
| 467 | 456 |
observe.validation.activity.null.fpaZone=Fpa zone is not filled.
|
| ... | ... | @@ -601,11 +590,9 @@ observe.validation.lengthLengthParameter.null.ocean=Ocean is not filled. |
| 601 | 590 |
observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Output size measure type is not filled.
|
| 602 | 591 |
observe.validation.lengthLengthParameter.null.sex=Sex must be filled.
|
| 603 | 592 |
observe.validation.lengthLengthParameter.required.coefficients=Coefficients are required.
|
| 604 |
-observe.validation.lengthLengthParameter.required.endDate=End date must be filled.
|
|
| 605 | 593 |
observe.validation.lengthLengthParameter.required.inputOutputFormula=Formula is required.
|
| 606 | 594 |
observe.validation.lengthLengthParameter.required.outputInputFormula=Formula is required.
|
| 607 | 595 |
observe.validation.lengthLengthParameter.required.species=Species must be filled.
|
| 608 |
-observe.validation.lengthLengthParameter.required.startDate=Start date must be filled.
|
|
| 609 | 596 |
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Selected size measure type is disabled.
|
| 610 | 597 |
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Formula is not valid.
|
| 611 | 598 |
observe.validation.lengthWeightParameter.invalid.uniqueKey=Tuple (species/ocean/gender/sizeMeasureType/startDate) must be unique.
|
| ... | ... | @@ -640,7 +627,6 @@ observe.validation.nonTargetCatch.uniqueKey=Tuple (species - objectFate) must be |
| 640 | 627 |
observe.validation.nonTargetCatchRelease.bound.count=Count must be between %1$s and %2$s.
|
| 641 | 628 |
observe.validation.nonTargetCatchRelease.comment.tobig=Comment size can not exceed 1024 characters.
|
| 642 | 629 |
observe.validation.nonTargetCatchRelease.desactivated.conformity=Selected conformity is disabled.
|
| 643 |
-observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Selected releasing time is disabled.
|
|
| 644 | 630 |
observe.validation.nonTargetCatchRelease.desactivated.sex=Selected sex fate is disabled.
|
| 645 | 631 |
observe.validation.nonTargetCatchRelease.desactivated.species=Selected species is disabled.
|
| 646 | 632 |
observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Selected release mode is disabled.
|
| ... | ... | @@ -710,8 +696,6 @@ observe.validation.referentiel.status.desactivated=Status is disabled (it can't |
| 710 | 696 |
observe.validation.referentiel.status.required=Status must be filled.
|
| 711 | 697 |
observe.validation.referentiel.untranslated.label1=English label is not translated.
|
| 712 | 698 |
observe.validation.referentiel.untranslated.label3=Spanish label is not translated.
|
| 713 |
-observe.validation.required.categoryMax=Category max is not filled.
|
|
| 714 |
-observe.validation.required.categoryMin=Category min is not filled.
|
|
| 715 | 699 |
observe.validation.required.compagnies=Compagnies is not filled.
|
| 716 | 700 |
observe.validation.required.harbour=Harbour is not filleds.
|
| 717 | 701 |
observe.validation.required.species=Species is not filled.
|
| ... | ... | @@ -722,7 +706,6 @@ observe.validation.route.invalid.date=Date must be after trip start date (%1$s). |
| 722 | 706 |
observe.validation.route.invalid.endLogValue.maximum=End log can't be before start log.
|
| 723 | 707 |
observe.validation.route.invalid.endLogValue.minimum=End log must be after start log.
|
| 724 | 708 |
observe.validation.route.invalid.quadrant=Activity quadrant at position %1$s is not consistent with trip ocean (%2$s) of trip (indian\: 1 or 2, atlantic\: 1,2,3 or 4).
|
| 725 |
-observe.validation.route.invalid.seaSurfaceTemperature=Sear surface temperature can't vary more than 12° between two activities (activity at position %1$s is not correct).
|
|
| 726 | 709 |
observe.validation.route.invalid.speed=Speed between two activities can't exceed %1$s nd, (activity %2$s speed is %3$s).
|
| 727 | 710 |
observe.validation.route.invalid.startLogValue=Start log value (%1$s) can't be after end log value (%2$s) of route %3$s.
|
| 728 | 711 |
observe.validation.route.invalid.time=Observation time cant' be after the one of the previous activity (activity at position %1$s is not correct).
|
| ... | ... | @@ -775,15 +758,7 @@ observe.validation.setLongline.bad.hooksCompositionProportionSum=Sum of proporti |
| 775 | 758 |
observe.validation.setLongline.baitsComposition.uniqueKey=Tuple (type/status/size/weight) must be unique.
|
| 776 | 759 |
observe.validation.setLongline.bound.basketsPerSectionCount=Baskets per section count must be bound between %s and %s.
|
| 777 | 760 |
observe.validation.setLongline.bound.branchlinesPerBasketCount=Branchlines per basket count must be bound between %s and %s.
|
| 778 |
-observe.validation.setLongline.bound.haulingEndLatitude=Latitude must be bound between %s and %s.
|
|
| 779 |
-observe.validation.setLongline.bound.haulingEndLongitude=Longitude must be bound between %s and %s.
|
|
| 780 |
-observe.validation.setLongline.bound.haulingStartLatitude=Latitude must be bound between %s and %s.
|
|
| 781 |
-observe.validation.setLongline.bound.haulingStartLongitude=Longitude must be bound between %s and %s.
|
|
| 782 | 761 |
observe.validation.setLongline.bound.lightsticksPerBasketCount=Lightsticks per basket count must be bound between %s and %s.
|
| 783 |
-observe.validation.setLongline.bound.settingEndLatitude=Latitude must be bound between %s and %s.
|
|
| 784 |
-observe.validation.setLongline.bound.settingEndLongitude=Longitude must be bound between %s and %s.
|
|
| 785 |
-observe.validation.setLongline.bound.settingStartLatitude=Latitude must be bound between %s and %s.
|
|
| 786 |
-observe.validation.setLongline.bound.settingStartLongitude=Longitude must be bound between %s and %s.
|
|
| 787 | 762 |
observe.validation.setLongline.bound.settingVesselSpeed=Setting vessel speed must be bound between %s and %s.
|
| 788 | 763 |
observe.validation.setLongline.bound.shooterSpeed=Shooter speed must be bound between %s and %s.
|
| 789 | 764 |
observe.validation.setLongline.bound.snapWeight=Snap weight must be bound between %s and %s.
|
| ... | ... | @@ -70,21 +70,13 @@ observe.common.BranchlinesCompositionObsDto.length=Longitud (m) |
| 70 | 70 |
observe.common.BranchlinesCompositionObsDto.proportion=Proporción (%)
|
| 71 | 71 |
observe.common.BranchlinesCompositionObsDto.topType=Tipo de la parte superior
|
| 72 | 72 |
observe.common.BranchlinesCompositionObsDto.tracelineType=Tipo bajo de línea
|
| 73 |
-observe.common.CatchLonglineLogbookDto.basket=cesta
|
|
| 74 |
-observe.common.CatchLonglineLogbookDto.branchline=Arponcillo
|
|
| 75 | 73 |
observe.common.CatchLonglineLogbookDto.catchFateLongline=Devenir
|
| 76 | 74 |
observe.common.CatchLonglineLogbookDto.catchHealthness=Salud a la captura
|
| 77 | 75 |
observe.common.CatchLonglineLogbookDto.comment=Comentario
|
| 78 | 76 |
observe.common.CatchLonglineLogbookDto.count=Numéro
|
| 79 | 77 |
observe.common.CatchLonglineLogbookDto.discardHealthness=Salud al rechazo
|
| 80 |
-observe.common.CatchLonglineLogbookDto.gonadeWeight=Peso de las gonadas (g)
|
|
| 81 |
-observe.common.CatchLonglineLogbookDto.hookPosition=Posición del gancho
|
|
| 82 |
-observe.common.CatchLonglineLogbookDto.maturityStatus=Maturidad sexual
|
|
| 83 | 78 |
observe.common.CatchLonglineLogbookDto.onBoardProcessing=On board processing \#TODO
|
| 84 |
-observe.common.CatchLonglineLogbookDto.section=sección
|
|
| 85 |
-observe.common.CatchLonglineLogbookDto.sex=Sexo
|
|
| 86 | 79 |
observe.common.CatchLonglineLogbookDto.speciesCatch=Especie
|
| 87 |
-observe.common.CatchLonglineLogbookDto.stomacFullness=Estatuto del estomago
|
|
| 88 | 80 |
observe.common.CatchLonglineObsDto.basket=cesta
|
| 89 | 81 |
observe.common.CatchLonglineObsDto.branchline=Arponcillo
|
| 90 | 82 |
observe.common.CatchLonglineObsDto.catchFateLongline=Devenir
|
| ... | ... | @@ -446,8 +438,6 @@ observe.common.VesselSizeCategoryDto.gaugeLabel=Texto «Capacidad» |
| 446 | 438 |
observe.common.WeightCategorySeineDto.species=Especie
|
| 447 | 439 |
observe.common.WindDto.speedRange=Texto velocidad del viento
|
| 448 | 440 |
observe.common.WindDto.waveHeight=Texto descriptivo de «altura media de la ola»
|
| 449 |
-observe.validation.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s.
|
|
| 450 |
-observe.validation.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s.
|
|
| 451 | 441 |
observe.validation.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s%3$s y %2$s%3$s.
|
| 452 | 442 |
observe.validation.activity.bound.vesselSpeed=La Velocidad del viento estar comprendida entre %1$s y %2$s.
|
| 453 | 443 |
observe.validation.activity.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres.
|
| ... | ... | @@ -463,7 +453,6 @@ observe.validation.activity.desactivated.vesselActivity=Actividad del barco sele |
| 463 | 453 |
observe.validation.activity.desactivated.wind=La fuerza del viento seleccionada está desactivada.
|
| 464 | 454 |
observe.validation.activity.duplicated.time=Ya existe una actividad a esa hora.
|
| 465 | 455 |
observe.validation.activity.invalid.quadrant=El cuadrante no es coherente con el informe del oceano (%1$s) de la marea (indico \: 1,2, atlantico \: 1, 2, 3, 4)
|
| 466 |
-observe.validation.activity.invalid.seaSurfaceTemperature=Previous activity (%1$s) sea temperature was %2$s%5$s, current temperature must be between %3$s%5$s and %4$s%5$s. \#TODO
|
|
| 467 | 456 |
observe.validation.activity.invalid.speed=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos.
|
| 468 | 457 |
observe.validation.activity.null.dcp=No se ha introducido objeto flotante.
|
| 469 | 458 |
observe.validation.activity.null.fpaZone=La selección de una zona FPA es obligatoria.
|
| ... | ... | @@ -603,11 +592,9 @@ observe.validation.lengthLengthParameter.null.ocean=No se ha seleccionado oceano |
| 603 | 592 |
observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. \#TODO
|
| 604 | 593 |
observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. \#TODO
|
| 605 | 594 |
observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. \#TODO
|
| 606 |
-observe.validation.lengthLengthParameter.required.endDate=Fecha de fin de validez debe ser especificada.
|
|
| 607 | 595 |
observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. \#TODO
|
| 608 | 596 |
observe.validation.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire. \#TODO
|
| 609 | 597 |
observe.validation.lengthLengthParameter.required.species=Especie no especificada.
|
| 610 |
-observe.validation.lengthLengthParameter.required.startDate=fecha de comienzo de validez no especificada.
|
|
| 611 | 598 |
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé. \#TODO
|
| 612 | 599 |
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no es coherente.
|
| 613 | 600 |
observe.validation.lengthWeightParameter.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. \#TODO
|
| ... | ... | @@ -642,7 +629,6 @@ observe.validation.nonTargetCatch.uniqueKey=El par (especie - objectFate) debe s |
| 642 | 629 |
observe.validation.nonTargetCatchRelease.bound.count=Le nombre doit être compris entre %1$s et %2$s. \#TODO
|
| 643 | 630 |
observe.validation.nonTargetCatchRelease.comment.tobig=La taille du commentaire est limitée à 1024 caractères. \#TODO
|
| 644 | 631 |
observe.validation.nonTargetCatchRelease.desactivated.conformity=Selected conformity is disabled. \#TODO
|
| 645 |
-observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Selected releasing time is disabled. \#TODO
|
|
| 646 | 632 |
observe.validation.nonTargetCatchRelease.desactivated.sex=Le sexe sélectionné est désactivé. \#TODO
|
| 647 | 633 |
observe.validation.nonTargetCatchRelease.desactivated.species=L'espèce sélectionnée est désactivée. \#TODO
|
| 648 | 634 |
observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Le mode de libération sélectionné est désactivé. \#TODO
|
| ... | ... | @@ -712,8 +698,6 @@ observe.validation.referentiel.status.desactivated=El objeto está desactivado ( |
| 712 | 698 |
observe.validation.referentiel.status.required=El estatuto activo-inactivo es mandatorio.
|
| 713 | 699 |
observe.validation.referentiel.untranslated.label1=La etiqueta en inglés no se ha traducido.
|
| 714 | 700 |
observe.validation.referentiel.untranslated.label3=La etiqueta en espaÑol no se ha traducido.
|
| 715 |
-observe.validation.required.categoryMax=Category max is not filled.
|
|
| 716 |
-observe.validation.required.categoryMin=Category min is not filled.
|
|
| 717 | 701 |
observe.validation.required.compagnies=Compagnies is not filled.
|
| 718 | 702 |
observe.validation.required.harbour=Harbour is not filleds.
|
| 719 | 703 |
observe.validation.required.species=Species is not filled.
|
| ... | ... | @@ -724,7 +708,6 @@ observe.validation.route.invalid.date=El día de observación debe ser superior |
| 724 | 708 |
observe.validation.route.invalid.endLogValue.maximum=La corredera de tarde no puede ser superior en %1$s a la de mañana.
|
| 725 | 709 |
observe.validation.route.invalid.endLogValue.minimum=la corredera de tarde debe ser superior a la de mañana.
|
| 726 | 710 |
observe.validation.route.invalid.quadrant=El cuadrante de la actividad %1$s no es coherente con el océano (%2$s) de la marea (indico \: 1,2, atlántico \: 1, 2, 3, 4)
|
| 727 |
-observe.validation.route.invalid.seaSurfaceTemperature=La temperatura superficial no puede variar más de 12° entre 2 actividades (actividad %1$s incorrecta).
|
|
| 728 | 711 |
observe.validation.route.invalid.speed=la velocidad entre dos actividades no debe sobrepasar %1$s nd, (actividad %2$s incorrecta, velocidad \: %3$s nd).
|
| 729 | 712 |
observe.validation.route.invalid.startLogValue=La corredera de mañana (%1$s) debe ser superior a la de tarde (%2$s) de la routa %3$s.
|
| 730 | 713 |
observe.validation.route.invalid.time=La hora de la observación de la actividad debe ser superior a la de la actividad anterior (actividad %1$s incorrecta).
|
| ... | ... | @@ -777,15 +760,7 @@ observe.validation.setLongline.bad.hooksCompositionProportionSum=La suma de las |
| 777 | 760 |
observe.validation.setLongline.baitsComposition.uniqueKey=La tupla (type/estado/tamaño/peso) debe ser única, la tupa ya está utilizada.
|
| 778 | 761 |
observe.validation.setLongline.bound.basketsPerSectionCount=El número de cestas en la sección debe estar comprendido entre %1$s y %2$s.
|
| 779 | 762 |
observe.validation.setLongline.bound.branchlinesPerBasketCount=El número de avanzuelos en la cesta debe estar comprendido entre %1$s y %2$s.
|
| 780 |
-observe.validation.setLongline.bound.haulingEndLatitude=La latitud de fin de arrastre debe estar comprendida entre %1$s y %2$s.
|
|
| 781 |
-observe.validation.setLongline.bound.haulingEndLongitude=La longitud de fin de arrastre debe estar comprendida entre %1$s y %2$s.
|
|
| 782 |
-observe.validation.setLongline.bound.haulingStartLatitude=La latitud de inicio de arrastre debe estar comprendida entre %1$s y %2$s.
|
|
| 783 |
-observe.validation.setLongline.bound.haulingStartLongitude=La longitud de inicio de arrastre debe estar comprendida entre %1$s y %2$s.
|
|
| 784 | 763 |
observe.validation.setLongline.bound.lightsticksPerBasketCount=El número de cyalumes en la cesta debe estar comprendido entre %1$s y %2$s.
|
| 785 |
-observe.validation.setLongline.bound.settingEndLatitude=La latitud de fin de calada debe estar comprendida entre %1$s y %2$s.
|
|
| 786 |
-observe.validation.setLongline.bound.settingEndLongitude=La longitud de fin de calada debe estar comprendida entre %1$s y %2$s.
|
|
| 787 |
-observe.validation.setLongline.bound.settingStartLatitude=La latitud de inicio de calada debe estar comprendida entre %1$s y %2$s.
|
|
| 788 |
-observe.validation.setLongline.bound.settingStartLongitude=La longitud de inicio de calada debe estar comprendida entre %1$s y %2$s.
|
|
| 789 | 764 |
observe.validation.setLongline.bound.settingVesselSpeed=La velocidad del barco debe estar comprendida entre %1$s y %2$s.
|
| 790 | 765 |
observe.validation.setLongline.bound.shooterSpeed=La velocidad de shooter debe estar comprendida entre %1$s y %2$s.
|
| 791 | 766 |
observe.validation.setLongline.bound.snapWeight=El peso snap debe estar comprendido entre %1$s y %2$s.
|
| ... | ... | @@ -70,21 +70,13 @@ observe.common.BranchlinesCompositionObsDto.length=Longueur (m) |
| 70 | 70 |
observe.common.BranchlinesCompositionObsDto.proportion=Proportion (%)
|
| 71 | 71 |
observe.common.BranchlinesCompositionObsDto.topType=Type partie supérieure
|
| 72 | 72 |
observe.common.BranchlinesCompositionObsDto.tracelineType=Type bas de ligne
|
| 73 |
-observe.common.CatchLonglineLogbookDto.basket=Panier
|
|
| 74 |
-observe.common.CatchLonglineLogbookDto.branchline=Avançon
|
|
| 75 | 73 |
observe.common.CatchLonglineLogbookDto.catchFateLongline=Devenir
|
| 76 | 74 |
observe.common.CatchLonglineLogbookDto.catchHealthness=Santé à la capture
|
| 77 | 75 |
observe.common.CatchLonglineLogbookDto.comment=Commentaire
|
| 78 | 76 |
observe.common.CatchLonglineLogbookDto.count=Nombre
|
| 79 | 77 |
observe.common.CatchLonglineLogbookDto.discardHealthness=Santé au rejet
|
| 80 |
-observe.common.CatchLonglineLogbookDto.gonadeWeight=Poids des gonades (g)
|
|
| 81 |
-observe.common.CatchLonglineLogbookDto.hookPosition=Position de l'hameçon
|
|
| 82 |
-observe.common.CatchLonglineLogbookDto.maturityStatus=Maturité sexuelle
|
|
| 83 | 78 |
observe.common.CatchLonglineLogbookDto.onBoardProcessing=Traitement à bord
|
| 84 |
-observe.common.CatchLonglineLogbookDto.section=Section
|
|
| 85 |
-observe.common.CatchLonglineLogbookDto.sex=Sexe
|
|
| 86 | 79 |
observe.common.CatchLonglineLogbookDto.speciesCatch=Espèce
|
| 87 |
-observe.common.CatchLonglineLogbookDto.stomacFullness=État de l'estomac
|
|
| 88 | 80 |
observe.common.CatchLonglineObsDto.basket=Panier
|
| 89 | 81 |
observe.common.CatchLonglineObsDto.branchline=Avançon
|
| 90 | 82 |
observe.common.CatchLonglineObsDto.catchFateLongline=Devenir
|
| ... | ... | @@ -444,8 +436,6 @@ observe.common.VesselSizeCategoryDto.gaugeLabel=Libellé jauge |
| 444 | 436 |
observe.common.WeightCategorySeineDto.species=Espèce de thon
|
| 445 | 437 |
observe.common.WindDto.speedRange=Libellé vitesse vent
|
| 446 | 438 |
observe.common.WindDto.waveHeight=Libellé Hauteur moyenne vagues
|
| 447 |
-observe.validation.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s.
|
|
| 448 |
-observe.validation.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s.
|
|
| 449 | 439 |
observe.validation.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s%3$s et %2$s%3$s.
|
| 450 | 440 |
observe.validation.activity.bound.vesselSpeed=La vitesse navire doit être comprise entre %1$s et %2$s.
|
| 451 | 441 |
observe.validation.activity.comment.tobig=La taille du commentaire est limitée à 1024 caractères.
|
| ... | ... | @@ -461,7 +451,6 @@ observe.validation.activity.desactivated.vesselActivity=L'activité bateau séle |
| 461 | 451 |
observe.validation.activity.desactivated.wind=Le vent Beaufort sélectionné est désactivé.
|
| 462 | 452 |
observe.validation.activity.duplicated.time=Il existe déjà une autre activité à cette heure.
|
| 463 | 453 |
observe.validation.activity.invalid.quadrant=Le quadrant n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1
|
| 464 |
-observe.validation.activity.invalid.seaSurfaceTemperature=La température surface de l'activité précédente (%1$s) est de %2$s%5$s, la température doit être comprise entre %3$s%5$s et %4$s%5$s.
|
|
| 465 | 454 |
observe.validation.activity.invalid.speed=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd
|
| 466 | 455 |
observe.validation.activity.null.dcp=Aucun objet flottant saisi.
|
| 467 | 456 |
observe.validation.activity.null.fpaZone=La sélection d'une zone FPA est obligatoire.
|
| ... | ... | @@ -601,11 +590,9 @@ observe.validation.lengthLengthParameter.null.ocean=Aucun océan sélectionné. |
| 601 | 590 |
observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné.
|
| 602 | 591 |
observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné.
|
| 603 | 592 |
observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires.
|
| 604 |
-observe.validation.lengthLengthParameter.required.endDate=Date de fin de validité non renseignée.
|
|
| 605 | 593 |
observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire.
|
| 606 | 594 |
observe.validation.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire.
|
| 607 | 595 |
observe.validation.lengthLengthParameter.required.species=L'espèce n'est pas renseignée.
|
| 608 |
-observe.validation.lengthLengthParameter.required.startDate=date de début de validité non renseignée.
|
|
| 609 | 596 |
observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé.
|
| 610 | 597 |
observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente.
|
| 611 | 598 |
observe.validation.lengthWeightParameter.invalid.uniqueKey=Le tuple (espèce/sexe/océan/type de measure/date de début) doit être unique
|
| ... | ... | @@ -640,7 +627,6 @@ observe.validation.nonTargetCatch.uniqueKey=Le couple (espèce - devenir objet) |
| 640 | 627 |
observe.validation.nonTargetCatchRelease.bound.count=Le nombre doit être compris entre %1$s et %2$s.
|
| 641 | 628 |
observe.validation.nonTargetCatchRelease.comment.tobig=La taille du commentaire est limitée à 1024 caractères.
|
| 642 | 629 |
observe.validation.nonTargetCatchRelease.desactivated.conformity=La conformité sélectionnée est désactivée.
|
| 643 |
-observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Le moment de libération sélectionné est désactivé.
|
|
| 644 | 630 |
observe.validation.nonTargetCatchRelease.desactivated.sex=Le sexe sélectionné est désactivé.
|
| 645 | 631 |
observe.validation.nonTargetCatchRelease.desactivated.species=L'espèce sélectionnée est désactivée.
|
| 646 | 632 |
observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Le mode de libération sélectionné est désactivé.
|
| ... | ... | @@ -710,8 +696,6 @@ observe.validation.referentiel.status.desactivated=L'objet est désactivé (il n |
| 710 | 696 |
observe.validation.referentiel.status.required=Le statut actif-inactif est obligatoire.
|
| 711 | 697 |
observe.validation.referentiel.untranslated.label1=Le libellé anglais n'est pas traduit.
|
| 712 | 698 |
observe.validation.referentiel.untranslated.label3=Le libellé espagnol n'est pas traduit.
|
| 713 |
-observe.validation.required.categoryMax=La catégorie Max n'est pas renseignée.
|
|
| 714 |
-observe.validation.required.categoryMin=La catégorie Min n'est pas renseignée.
|
|
| 715 | 699 |
observe.validation.required.compagnies=La compagnie n'est pas renseignée.
|
| 716 | 700 |
observe.validation.required.harbour=Le port n'est pas renseigné.
|
| 717 | 701 |
observe.validation.required.species=L'espèce n'est pas renseigné.
|
| ... | ... | @@ -722,7 +706,6 @@ observe.validation.route.invalid.date=Le jour d'observation doit être supérieu |
| 722 | 706 |
observe.validation.route.invalid.endLogValue.maximum=Le loch du soir ne peut pas être supérieur de %1$s à celui du matin.
|
| 723 | 707 |
observe.validation.route.invalid.endLogValue.minimum=Le loch du soir doit être strictement supérieur à celui du matin.
|
| 724 | 708 |
observe.validation.route.invalid.quadrant=Le quadrant de l’activité à la position %1$s n'est pas cohérent par rapport à l'océan (%2$s) de la marée (indien \: 1
|
| 725 |
-observe.validation.route.invalid.seaSurfaceTemperature=La température surface ne peut pas varier de plus de 12° entre 2 activités (activité de position %1$s incorrecte).
|
|
| 726 | 709 |
observe.validation.route.invalid.speed=La vitesse entre deux activités ne doit pas dépasser %1$s nd, (l'activité %2$s a une vitesse de %3$s nd).
|
| 727 | 710 |
observe.validation.route.invalid.startLogValue=Le loch du matin (%1$s) doit être supérieur au loch soir (%2$s) de la route %3$s.
|
| 728 | 711 |
observe.validation.route.invalid.time=L'heure d'observation d'une activité doit être supérieure à celle de l'activité précédente (activité de position %1$s incorrecte).
|
| ... | ... | @@ -775,15 +758,7 @@ observe.validation.setLongline.bad.hooksCompositionProportionSum=La somme des pr |
| 775 | 758 |
observe.validation.setLongline.baitsComposition.uniqueKey=Le tuple (type/état/taille/poids) doit être unique, le tuple est déjà utilisé.
|
| 776 | 759 |
observe.validation.setLongline.bound.basketsPerSectionCount=Le nombre de panier par section doit être compris entre %1$s et %2$s.
|
| 777 | 760 |
observe.validation.setLongline.bound.branchlinesPerBasketCount=Le nombre d'hameçons par panier doit être compris entre %1$s et %2$s.
|
| 778 |
-observe.validation.setLongline.bound.haulingEndLatitude=La latitude de fin de virage doit être comprise entre %1$s et %2$s.
|
|
| 779 |
-observe.validation.setLongline.bound.haulingEndLongitude=La longitude de fin de virage doit être comprise entre %1$s et %2$s.
|
|
| 780 |
-observe.validation.setLongline.bound.haulingStartLatitude=La latitude de début de virage doit être comprise entre %1$s et %2$s.
|
|
| 781 |
-observe.validation.setLongline.bound.haulingStartLongitude=La longitude de début de virage doit être comprise entre %1$s et %2$s.
|
|
| 782 | 761 |
observe.validation.setLongline.bound.lightsticksPerBasketCount=Le nombre de cyalumes par panier doit être compris entre %1$s et %2$s.
|
| 783 |
-observe.validation.setLongline.bound.settingEndLatitude=La latitude de fin de filage doit être comprise entre %1$s et %2$s.
|
|
| 784 |
-observe.validation.setLongline.bound.settingEndLongitude=La longitude de fin de filage doit être comprise entre %1$s et %2$s.
|
|
| 785 |
-observe.validation.setLongline.bound.settingStartLatitude=La latitude de début de filage doit être comprise entre %1$s et %2$s.
|
|
| 786 |
-observe.validation.setLongline.bound.settingStartLongitude=La longitude de début de filage doit être comprise entre %1$s et %2$s.
|
|
| 787 | 762 |
observe.validation.setLongline.bound.settingVesselSpeed=La vitesse bateau doit être comprise entre %1$s et %2$s.
|
| 788 | 763 |
observe.validation.setLongline.bound.shooterSpeed=La vitesse de shooter doit être comprise entre %1$s et %2$s.
|
| 789 | 764 |
observe.validation.setLongline.bound.snapWeight=Le poids snap doit être compris entre %1$s et %2$s.
|