Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 757bd9cd by Tony CHEMIT at 2018-10-04T07:17:50Z Fix some coordinates validation - Closes #1113 - - - - - 13 changed files: - 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-update-error-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/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -98,7 +98,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -83,7 +83,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml ===================================== @@ -99,7 +99,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml ===================================== @@ -84,7 +84,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml ===================================== @@ -43,7 +43,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.sample.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml ===================================== @@ -44,7 +44,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.sample.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -217,7 +217,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -283,7 +283,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -349,7 +349,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -415,7 +415,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -250,20 +250,6 @@ </message> </field-validator> - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingStartLongitude == null || settingStartLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( settingStartLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -271,6 +257,23 @@ </field> + <field name="settingStartQuadrant"> + + <!-- 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="settingEndLatitude"> <!-- settingEndLatitude obligatoire --> @@ -314,20 +317,6 @@ </message> </field-validator> - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingEndLongitude == null || settingEndLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( settingEndLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -335,6 +324,23 @@ </field> + <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> + + <!-- 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="haulingStartLatitude"> <!-- haulingStartLatitude obligatoire --> @@ -378,20 +384,6 @@ </message> </field-validator> - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingStartLongitude == null || haulingStartLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( haulingStartLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -399,6 +391,22 @@ </field> + <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> + + <!-- 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="haulingEndLatitude"> @@ -443,20 +451,6 @@ </message> </field-validator> - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingEndLongitude == null || haulingEndLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( haulingEndLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> @@ -464,6 +458,23 @@ </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/SetLonglineObsDto-create-error-validation.xml ===================================== @@ -217,7 +217,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -283,7 +283,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -349,7 +349,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -415,7 +415,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml ===================================== @@ -250,20 +250,6 @@ </message> </field-validator> - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingStartLongitude == null || settingStartLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( settingStartLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -271,6 +257,23 @@ </field> + <field name="settingStartQuadrant"> + + <!-- 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="settingEndLatitude"> <!-- settingEndLatitude obligatoire --> @@ -314,24 +317,26 @@ </message> </field-validator> - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingEndLongitude == null || settingEndLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( settingEndLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> </field-validator> + </field> + + <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> + + <!-- 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> @@ -378,20 +383,6 @@ </message> </field-validator> - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingStartLongitude == null || haulingStartLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( haulingStartLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -399,6 +390,22 @@ </field> + <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> + + <!-- 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="haulingEndLatitude"> @@ -443,20 +450,6 @@ </message> </field-validator> - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingEndLongitude == null || haulingEndLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( haulingEndLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> @@ -464,6 +457,24 @@ </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/i18n/validation_en_GB.properties ===================================== @@ -731,6 +731,7 @@ observe.validation.route.null.comment=Comment is not filled. observe.validation.route.positive.startLogValue=Start log value must be strictly positive observe.validation.route.required.date=Date must be filled. observe.validation.route.unclosed.activity=There is an open activity on route (%1$s). +observe.validation.sample.invalid.quadrant=Quadrant is not coherent with ocean (%1$s) of trip (indian\: 1,2, atlantic 1,2,3,4). observe.validation.sampleLogbook.null.parts=Aucune donnée saisie observe.validation.sampleLogbook.required.date=La date est obligatoire observe.validation.samplePart.desactivated.weightMeasureType=Selected weight mesure type is disabled. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -733,6 +733,7 @@ observe.validation.route.null.comment=No hay comentario especificado. observe.validation.route.positive.startLogValue=La corredera de mañana debe ser un entero positivo. observe.validation.route.required.date=Se debe especificar el día de observación. observe.validation.route.unclosed.activity=Existe una actividad no cerrada (%1$s). +observe.validation.sample.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.sampleLogbook.null.parts=Aucune donnée saisie observe.validation.sampleLogbook.required.date=La date est obligatoire observe.validation.samplePart.desactivated.weightMeasureType=Selected weight mesure type is disabled. \#TODO ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -731,6 +731,7 @@ observe.validation.route.null.comment=Aucun commentaire renseigné. observe.validation.route.positive.startLogValue=Le loch du matin doit être un entier strictement positif. observe.validation.route.required.date=Le jour d'observation doit être renseigné. observe.validation.route.unclosed.activity=Il existe une activité non clôturée (%1$s). +observe.validation.sample.invalid.quadrant=Le quadrant n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) observe.validation.sampleLogbook.null.parts=Aucune donnée saisie observe.validation.sampleLogbook.required.date=La date est obligatoire observe.validation.samplePart.desactivated.weightMeasureType=Le type de mesure de poids sélectionné est désactivé. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/757bd9cd10d19a4bbd88c5fcf96e... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/757bd9cd10d19a4bbd88c5fcf96e... You're receiving this email because of your account on gitlab.com.