Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8a75fa39 by tchemit at 2019-01-16T14:01:14Z Ajout de règles de validation de niveau 1 - See #915 - - - - - 7 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/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-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-update-error-validation.xml Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1,3 +1,4 @@ +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date ClientConfig.description=ObServe configuration ObserveWebApplicationConfig.description=ObServe Web configuration observe.TripLongline.action.generateHomeId.tip=Generate a new id ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1,3 +1,4 @@ +observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be greater than current trip end date#TODO ClientConfig.description=Configuración de ObServe ObserveWebApplicationConfig.description=Configuración de Observe web observe.TripLongline.action.generateHomeId.tip=Génerer un identifiant \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -11,6 +11,7 @@ observe.action.auto.copy.to.clipboard.tip=Mettre à jour automatiquement le cont observe.action.back.to.list=Retour à la liste observe.action.back.to.list.tip=Retour à la liste des données observe.action.cancel=Annuler +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.action.cancel.remote.tip=Annuler la création de la configuration observe.action.cancel.server.tip=Annuler la création de la configuration observe.action.change.storage=Changer la source de données ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -25,27 +25,26 @@ <validators> <field name="vesselActivityLongline"> - - <!-- pas de vesselActivityLongline selectionne --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.vesselActivity</message> + <field-validator type="mandatory" short-circuit="true"> + <message/> </field-validator> </field> <field name="startDate"> - - <!-- pas de date selectionne --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.date</message> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ currentTripLongline.endDate.time <= startDate.time ]]> + </param> + <message>observe.validation.activityLongline.startDate.before.currentTrip.endDate</message> </field-validator> - </field> <field name="startTime"> - - <!-- pas d'heure d'observation selectionne --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.time</message> + <field-validator type="mandatory" short-circuit="true"> + <message/> </field-validator> <!-- heure observation non duplique --> @@ -67,7 +66,7 @@ <field name="seaSurfaceTemperature"> <field-validator type="temperatureBound" short-circuit="true"> - <param name="min">12.0</param> + <param name="min">15.0</param> <param name="max">35.0</param> <param name="defaultTemperatureFormat">C</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -34,6 +34,12 @@ <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ currentTripLongline.endDate.time <= startDate.time ]]> + </param> + <message>observe.validation.activityLongline.startDate.before.currentTrip.endDate</message> + </field-validator> </field> <field name="startTime"> @@ -44,7 +50,7 @@ <field name="seaSurfaceTemperature"> <field-validator type="temperatureBound" short-circuit="true"> - <param name="min">12.0</param> + <param name="min">15.0</param> <param name="max">35.0</param> <param name="defaultTemperatureFormat">C</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -343,8 +343,8 @@ </field> <field name="totalHooksCount"> <field-validator type="boundNumber" short-circuit="true"> - <param name="min">0.0</param> - <param name="max">5000.0</param> + <param name="min">500.0</param> + <param name="max">5500.0</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -343,8 +343,8 @@ </field> <field name="totalHooksCount"> <field-validator type="boundNumber" short-circuit="true"> - <param name="min">0.0</param> - <param name="max">5000.0</param> + <param name="min">500.0</param> + <param name="max">5500.0</param> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8a75fa3956a8a0fb3d2636b78281... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8a75fa3956a8a0fb3d2636b78281... You're receiving this email because of your account on gitlab.com.