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 9597e36f170528fe27f17cde26d8a351b965dd00 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 21:40:32 2016 +0200 ajout de la validation --- .../ActivitySeineDto-ui-create-error-validation.xml | 13 +++++++++++++ ...ctivitySeineDto-ui-create-warning-validation.xml | 21 +++++++++++++++++++++ .../ActivitySeineDto-ui-update-error-validation.xml | 13 +++++++++++++ ...ctivitySeineDto-ui-update-warning-validation.xml | 8 +++++--- 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml index 38be3ad..6e25980 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml @@ -333,4 +333,17 @@ </field> + <field name="observedSystem"> + + <!-- objectOperation selectionnee desactivte --> + <field-validator type="collectionFieldExpression"> + <param name="collectionFieldName">observedSystem</param> + <param name="mode">ALL</param> + <param name="useSensitiveContext">true</param> + <param name="expression"><![CDATA[ current.enabled ]]></param> + <message>validator.ui.activity.desactivated.observedSystem</message> + </field-validator> + + </field> + </validators> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-warning-validation.xml index 86f1867..efb2035 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-warning-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-warning-validation.xml @@ -93,4 +93,25 @@ </field> + <field name="observedSystemDistance"> + + <!-- Pas de distance au système observé renseignee --> + <field-validator type="required" short-circuit="true"> + <message>validator.ui.activity.null.observedSystemDistance</message> + </field-validator> + + </field> + + <field name="observedSystem"> + + <!-- Aucun systeme observe renseigne --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ !observedSystemEmpty ]]> + </param> + <message>validator.ui.activity.null.observedSystem</message> + </field-validator> + + </field> + </validators> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml index 5c52b27..e0c86cf 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml @@ -278,4 +278,17 @@ </field> + <field name="observedSystem"> + + <!-- objectOperation selectionnee desactivte --> + <field-validator type="collectionFieldExpression"> + <param name="collectionFieldName">observedSystem</param> + <param name="mode">ALL</param> + <param name="useSensitiveContext">true</param> + <param name="expression"><![CDATA[ current.enabled ]]></param> + <message>validator.ui.activity.desactivated.observedSystem</message> + </field-validator> + + </field> + </validators> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml index f26bf1d..a8efa67 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml @@ -73,11 +73,13 @@ </field> - <field name="observedSystemEmpty"> + <field name="observedSystem"> - <!-- Aucune systeme observe selectionne --> + <!-- Aucun systeme observe renseigne --> <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ !observedSystemEmpty ]]></param> + <param name="expression"> + <![CDATA[ !observedSystemEmpty ]]> + </param> <message>validator.ui.activity.null.observedSystem</message> </field-validator> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.