This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 22901051dc69ba454ec2e9ce2b2fa25697371788 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 19:29:58 2016 +0200 [LL] le champ devenir capture doit être obligatoire (fixes #7888) --- .../dto/longline/CatchLonglineDto-ui-update-error-validation.xml | 5 +++++ .../resources/i18n/application-swing-validation_en_GB.properties | 1 + .../resources/i18n/application-swing-validation_es_ES.properties | 1 + .../resources/i18n/application-swing-validation_fr_FR.properties | 1 + 4 files changed, 8 insertions(+) diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-error-validation.xml index da1a580..8430311 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-error-validation.xml @@ -72,6 +72,11 @@ <field name="catchFateLongline"> + + <!-- pas de catchFateLongline selectionnee --> + <field-validator type="required" short-circuit="true"> + <message>validator.ui.catchLongline.required.catchFateLongline</message> + </field-validator> <!-- catchFateLongline desactive --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties index 738d99b..7196b01 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -279,6 +279,7 @@ validator.ui.catchLongline.desactivated.maturityStatus=Selected maturity status validator.ui.catchLongline.desactivated.sex=Selected sec is disabled. validator.ui.catchLongline.desactivated.speciesCatch=Selected species is disabled. validator.ui.catchLongline.desactivated.stomacFullness=Selected stomact fullness is disabled. +validator.ui.catchLongline.required.catchFateLongline=Catch fate is mandatory. validator.ui.catchLongline.required.comment.for.speciesCatch=A comment is required for the selected species catch. validator.ui.catchLongline.required.count.when.acquisitionModeIsGrouped=Count must be filled in group mode. validator.ui.catchLongline.required.position=Position must be filled. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties index dbcf7cf..e7525ed 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -279,6 +279,7 @@ validator.ui.catchLongline.desactivated.maturityStatus=La maturidad sexual selec validator.ui.catchLongline.desactivated.sex=El sexo seleccionado está desactivado. validator.ui.catchLongline.desactivated.speciesCatch=La especie seleccionada está desactivada. validator.ui.catchLongline.desactivated.stomacFullness=El estado del estomago seleccionado está desactivado. +validator.ui.catchLongline.required.catchFateLongline=El futuro (devenir) está mandatorio. validator.ui.catchLongline.required.comment.for.speciesCatch=Se necesita un comentario para la especie seleccionada. validator.ui.catchLongline.required.count.when.acquisitionModeIsGrouped=El número es mandatorio en modo grupado. validator.ui.catchLongline.required.position=Se necesita la posición sobre el palangre. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties index f5fbb43..7e6fbec 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -279,6 +279,7 @@ validator.ui.catchLongline.desactivated.maturityStatus=La maturité sexuelle sé validator.ui.catchLongline.desactivated.sex=Le sexe sélectionné est désactivé. validator.ui.catchLongline.desactivated.speciesCatch=L'espèce sélectionnée est désactivée. validator.ui.catchLongline.desactivated.stomacFullness=L'état de l'estomac sélectionné est désactivé. +validator.ui.catchLongline.required.catchFateLongline=La sélection d'un devenir est obligatoire. validator.ui.catchLongline.required.comment.for.speciesCatch=Un commentaire est requis pour l'espèce sélectionnée. validator.ui.catchLongline.required.count.when.acquisitionModeIsGrouped=Le nombre est obligatoire en mode groupé. validator.ui.catchLongline.required.position=Pas de position renseignée sur la palangre. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.