Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a8558f3f by tchemit at 2019-01-21T14:30:45Z Ajout de règles de validation de niveau 1 - See #915 - - - - - 8 changed files: - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - validation/src/main/i18n/getters/validation-messages.getter - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-warning-validation.xml Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -3277,7 +3277,10 @@ observe.validation.activity.required.vesselActivity=must be filled. observe.validation.activity.speed.bound=Activity speed is %s nd, which is more than the maximum authorized which is %s nd. observe.validation.activity.speed.bound.inter=Speed between two activities can't exceed %1$s nd, (activity %2$s speed is %3$s). observe.validation.activityLongline.desactivated.fpaZone=Fpa zone is disabled. -observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date +observe.validation.activityLongline.endDate.after.currentTrip.startDate=End date must be after current trip start date +observe.validation.activityLongline.endDate.before.currentTrip.endDate=End date must be before current trip end date +observe.validation.activityLongline.startDate.after.currentTrip.startDate=Start date must be after current trip start date +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be before current trip end date observe.validation.baitsComposition.bound.individualSize=Size must be bound between %s and %s. observe.validation.baitsComposition.bound.individualWeight=Weight must be bound between %s and %s. observe.validation.baitsComposition.bound.proportion=Proportion must be bound between %s and %s. ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -3277,7 +3277,10 @@ observe.validation.activity.required.vesselActivity=Se debe seleccionar la activ observe.validation.activity.speed.bound=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos. observe.validation.activity.speed.bound.inter=la velocidad entre dos actividades no debe sobrepasar %1$s nd, (actividad %2$s incorrecta, velocidad \: %3$s nd). observe.validation.activityLongline.desactivated.fpaZone=La zona FPA seleccionada está desactivada. -observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date\#TODO +observe.validation.activityLongline.endDate.after.currentTrip.startDate=End date must be after current trip start date \#TODO +observe.validation.activityLongline.endDate.before.currentTrip.endDate=End date must be before current trip end date \#TODO +observe.validation.activityLongline.startDate.after.currentTrip.startDate=Start date must be after current trip start date \#TODO +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be before current trip end date \#TODO observe.validation.baitsComposition.bound.individualSize=El tamaño debe ser entre %s y %s. observe.validation.baitsComposition.bound.individualWeight=El peso debe ser entre %s y %s. observe.validation.baitsComposition.bound.proportion=La proporción debe ser entre %s y %s. ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -3277,7 +3277,10 @@ observe.validation.activity.required.vesselActivity=L'activité du navire est ob observe.validation.activity.speed.bound=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd. observe.validation.activity.speed.bound.inter=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.activityLongline.desactivated.fpaZone=La zone FPA sélectionnée est désactivée. -observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être après supérieure ou égale à la date de fin de marée +observe.validation.activityLongline.endDate.after.currentTrip.startDate=La date de fin doit être supérieure ou égale à la date de début de marée +observe.validation.activityLongline.endDate.before.currentTrip.endDate=La date de fin doit être inférieur ou égale à la date de fin de marée +observe.validation.activityLongline.startDate.after.currentTrip.startDate=La date doit être supérieure ou égale à la date de début de marée +observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être inférieure ou égale à la date de fin de marée observe.validation.baitsComposition.bound.individualSize=La taille doit être comprise entre %s et %s. observe.validation.baitsComposition.bound.individualWeight=Le poids doit être comprise entre %s et %s. observe.validation.baitsComposition.bound.proportion=La proportion doit être comprise entre %s et %s. ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -1,6 +1,9 @@ observe.validation.activity.duplicated.time observe.validation.activity.null.dcp observe.validation.activity.required.observedSystem.for.nonTargetCatch +observe.validation.activityLongline.endDate.after.currentTrip.startDate +observe.validation.activityLongline.endDate.before.currentTrip.endDate +observe.validation.activityLongline.startDate.after.currentTrip.startDate observe.validation.activityLongline.startDate.before.currentTrip.endDate observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped observe.validation.catchLongline.required.position ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -36,10 +36,16 @@ </field-validator> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ currentTripLongline.endDate.time <= startDate.time ]]> + <![CDATA[ currentTripLongline.endDate.time >= startDate.time ]]> </param> <message>observe.validation.activityLongline.startDate.before.currentTrip.endDate</message> </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ currentTripLongline.startDate.time <= startDate.time ]]> + </param> + <message>observe.validation.activityLongline.startDate.after.currentTrip.startDate</message> + </field-validator> </field> <field name="startTime"> @@ -64,6 +70,21 @@ </field> + <field name="endDate"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endDate == null || currentTripLongline.endDate.time >= endDate.time ]]> + </param> + <message>observe.validation.activityLongline.endDate.before.currentTrip.endDate</message> + </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endDate == null || currentTripLongline.startDate.time <= endDate.time ]]> + </param> + <message>observe.validation.activityLongline.endDate.after.currentTrip.startDate</message> + </field-validator> + </field> + <field name="seaSurfaceTemperature"> <field-validator type="temperatureBound" short-circuit="true"> <param name="min">15.0</param> @@ -73,27 +94,18 @@ </field-validator> </field> <field name="quadrant"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message/> </field-validator> </field> <field name="latitude"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> </field-validator> </field> <field name="longitude"> - <field-validator type="mandatory" short-circuit="true"> - <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/ll/logbook/ActivityLonglineLogbookDto-create-warning-validation.xml ===================================== @@ -24,6 +24,28 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="quadrant"> + <field-validator type="notFilled" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="latitude"> + <field-validator type="notFilled" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="longitude"> + <field-validator type="notFilled" short-circuit="true"> + <message/> + </field-validator> + </field> + + <field name="endDate"> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="seaSurfaceTemperature"> <field-validator type="notFilled" short-circuit="true"> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -36,10 +36,16 @@ </field-validator> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ currentTripLongline.endDate.time <= startDate.time ]]> + <![CDATA[ currentTripLongline.endDate.time >= startDate.time ]]> </param> <message>observe.validation.activityLongline.startDate.before.currentTrip.endDate</message> </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ currentTripLongline.startDate.time <= startDate.time ]]> + </param> + <message>observe.validation.activityLongline.startDate.after.currentTrip.startDate</message> + </field-validator> </field> <field name="startTime"> @@ -57,33 +63,39 @@ </field-validator> </field> <field name="quadrant"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message/> </field-validator> </field> <field name="latitude"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> </field-validator> </field> <field name="longitude"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> </field-validator> </field> + <field name="endDate"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endDate == null || currentTripLongline.endDate.time >= endDate.time ]]> + </param> + <message>observe.validation.activityLongline.endDate.before.currentTrip.endDate</message> + </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endDate == null || currentTripLongline.startDate.time <= endDate.time ]]> + </param> + <message>observe.validation.activityLongline.endDate.after.currentTrip.startDate</message> + </field-validator> + </field> + <field name="currentDirection"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0</param> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-warning-validation.xml ===================================== @@ -24,6 +24,28 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="quadrant"> + <field-validator type="notFilled" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="latitude"> + <field-validator type="notFilled" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="longitude"> + <field-validator type="notFilled" short-circuit="true"> + <message/> + </field-validator> + </field> + + <field name="endDate"> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="seaSurfaceTemperature"> <field-validator type="notFilled" short-circuit="true"> <message/> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a8558f3fd2b1943db77d52b0e715... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a8558f3fd2b1943db77d52b0e715... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT