Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 40c00247 by Tony CHEMIT at 2018-10-07T14:32:34Z [LL] Les positions géographiques de fin de filage, début et fin de virage ne doivent pas être obligatoires - Closes #1115 - - - - - 591c5b54 by Tony CHEMIT at 2018-10-07T14:57:37Z fix coordinates validation message (and remove a lots of them \o/) - - - - - 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: ===================================== services/.mvn/i18n-generate ===================================== ===================================== services/.mvn/i18n-parse-java ===================================== ===================================== services/src/main/resources/i18n/services_en_GB.properties ===================================== @@ -0,0 +1,6 @@ +observe.validation.coordinate.degree.latitude.outOfBound=Latitude must be between 0 and 90. +observe.validation.coordinate.degree.longitude.outOfBound=Longitude must be between 0 and 180. +observe.validation.coordinate.minute.latitude.outOfBound=Latitude must be between 0 and 90. +observe.validation.coordinate.minute.longitude.outOfBound=Longitude must be between 0 and 180. +observe.validation.coordinate.second.latitude.outOfBound=Latitude must be between 0 and 90. +observe.validation.coordinate.second.longitude.outOfBound=Longitude must be between 0 and 180. ===================================== services/src/main/resources/i18n/services_es_ES.properties ===================================== @@ -0,0 +1,6 @@ +observe.validation.coordinate.degree.latitude.outOfBound=La latitud estar comprendida entre 0 y 90. +observe.validation.coordinate.degree.longitude.outOfBound=La longitud estar comprendida entre 0 y 180. +observe.validation.coordinate.minute.latitude.outOfBound=La latitud estar comprendida entre 0 y 90. +observe.validation.coordinate.minute.longitude.outOfBound=La longitud estar comprendida entre 0 y 180. +observe.validation.coordinate.second.latitude.outOfBound=La latitud estar comprendida entre 0 y 90. +observe.validation.coordinate.second.longitude.outOfBound=La longitud estar comprendida entre 0 y 180. ===================================== services/src/main/resources/i18n/services_fr_FR.properties ===================================== @@ -0,0 +1,6 @@ +observe.validation.coordinate.degree.latitude.outOfBound=La latitude doit être comprise entre 0 et 90. +observe.validation.coordinate.degree.longitude.outOfBound=La longitude doit être comprise entre 0 et 180. +observe.validation.coordinate.minute.latitude.outOfBound=La latitude doit être comprise entre 0 et 90. +observe.validation.coordinate.minute.longitude.outOfBound=La longitude doit être comprise entre 0 et 180. +observe.validation.coordinate.second.latitude.outOfBound=La latitude doit être comprise entre 0 et 90. +observe.validation.coordinate.second.longitude.outOfBound=La longitude doit être comprise entre 0 et 180. ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -111,17 +111,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> - <!-- 0 <= latitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -136,17 +125,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> - <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -96,18 +96,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> - <!-- 0 <= latitude <= 90 --> - - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -122,17 +110,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> - <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml ===================================== @@ -112,17 +112,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> - <!-- 0 <= latitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -137,17 +126,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> - <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml ===================================== @@ -97,18 +97,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> - <!-- 0 <= latitude <= 90 --> - - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -123,17 +111,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> - <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml ===================================== @@ -56,17 +56,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> - <!-- 0 <= latitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -81,15 +70,9 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> - <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> + <field-validator type="coordinateLongitudeDto" short-circuit="true"> + <param name="editorName">coordinate</param> + <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml ===================================== @@ -57,17 +57,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> - <!-- 0 <= latitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -82,17 +71,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> - <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -230,17 +230,6 @@ <message>observe.validation.setLongline.required.settingStartLatitude</message> </field-validator> - <!-- 0 <= settingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -255,17 +244,6 @@ <message>observe.validation.setLongline.required.settingStartLongitude</message> </field-validator> - <!-- 0 <= settingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -275,7 +253,10 @@ <field name="settingEndQuadrant"> - <field-validator type="required" short-circuit="true"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]> + </param> <message>observe.validation.setLongline.required.quadrant</message> </field-validator> @@ -291,20 +272,11 @@ <field name="settingEndLatitude"> - <!-- settingEndLatitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.settingEndLatitude</message> - </field-validator> - - <!-- 0 <= settingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> + <![CDATA[ settingEndLatitude != null || ( settingEndQuadrant == null && settingEndLongitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.settingEndLatitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -316,20 +288,11 @@ <field name="settingEndLongitude"> - <!-- settingEndLongitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.settingEndLongitude</message> - </field-validator> - - <!-- 0 <= settingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> + <![CDATA[ settingEndLongitude != null || ( settingEndQuadrant == null && settingEndLatitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.settingEndLongitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -341,7 +304,10 @@ <field name="haulingStartQuadrant"> - <field-validator type="required" short-circuit="true"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]> + </param> <message>observe.validation.setLongline.required.quadrant</message> </field-validator> @@ -357,20 +323,11 @@ <field name="haulingStartLatitude"> - <!-- haulingStartLatitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingStartLatitude</message> - </field-validator> - - <!-- 0 <= haulingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> + <![CDATA[ haulingStartLatitude != null || ( haulingStartQuadrant == null && haulingStartLongitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingStartLatitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -382,20 +339,11 @@ <field name="haulingStartLongitude"> - <!-- haulingStartLongitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingStartLongitude</message> - </field-validator> - - <!-- 0 <= haulingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> + <![CDATA[ haulingStartLongitude != null || ( haulingStartQuadrant == null && haulingStartLatitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingStartLongitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -407,7 +355,10 @@ <field name="haulingEndQuadrant"> - <field-validator type="required" short-circuit="true"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]> + </param> <message>observe.validation.setLongline.required.quadrant</message> </field-validator> @@ -423,20 +374,11 @@ <field name="haulingEndLatitude"> - <!-- haulingEndLatitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingEndLatitude</message> - </field-validator> - - <!-- 0 <= haulingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> + <![CDATA[ haulingEndLatitude != null || ( haulingEndQuadrant == null && haulingEndLongitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingEndLatitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -448,20 +390,11 @@ <field name="haulingEndLongitude"> - <!-- haulingEndLongitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingEndLongitude</message> - </field-validator> - - <!-- 0 <= haulingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> + <![CDATA[ haulingEndLongitude != null || ( haulingEndQuadrant == null && haulingEndLatitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingEndLongitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml ===================================== @@ -42,4 +42,102 @@ </field> + <field name="settingEndQuadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> + </field-validator> + + </field> + + <field name="settingEndLatitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.settingEndLatitude</message> + </field-validator> + + </field> + + <field name="settingEndLongitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.settingEndLongitude</message> + </field-validator> + + </field> + + <field name="haulingStartQuadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> + </field-validator> + + </field> + + <field name="haulingStartLatitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingStartLatitude</message> + </field-validator> + + </field> + + <field name="haulingStartLongitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingStartLongitude</message> + </field-validator> + + </field> + + <field name="haulingEndQuadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> + </field-validator> + + </field> + + <field name="haulingEndLatitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingEndLatitude</message> + </field-validator> + </field> + + <field name="haulingEndLongitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingEndLongitude</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -214,17 +214,6 @@ <message>observe.validation.setLongline.required.settingStartLatitude</message> </field-validator> - <!-- 0 <= settingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -239,17 +228,6 @@ <message>observe.validation.setLongline.required.settingStartLongitude</message> </field-validator> - <!-- 0 <= settingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -257,11 +235,13 @@ </field> - <field name="settingStartQuadrant"> + <field name="settingEndQuadrant"> - <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -276,20 +256,11 @@ <field name="settingEndLatitude"> - <!-- settingEndLatitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.settingEndLatitude</message> - </field-validator> - - <!-- 0 <= settingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> + <![CDATA[ settingEndLatitude != null || ( settingEndQuadrant == null && settingEndLongitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.settingEndLatitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -301,20 +272,11 @@ <field name="settingEndLongitude"> - <!-- settingEndLongitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.settingEndLongitude</message> - </field-validator> - - <!-- 0 <= settingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> + <![CDATA[ settingEndLongitude != null || ( settingEndQuadrant == null && settingEndLatitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.settingEndLongitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -324,11 +286,13 @@ </field> - <field name="settingEndQuadrant"> + <field name="haulingStartQuadrant"> - <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -343,20 +307,11 @@ <field name="haulingStartLatitude"> - <!-- haulingStartLatitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingStartLatitude</message> - </field-validator> - - <!-- 0 <= haulingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> + <![CDATA[ haulingStartLatitude != null || ( haulingStartQuadrant == null && haulingStartLongitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingStartLatitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -368,20 +323,11 @@ <field name="haulingStartLongitude"> - <!-- haulingStartLongitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingStartLongitude</message> - </field-validator> - - <!-- 0 <= haulingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> + <![CDATA[ haulingStartLongitude != null || ( haulingStartQuadrant == null && haulingStartLatitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingStartLongitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -391,11 +337,13 @@ </field> - <field name="haulingStartQuadrant"> + <field name="haulingEndQuadrant"> - <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -410,20 +358,11 @@ <field name="haulingEndLatitude"> - <!-- haulingEndLatitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingEndLatitude</message> - </field-validator> - - <!-- 0 <= haulingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> + <![CDATA[ haulingEndLatitude != null || ( haulingEndQuadrant == null && haulingEndLongitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingEndLatitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -435,20 +374,11 @@ <field name="haulingEndLongitude"> - <!-- haulingEndLongitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingEndLongitude</message> - </field-validator> - - <!-- 0 <= haulingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> + <![CDATA[ haulingEndLongitude != null || ( haulingEndQuadrant == null && haulingEndLatitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingEndLongitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -458,23 +388,6 @@ </field> - <field name="haulingEndQuadrant"> - - <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> - </field-validator> - - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="quadrantDto" short-circuit="true"> - <param name="ocean">currentTripLongline.ocean</param> - <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} - </message> - </field-validator> - - </field> - <field name="settingShape"> <!-- settingShape desactive --> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml ===================================== @@ -42,4 +42,102 @@ </field> + <field name="settingEndQuadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> + </field-validator> + + </field> + + <field name="settingEndLatitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.settingEndLatitude</message> + </field-validator> + + </field> + + <field name="settingEndLongitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.settingEndLongitude</message> + </field-validator> + + </field> + + <field name="haulingStartQuadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> + </field-validator> + + </field> + + <field name="haulingStartLatitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingStartLatitude</message> + </field-validator> + + </field> + + <field name="haulingStartLongitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingStartLongitude</message> + </field-validator> + + </field> + + <field name="haulingEndQuadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> + </field-validator> + + </field> + + <field name="haulingEndLatitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingEndLatitude</message> + </field-validator> + </field> + + <field name="haulingEndLongitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingEndLongitude</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml ===================================== @@ -230,17 +230,6 @@ <message>observe.validation.setLongline.required.settingStartLatitude</message> </field-validator> - <!-- 0 <= settingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -255,17 +244,6 @@ <message>observe.validation.setLongline.required.settingStartLongitude</message> </field-validator> - <!-- 0 <= settingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -296,17 +274,6 @@ <message>observe.validation.setLongline.required.settingEndLatitude</message> </field-validator> - <!-- 0 <= settingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -321,17 +288,6 @@ <message>observe.validation.setLongline.required.settingEndLongitude</message> </field-validator> - <!-- 0 <= settingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -362,17 +318,6 @@ <message>observe.validation.setLongline.required.haulingStartLatitude</message> </field-validator> - <!-- 0 <= haulingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -387,17 +332,6 @@ <message>observe.validation.setLongline.required.haulingStartLongitude</message> </field-validator> - <!-- 0 <= haulingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -428,17 +362,6 @@ <message>observe.validation.setLongline.required.haulingEndLatitude</message> </field-validator> - <!-- 0 <= haulingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> @@ -453,17 +376,6 @@ <message>observe.validation.setLongline.required.haulingEndLongitude</message> </field-validator> - <!-- 0 <= haulingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml ===================================== @@ -214,17 +214,6 @@ <message>observe.validation.setLongline.required.settingStartLatitude</message> </field-validator> - <!-- 0 <= settingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -239,17 +228,6 @@ <message>observe.validation.setLongline.required.settingStartLongitude</message> </field-validator> - <!-- 0 <= settingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -281,17 +259,6 @@ <message>observe.validation.setLongline.required.settingEndLatitude</message> </field-validator> - <!-- 0 <= settingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -306,17 +273,6 @@ <message>observe.validation.setLongline.required.settingEndLongitude</message> </field-validator> - <!-- 0 <= settingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -347,17 +303,6 @@ <message>observe.validation.setLongline.required.haulingStartLatitude</message> </field-validator> - <!-- 0 <= haulingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -372,17 +317,6 @@ <message>observe.validation.setLongline.required.haulingStartLongitude</message> </field-validator> - <!-- 0 <= haulingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -414,17 +348,6 @@ <message>observe.validation.setLongline.required.haulingEndLatitude</message> </field-validator> - <!-- 0 <= haulingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> @@ -439,17 +362,6 @@ <message>observe.validation.setLongline.required.haulingEndLongitude</message> </field-validator> - <!-- 0 <= haulingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml ===================================== @@ -192,17 +192,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> - <!-- 0 <= latitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -217,17 +206,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> - <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml ===================================== @@ -50,18 +50,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> - <!-- 0 <= latitude <= 90 --> - - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -76,17 +64,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> - <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -70,21 +70,13 @@ observe.common.BranchlinesCompositionObsDto.length=Length observe.common.BranchlinesCompositionObsDto.proportion=Proportion observe.common.BranchlinesCompositionObsDto.topType=Top part type observe.common.BranchlinesCompositionObsDto.tracelineType=Traceline type -observe.common.CatchLonglineLogbookDto.basket=Basket -observe.common.CatchLonglineLogbookDto.branchline=Branchline observe.common.CatchLonglineLogbookDto.catchFateLongline=Fate observe.common.CatchLonglineLogbookDto.catchHealthness=Catch healthness observe.common.CatchLonglineLogbookDto.comment=Comment observe.common.CatchLonglineLogbookDto.count=Count observe.common.CatchLonglineLogbookDto.discardHealthness=Discard healthness -observe.common.CatchLonglineLogbookDto.gonadeWeight=Gonade weight (g) -observe.common.CatchLonglineLogbookDto.hookPosition=Hook position -observe.common.CatchLonglineLogbookDto.maturityStatus=Sexual maturity observe.common.CatchLonglineLogbookDto.onBoardProcessing=On board processing -observe.common.CatchLonglineLogbookDto.section=Section -observe.common.CatchLonglineLogbookDto.sex=Sex observe.common.CatchLonglineLogbookDto.speciesCatch=Species -observe.common.CatchLonglineLogbookDto.stomacFullness=Stomac fullness observe.common.CatchLonglineObsDto.basket=Basket observe.common.CatchLonglineObsDto.branchline=Branchline observe.common.CatchLonglineObsDto.catchFateLongline=Fate @@ -444,8 +436,6 @@ observe.common.VesselSizeCategoryDto.gaugeLabel=Gauge label observe.common.WeightCategorySeineDto.species=Thuna species observe.common.WindDto.speedRange=Speed range observe.common.WindDto.waveHeight=Wave weight -observe.validation.activity.bound.latitude=Latitude must be between %1$s and %2$s. -observe.validation.activity.bound.longitude=Longitude must be between %1$s and %2$s. observe.validation.activity.bound.seaSurfaceTemperature=Temperature must be between %1$s%3$s and %2$s%3$s. observe.validation.activity.bound.vesselSpeed=Vessel speed must be between %1$s and %2$s. observe.validation.activity.comment.tobig=Comment size is bound to 1024 characters. @@ -461,7 +451,6 @@ observe.validation.activity.desactivated.vesselActivity=Selected vessel activity observe.validation.activity.desactivated.wind=Selected wind is disabled. observe.validation.activity.duplicated.time=There is already another activity at this time. observe.validation.activity.invalid.quadrant=Quadrant is not coherent with ocean (%1$s) of trip (indian\: 1,2, atlantic 1,2,3,4). -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. observe.validation.activity.invalid.speed=Activity speed is %s nb, which is more than the maximum authorized which is %s nd. observe.validation.activity.null.dcp=No floating object selected. observe.validation.activity.null.fpaZone=Fpa zone is not filled. @@ -601,11 +590,9 @@ observe.validation.lengthLengthParameter.null.ocean=Ocean is not filled. observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Output size measure type is not filled. observe.validation.lengthLengthParameter.null.sex=Sex must be filled. observe.validation.lengthLengthParameter.required.coefficients=Coefficients are required. -observe.validation.lengthLengthParameter.required.endDate=End date must be filled. observe.validation.lengthLengthParameter.required.inputOutputFormula=Formula is required. observe.validation.lengthLengthParameter.required.outputInputFormula=Formula is required. observe.validation.lengthLengthParameter.required.species=Species must be filled. -observe.validation.lengthLengthParameter.required.startDate=Start date must be filled. observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Selected size measure type is disabled. observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Formula is not valid. 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 observe.validation.nonTargetCatchRelease.bound.count=Count must be between %1$s and %2$s. observe.validation.nonTargetCatchRelease.comment.tobig=Comment size can not exceed 1024 characters. observe.validation.nonTargetCatchRelease.desactivated.conformity=Selected conformity is disabled. -observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Selected releasing time is disabled. observe.validation.nonTargetCatchRelease.desactivated.sex=Selected sex fate is disabled. observe.validation.nonTargetCatchRelease.desactivated.species=Selected species is disabled. 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 observe.validation.referentiel.status.required=Status must be filled. observe.validation.referentiel.untranslated.label1=English label is not translated. observe.validation.referentiel.untranslated.label3=Spanish label is not translated. -observe.validation.required.categoryMax=Category max is not filled. -observe.validation.required.categoryMin=Category min is not filled. observe.validation.required.compagnies=Compagnies is not filled. observe.validation.required.harbour=Harbour is not filleds. 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). observe.validation.route.invalid.endLogValue.maximum=End log can't be before start log. observe.validation.route.invalid.endLogValue.minimum=End log must be after start log. 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). -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). observe.validation.route.invalid.speed=Speed between two activities can't exceed %1$s nd, (activity %2$s speed is %3$s). observe.validation.route.invalid.startLogValue=Start log value (%1$s) can't be after end log value (%2$s) of route %3$s. 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 observe.validation.setLongline.baitsComposition.uniqueKey=Tuple (type/status/size/weight) must be unique. observe.validation.setLongline.bound.basketsPerSectionCount=Baskets per section count must be bound between %s and %s. observe.validation.setLongline.bound.branchlinesPerBasketCount=Branchlines per basket count must be bound between %s and %s. -observe.validation.setLongline.bound.haulingEndLatitude=Latitude must be bound between %s and %s. -observe.validation.setLongline.bound.haulingEndLongitude=Longitude must be bound between %s and %s. -observe.validation.setLongline.bound.haulingStartLatitude=Latitude must be bound between %s and %s. -observe.validation.setLongline.bound.haulingStartLongitude=Longitude must be bound between %s and %s. observe.validation.setLongline.bound.lightsticksPerBasketCount=Lightsticks per basket count must be bound between %s and %s. -observe.validation.setLongline.bound.settingEndLatitude=Latitude must be bound between %s and %s. -observe.validation.setLongline.bound.settingEndLongitude=Longitude must be bound between %s and %s. -observe.validation.setLongline.bound.settingStartLatitude=Latitude must be bound between %s and %s. -observe.validation.setLongline.bound.settingStartLongitude=Longitude must be bound between %s and %s. observe.validation.setLongline.bound.settingVesselSpeed=Setting vessel speed must be bound between %s and %s. observe.validation.setLongline.bound.shooterSpeed=Shooter speed must be bound between %s and %s. observe.validation.setLongline.bound.snapWeight=Snap weight must be bound between %s and %s. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -70,21 +70,13 @@ observe.common.BranchlinesCompositionObsDto.length=Longitud (m) observe.common.BranchlinesCompositionObsDto.proportion=Proporción (%) observe.common.BranchlinesCompositionObsDto.topType=Tipo de la parte superior observe.common.BranchlinesCompositionObsDto.tracelineType=Tipo bajo de línea -observe.common.CatchLonglineLogbookDto.basket=cesta -observe.common.CatchLonglineLogbookDto.branchline=Arponcillo observe.common.CatchLonglineLogbookDto.catchFateLongline=Devenir observe.common.CatchLonglineLogbookDto.catchHealthness=Salud a la captura observe.common.CatchLonglineLogbookDto.comment=Comentario observe.common.CatchLonglineLogbookDto.count=Numéro observe.common.CatchLonglineLogbookDto.discardHealthness=Salud al rechazo -observe.common.CatchLonglineLogbookDto.gonadeWeight=Peso de las gonadas (g) -observe.common.CatchLonglineLogbookDto.hookPosition=Posición del gancho -observe.common.CatchLonglineLogbookDto.maturityStatus=Maturidad sexual observe.common.CatchLonglineLogbookDto.onBoardProcessing=On board processing \#TODO -observe.common.CatchLonglineLogbookDto.section=sección -observe.common.CatchLonglineLogbookDto.sex=Sexo observe.common.CatchLonglineLogbookDto.speciesCatch=Especie -observe.common.CatchLonglineLogbookDto.stomacFullness=Estatuto del estomago observe.common.CatchLonglineObsDto.basket=cesta observe.common.CatchLonglineObsDto.branchline=Arponcillo observe.common.CatchLonglineObsDto.catchFateLongline=Devenir @@ -446,8 +438,6 @@ observe.common.VesselSizeCategoryDto.gaugeLabel=Texto «Capacidad» observe.common.WeightCategorySeineDto.species=Especie observe.common.WindDto.speedRange=Texto velocidad del viento observe.common.WindDto.waveHeight=Texto descriptivo de «altura media de la ola» -observe.validation.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. -observe.validation.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s. observe.validation.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s%3$s y %2$s%3$s. observe.validation.activity.bound.vesselSpeed=La Velocidad del viento estar comprendida entre %1$s y %2$s. 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 observe.validation.activity.desactivated.wind=La fuerza del viento seleccionada está desactivada. observe.validation.activity.duplicated.time=Ya existe una actividad a esa hora. 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) -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 observe.validation.activity.invalid.speed=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos. observe.validation.activity.null.dcp=No se ha introducido objeto flotante. 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 observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. \#TODO observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. \#TODO observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. \#TODO -observe.validation.lengthLengthParameter.required.endDate=Fecha de fin de validez debe ser especificada. observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. \#TODO observe.validation.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire. \#TODO observe.validation.lengthLengthParameter.required.species=Especie no especificada. -observe.validation.lengthLengthParameter.required.startDate=fecha de comienzo de validez no especificada. observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé. \#TODO observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no es coherente. 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 observe.validation.nonTargetCatchRelease.bound.count=Le nombre doit être compris entre %1$s et %2$s. \#TODO observe.validation.nonTargetCatchRelease.comment.tobig=La taille du commentaire est limitée à 1024 caractères. \#TODO observe.validation.nonTargetCatchRelease.desactivated.conformity=Selected conformity is disabled. \#TODO -observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Selected releasing time is disabled. \#TODO observe.validation.nonTargetCatchRelease.desactivated.sex=Le sexe sélectionné est désactivé. \#TODO observe.validation.nonTargetCatchRelease.desactivated.species=L'espèce sélectionnée est désactivée. \#TODO 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 ( observe.validation.referentiel.status.required=El estatuto activo-inactivo es mandatorio. observe.validation.referentiel.untranslated.label1=La etiqueta en inglés no se ha traducido. observe.validation.referentiel.untranslated.label3=La etiqueta en espaÑol no se ha traducido. -observe.validation.required.categoryMax=Category max is not filled. -observe.validation.required.categoryMin=Category min is not filled. observe.validation.required.compagnies=Compagnies is not filled. observe.validation.required.harbour=Harbour is not filleds. 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 observe.validation.route.invalid.endLogValue.maximum=La corredera de tarde no puede ser superior en %1$s a la de mañana. observe.validation.route.invalid.endLogValue.minimum=la corredera de tarde debe ser superior a la de mañana. 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) -observe.validation.route.invalid.seaSurfaceTemperature=La temperatura superficial no puede variar más de 12° entre 2 actividades (actividad %1$s incorrecta). observe.validation.route.invalid.speed=la velocidad entre dos actividades no debe sobrepasar %1$s nd, (actividad %2$s incorrecta, velocidad \: %3$s nd). 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. 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 observe.validation.setLongline.baitsComposition.uniqueKey=La tupla (type/estado/tamaño/peso) debe ser única, la tupa ya está utilizada. observe.validation.setLongline.bound.basketsPerSectionCount=El número de cestas en la sección debe estar comprendido entre %1$s y %2$s. observe.validation.setLongline.bound.branchlinesPerBasketCount=El número de avanzuelos en la cesta debe estar comprendido entre %1$s y %2$s. -observe.validation.setLongline.bound.haulingEndLatitude=La latitud de fin de arrastre debe estar comprendida entre %1$s y %2$s. -observe.validation.setLongline.bound.haulingEndLongitude=La longitud de fin de arrastre debe estar comprendida entre %1$s y %2$s. -observe.validation.setLongline.bound.haulingStartLatitude=La latitud de inicio de arrastre debe estar comprendida entre %1$s y %2$s. -observe.validation.setLongline.bound.haulingStartLongitude=La longitud de inicio de arrastre debe estar comprendida entre %1$s y %2$s. observe.validation.setLongline.bound.lightsticksPerBasketCount=El número de cyalumes en la cesta debe estar comprendido entre %1$s y %2$s. -observe.validation.setLongline.bound.settingEndLatitude=La latitud de fin de calada debe estar comprendida entre %1$s y %2$s. -observe.validation.setLongline.bound.settingEndLongitude=La longitud de fin de calada debe estar comprendida entre %1$s y %2$s. -observe.validation.setLongline.bound.settingStartLatitude=La latitud de inicio de calada debe estar comprendida entre %1$s y %2$s. -observe.validation.setLongline.bound.settingStartLongitude=La longitud de inicio de calada debe estar comprendida entre %1$s y %2$s. observe.validation.setLongline.bound.settingVesselSpeed=La velocidad del barco debe estar comprendida entre %1$s y %2$s. observe.validation.setLongline.bound.shooterSpeed=La velocidad de shooter debe estar comprendida entre %1$s y %2$s. observe.validation.setLongline.bound.snapWeight=El peso snap debe estar comprendido entre %1$s y %2$s. ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -70,21 +70,13 @@ observe.common.BranchlinesCompositionObsDto.length=Longueur (m) observe.common.BranchlinesCompositionObsDto.proportion=Proportion (%) observe.common.BranchlinesCompositionObsDto.topType=Type partie supérieure observe.common.BranchlinesCompositionObsDto.tracelineType=Type bas de ligne -observe.common.CatchLonglineLogbookDto.basket=Panier -observe.common.CatchLonglineLogbookDto.branchline=Avançon observe.common.CatchLonglineLogbookDto.catchFateLongline=Devenir observe.common.CatchLonglineLogbookDto.catchHealthness=Santé à la capture observe.common.CatchLonglineLogbookDto.comment=Commentaire observe.common.CatchLonglineLogbookDto.count=Nombre observe.common.CatchLonglineLogbookDto.discardHealthness=Santé au rejet -observe.common.CatchLonglineLogbookDto.gonadeWeight=Poids des gonades (g) -observe.common.CatchLonglineLogbookDto.hookPosition=Position de l'hameçon -observe.common.CatchLonglineLogbookDto.maturityStatus=Maturité sexuelle observe.common.CatchLonglineLogbookDto.onBoardProcessing=Traitement à bord -observe.common.CatchLonglineLogbookDto.section=Section -observe.common.CatchLonglineLogbookDto.sex=Sexe observe.common.CatchLonglineLogbookDto.speciesCatch=Espèce -observe.common.CatchLonglineLogbookDto.stomacFullness=État de l'estomac observe.common.CatchLonglineObsDto.basket=Panier observe.common.CatchLonglineObsDto.branchline=Avançon observe.common.CatchLonglineObsDto.catchFateLongline=Devenir @@ -444,8 +436,6 @@ observe.common.VesselSizeCategoryDto.gaugeLabel=Libellé jauge observe.common.WeightCategorySeineDto.species=Espèce de thon observe.common.WindDto.speedRange=Libellé vitesse vent observe.common.WindDto.waveHeight=Libellé Hauteur moyenne vagues -observe.validation.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s. -observe.validation.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s. observe.validation.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s%3$s et %2$s%3$s. observe.validation.activity.bound.vesselSpeed=La vitesse navire doit être comprise entre %1$s et %2$s. 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 observe.validation.activity.desactivated.wind=Le vent Beaufort sélectionné est désactivé. observe.validation.activity.duplicated.time=Il existe déjà une autre activité à cette heure. 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 -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. 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 observe.validation.activity.null.dcp=Aucun objet flottant saisi. 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é. observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. -observe.validation.lengthLengthParameter.required.endDate=Date de fin de validité non renseignée. observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. observe.validation.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire. observe.validation.lengthLengthParameter.required.species=L'espèce n'est pas renseignée. -observe.validation.lengthLengthParameter.required.startDate=date de début de validité non renseignée. observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé. observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente. 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) observe.validation.nonTargetCatchRelease.bound.count=Le nombre doit être compris entre %1$s et %2$s. observe.validation.nonTargetCatchRelease.comment.tobig=La taille du commentaire est limitée à 1024 caractères. observe.validation.nonTargetCatchRelease.desactivated.conformity=La conformité sélectionnée est désactivée. -observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Le moment de libération sélectionné est désactivé. observe.validation.nonTargetCatchRelease.desactivated.sex=Le sexe sélectionné est désactivé. observe.validation.nonTargetCatchRelease.desactivated.species=L'espèce sélectionnée est désactivée. 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 observe.validation.referentiel.status.required=Le statut actif-inactif est obligatoire. observe.validation.referentiel.untranslated.label1=Le libellé anglais n'est pas traduit. observe.validation.referentiel.untranslated.label3=Le libellé espagnol n'est pas traduit. -observe.validation.required.categoryMax=La catégorie Max n'est pas renseignée. -observe.validation.required.categoryMin=La catégorie Min n'est pas renseignée. observe.validation.required.compagnies=La compagnie n'est pas renseignée. observe.validation.required.harbour=Le port n'est pas renseigné. 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 observe.validation.route.invalid.endLogValue.maximum=Le loch du soir ne peut pas être supérieur de %1$s à celui du matin. observe.validation.route.invalid.endLogValue.minimum=Le loch du soir doit être strictement supérieur à celui du matin. 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 -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). 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). 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. 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 observe.validation.setLongline.baitsComposition.uniqueKey=Le tuple (type/état/taille/poids) doit être unique, le tuple est déjà utilisé. observe.validation.setLongline.bound.basketsPerSectionCount=Le nombre de panier par section doit être compris entre %1$s et %2$s. observe.validation.setLongline.bound.branchlinesPerBasketCount=Le nombre d'hameçons par panier doit être compris entre %1$s et %2$s. -observe.validation.setLongline.bound.haulingEndLatitude=La latitude de fin de virage doit être comprise entre %1$s et %2$s. -observe.validation.setLongline.bound.haulingEndLongitude=La longitude de fin de virage doit être comprise entre %1$s et %2$s. -observe.validation.setLongline.bound.haulingStartLatitude=La latitude de début de virage doit être comprise entre %1$s et %2$s. -observe.validation.setLongline.bound.haulingStartLongitude=La longitude de début de virage doit être comprise entre %1$s et %2$s. observe.validation.setLongline.bound.lightsticksPerBasketCount=Le nombre de cyalumes par panier doit être compris entre %1$s et %2$s. -observe.validation.setLongline.bound.settingEndLatitude=La latitude de fin de filage doit être comprise entre %1$s et %2$s. -observe.validation.setLongline.bound.settingEndLongitude=La longitude de fin de filage doit être comprise entre %1$s et %2$s. -observe.validation.setLongline.bound.settingStartLatitude=La latitude de début de filage doit être comprise entre %1$s et %2$s. -observe.validation.setLongline.bound.settingStartLongitude=La longitude de début de filage doit être comprise entre %1$s et %2$s. observe.validation.setLongline.bound.settingVesselSpeed=La vitesse bateau doit être comprise entre %1$s et %2$s. observe.validation.setLongline.bound.shooterSpeed=La vitesse de shooter doit être comprise entre %1$s et %2$s. observe.validation.setLongline.bound.snapWeight=Le poids snap doit être compris entre %1$s et %2$s. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b95c598b05fa5dbe8f70f358d4e... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b95c598b05fa5dbe8f70f358d4e... You're receiving this email because of your account on gitlab.com.