This is an automated email from the git hooks/post-receive script. New change to branch feature/8142 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at cd85081 on vérifie que tous les poids sont saisis ou aucun (fixes #8142) This branch includes the following new commits: new cd85081 on vérifie que tous les poids sont saisis ou aucun (fixes #8142) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit cd850814f9e93bb07ffdc0c7a5e6a5e708b55235 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 17 18:47:49 2016 +0100 on vérifie que tous les poids sont saisis ou aucun (fixes #8142) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8142 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit cd850814f9e93bb07ffdc0c7a5e6a5e708b55235 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 17 18:47:49 2016 +0100 on vérifie que tous les poids sont saisis ou aucun (fixes #8142) --- .../species/frequency/SpeciesFrequencyUIModel-error-validation.xml | 7 +++++++ .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 3 files changed, 9 insertions(+) diff --git a/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml b/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml index de1d3fb..c16c648 100644 --- a/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml +++ b/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml @@ -58,6 +58,13 @@ <message>tutti.validator.error.speciesFrequency.oneRowRequired</message> </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ !(isCopyIndividualObservationSize() && isSomeRowsWithWeightAndOtherWithout()) ]]> + </param> + <message>tutti.validator.error.speciesFrequency.allWeightsOrNoneRequired</message> + </field-validator> + </field> <field name="totalWeight"> diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 6cca7c3..cf4a225 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -2555,6 +2555,7 @@ tutti.validator.error.rtpEditor.rtpMaleA.required= tutti.validator.error.rtpEditor.rtpMaleB.required= tutti.validator.error.rtpEditor.rtpUndefinedA.required= tutti.validator.error.rtpEditor.rtpUndefinedB.required= +tutti.validator.error.speciesFrequency.allWeightsOrNoneRequired= tutti.validator.error.speciesFrequency.incoherentTotalWeights= tutti.validator.error.speciesFrequency.individualObservationsWithoutWeights= tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index ff69d2e..c10df15 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -2345,6 +2345,7 @@ tutti.validator.error.rtpEditor.rtpMaleA.required= tutti.validator.error.rtpEditor.rtpMaleB.required= tutti.validator.error.rtpEditor.rtpUndefinedA.required= tutti.validator.error.rtpEditor.rtpUndefinedB.required= +tutti.validator.error.speciesFrequency.allWeightsOrNoneRequired=Tous les poids doivent être saisis ou aucun tutti.validator.error.speciesFrequency.incoherentTotalWeights=Le poids total est différent de la somme des poids des poids observés tutti.validator.error.speciesFrequency.individualObservationsWithoutWeights=Tous les poids des observations individuelles ne sont pas renseignés tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required=La classe de taille est obligatoire -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm