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 f6609dd61769b259529ed0ba0282a65117479549 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 6 12:03:03 2016 +0100 Ajout validation de sizeMeasureType sur NonTargetLength --- .../NonTargetLengthDto-ui-update-error-validation.xml | 17 +++++++++++++++++ .../i18n/application-swing-validation_en_GB.properties | 2 ++ .../i18n/application-swing-validation_es_ES.properties | 2 ++ .../i18n/application-swing-validation_fr_FR.properties | 3 ++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-error-validation.xml index 3e29532..361b885 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-error-validation.xml @@ -55,6 +55,23 @@ </field> + <field name="sizeMeasureType"> + + <!-- pas de sizeMeasureType selectionnee --> + <field-validator type="required" short-circuit="true"> + <message>validator.ui.nonTargetLength.required.sizeMeasureType</message> + </field-validator> + + <!-- sizeMeasureType desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ sizeMeasureType.enabled ]]> + </param> + <message>validator.ui.nonTargetLength.desactivated.sizeMeasureType</message> + </field-validator> + + </field> + <field name="length"> <!-- taille obligatoire en mode par count --> 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 9f9426d..6d8aa55 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 @@ -371,7 +371,9 @@ validator.ui.nonTargetCatch.required.speciesFate=Species fate must be filled. validator.ui.nonTargetCatch.required.weightOrNombreEstime=Weight or estimated count must be filled. validator.ui.nonTargetCatch.required.weightOrTailleMoyen=Weight or mean size must be filled. validator.ui.nonTargetCatch.uniqueKey=Tuple (speces - objectFate) muste be unique. +validator.ui.nonTargetLength.desactivated.sizeMeasureType=Selected size measure type is disabled. validator.ui.nonTargetLength.desactivated.speciesFate=Selected species fate is disabled. +validator.ui.nonTargetLength.required.sizeMeasureType=Size measure type is mandatory. validator.ui.nonTargetLength.required.speciesFate=Species fate must be filled. validator.ui.nonTargetSample.bound.length=Length must be bound between %s and %s. validator.ui.nonTargetSample.bound.weight=Weight must be bound between %s and %s. 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 51bdabd..1e0b795 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 @@ -371,7 +371,9 @@ validator.ui.nonTargetCatch.required.speciesFate=Es obligatoiro seleccionar un f validator.ui.nonTargetCatch.required.weightOrNombreEstime=Debe seleccionar uno de los dos valores (peso estimado, número estimado). validator.ui.nonTargetCatch.required.weightOrTailleMoyen=Debe seleccionar uno de los dos valores (peso medio o talla media). validator.ui.nonTargetCatch.uniqueKey=El par (especie - objectFate) debe ser único. +validator.ui.nonTargetLength.desactivated.sizeMeasureType=Selected size mesure type is disabled. \#TODO validator.ui.nonTargetLength.desactivated.speciesFate=El objectFate de fauna seleccionado está desactivado. +validator.ui.nonTargetLength.required.sizeMeasureType=Es obligatoria especificar el size measure type \#TODO validator.ui.nonTargetLength.required.speciesFate=Es obligatoiro seleccionar un futuro de fauna. validator.ui.nonTargetSample.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. validator.ui.nonTargetSample.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. 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 fb6e9ea..801b518 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 @@ -371,7 +371,9 @@ validator.ui.nonTargetCatch.required.speciesFate=La sélection d'un devenir faun validator.ui.nonTargetCatch.required.weightOrNombreEstime=Une des deux valeurs (poids estimé, nombre estimé) doit être renseignée. validator.ui.nonTargetCatch.required.weightOrTailleMoyen=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée. validator.ui.nonTargetCatch.uniqueKey=Le couple (espèce - objectFate) doit être unique. +validator.ui.nonTargetLength.desactivated.sizeMeasureType=Le type de mesure sélectionné est désactivé. validator.ui.nonTargetLength.desactivated.speciesFate=Le devenir faune sélectionné est désactivé. +validator.ui.nonTargetLength.required.sizeMeasureType=Le type de mesure est obligatoire. validator.ui.nonTargetLength.required.speciesFate=La sélection d'un devenir faune est obligatoire. validator.ui.nonTargetSample.bound.length=La taille pour cette espèce doit être comprise entre %1$s et %2$s. validator.ui.nonTargetSample.bound.weight=Le poids pour cette espèce doit être compris entre %1$s et %2$s. @@ -562,7 +564,6 @@ validator.ui.targetLength.desactivated.species=L'espèce sélectionnée est dés validator.ui.targetLength.positive.length=La longueur est un entier strictement positif. validator.ui.targetLength.positive.weight=Le poids est un entier strictement positif. validator.ui.targetLength.required.count=Le nombre effectif est obligatoire. -validator.ui.targetLength.required.sizeMeasureType=Le type de mesure est obligatoire. validator.ui.targetLength.required.species=La sélection d'une espèce de thon est obligatoire. validator.ui.targetLength.required.taille=La taille est obligatoire. validator.ui.targetLength.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.