This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 4d289496b5314c235ea890078457c81d18579f4a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 29 09:35:33 2015 +0100 ajout des validateurs (refs #7617) --- .../longline/TdrDto-n1-update-error-validation.xml | 125 +++++++++++++++++++++ .../TdrDto-n1-update-warning-validation.xml | 63 +++++++++++ 2 files changed, 188 insertions(+) diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-error-validation.xml new file mode 100644 index 0000000..b29c350 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-error-validation.xml @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="sensorBrand"> + + <!-- sensorBrand desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ sensorBrand == null || sensorBrand.enabled ]]> + </param> + <message>validator.tdr.desactivated.sensorBrand</message> + </field-validator> + + </field> + + <field name="itemHorizontalPosition"> + + <!-- itemHorizontalPosition desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ itemHorizontalPosition == null || itemHorizontalPosition.enabled ]]> + </param> + <message>validator.tdr.desactivated.itemHorizontalPosition</message> + </field-validator> + + </field> + + <field name="itemVerticalPosition"> + + <!-- itemVerticalPosition desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ itemVerticalPosition == null || itemVerticalPosition.enabled ]]> + </param> + <message>validator.tdr.desactivated.itemVerticalPosition</message> + </field-validator> + + </field> + + <!--<field name="deployementStart">--> + + <!--<!– deployementStart non renseigne –>--> + <!--<field-validator type="required" short-circuit="true">--> + <!--<message>validator.tdr.required.deployementStart</message>--> + <!--</field-validator>--> + + <!--</field>--> + + <field name="fishingStart"> + + <!-- settingStartTimeStamp non renseigne --> + <!--field-validator type="required" short-circuit="true"> + <message>validator.tdr.required.fishingStart</message> + </field-validator--> + + <!-- deployementStart < fishingStart --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ deployementStart == null || fishingStart == null || deployementStart.time < fishingStart.time ]]> + </param> + <message>validator.tdr.deployementStart.before.fishingStart</message> + </field-validator> + + </field> + + <field name="fishingEnd"> + + <!-- fishingEnd non renseigne --> + <!--field-validator type="required" short-circuit="true"> + <message>validator.tdr.required.fishingEnd</message> + </field-validator--> + + <!-- fishingStart < fishingEnd --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ fishingStart == null || fishingEnd == null || fishingStart.time < fishingEnd.time ]]> + </param> + <message>validator.tdr.fishingStart.before.fishingEnd</message> + </field-validator> + + </field> + + <field name="deployementEnd"> + + <!-- deployementEnd non renseigne --> + <!--field-validator type="required" short-circuit="true"> + <message>validator.tdr.required.deployementEnd</message> + </field-validator--> + + <!-- fishingEnd < deployementEnd --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ fishingEnd == null || deployementEnd == null || fishingEnd.time < deployementEnd.time ]]> + </param> + <message>validator.tdr.fishingEnd.before.deployementEnd</message> + </field-validator> + + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..deec0a3 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/TdrDto-n1-update-warning-validation.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="section"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ !(section == null || basket == null || branchline == null)]]> + </param> + <message>validator.tdr.required.position</message> + </field-validator> + + </field> + + <field name="basket"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ !(section == null || basket == null || branchline == null)]]> + </param> + <message>validator.tdr.required.position</message> + </field-validator> + + </field> + + <field name="branchline"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ !(section == null || basket == null || branchline == null)]]> + </param> + <message>validator.tdr.required.position</message> + </field-validator> + + </field> + + +</validators> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.