This is an automated email from the git hooks/post-receive script. New commit to branch feature/7587 in repository observe. See http://git.codelutin.com/observe.git commit 1a1febdb91f6c07025c9e254c428689132bbe396 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 6 11:24:49 2015 +0200 début de migration de l'ecran (refs #7587) --- .../TripSeineDto-n1-create-error-validation.xml | 243 +++++++++++++++++++++ .../TripSeineDto-n1-create-warning-validation.xml | 54 +++++ .../TripSeineDto-n1-update-error-validation.xml | 206 +++++++++++++++++ .../TripSeineDto-n1-update-warning-validation.xml | 94 ++++++++ 4 files changed, 597 insertions(+) diff --git a/observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-create-error-validation.xml new file mode 100644 index 0000000..e32342d --- /dev/null +++ b/observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-create-error-validation.xml @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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="observer"> + + <!-- pas de observer selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.observer</message> + </field-validator> + + <!-- observer desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ observer.enabled ]]> + </param> + <message>validator.trip.desactivated.observer</message> + </field-validator> + + </field> + + <field name="captain"> + + <!-- captain desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ captain == null || captain.enabled ]]> + </param> + <message>validator.trip.desactivated.captain</message> + </field-validator> + + </field> + + <field name="dataEntryOperator"> + + <!-- dataEntryOperator desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ dataEntryOperator == null || dataEntryOperator.enabled ]]> + </param> + <message>validator.trip.desactivated.dataEntryOperator</message> + </field-validator> + + </field> + + <field name="vessel"> + + <!-- pas de vessel sélectionné --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.vessel</message> + </field-validator> + + <!-- vessel desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ vessel.enabled ]]> + </param> + <message>validator.trip.desactivated.vessel</message> + </field-validator> + + </field> + + <field name="ocean"> + + <!-- pas d'ocean selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.ocean</message> + </field-validator> + + <!-- ocean desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ ocean == null || ocean.enabled ]]> + </param> + <message>validator.trip.desactivated.ocean</message> + </field-validator> + + </field> + + <field name="departureHarbour"> + + <!-- pas de departureHarbour selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.departureHarbour</message> + </field-validator> + + <!-- departureHarbour desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ departureHarbour.enabled ]]> + </param> + <message>validator.trip.desactivated.departureHarbour</message> + </field-validator> + + </field> + + <field name="landingHarbour"> + + <!-- landingHarbour desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ landingHarbour == null || landingHarbour.enabled ]]> + </param> + <message>validator.trip.desactivated.landingHarbour</message> + </field-validator> + + </field> + + <field name="startDate"> + + <!-- pas de date de debut selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.startDate</message> + </field-validator> + + </field> + + <field name="endDate"> + + <!-- pas de date de fin selectionnee --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.endDate</message> + </field-validator> + + <!-- date de fin avant date de debut --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endDate == null || endDate.time >= startDate.time ]]> + </param> + <message>validator.trip.endDate.after.startDate</message> + </field-validator> + + </field> + + <field name="formsUrl"> + + <!-- formsUrl url pas valide --> + <field-validator type="url" short-circuit="true"> + <message>validator.trip.invalid.formsUrl</message> + </field-validator> + + </field> + + <field name="reportsUrl"> + + <!-- reportsUrl url pas valide --> + <field-validator type="url" short-circuit="true"> + <message>validator.trip.invalid.reportsUrl</message> + </field-validator> + + </field> + + <field name="comment"> + + <!-- comentaire de moins de 1024 caractères --> + <field-validator type="stringlength"> + <param name="maxLength">1024</param> + <message>validator.trip.comment.tobig</message> + </field-validator> + + <!-- comment requis selon le type de departureHarbour choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ departureHarbour == null || !departureHarbour.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.departureHarbour</message> + </field-validator> + + <!-- comment requis selon le type de landingHarbour choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ landingHarbour == null || !landingHarbour.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.landingHarbour</message> + </field-validator> + + <!-- comment requis selon le type de vessel choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ vessel == null || !vessel.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.vessel</message> + </field-validator> + + <!-- comment requis selon le type de ocean choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ ocean == null || !ocean.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.ocean</message> + </field-validator> + + <!-- comment requis selon le type de dataEntryOperator choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ dataEntryOperator == null || !dataEntryOperator.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.dataEntryOperator</message> + </field-validator> + + <!-- comment requis selon le type de observer choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ observer == null || !observer.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.observer</message> + </field-validator> + + <!-- comment requis selon le type de captain choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ captain == null || !captain.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.captain</message> + </field-validator> + + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..a39dbb4 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-create-warning-validation.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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="landingHarbour"> + + <!-- pas de landingHarbour selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.null.landingHarbour</message> + </field-validator> + + </field> + + <field name="captain"> + + <!-- pas de captain selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.null.captain</message> + </field-validator> + + </field> + + <field name="dataEntryOperator"> + + <!-- pas de dataEntryOperator selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.null.dataEntryOperator</message> + </field-validator> + + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-update-error-validation.xml new file mode 100644 index 0000000..330c0b1 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-update-error-validation.xml @@ -0,0 +1,206 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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="observer"> + + <!-- pas de observer selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.observer</message> + </field-validator> + + </field> + + + <field name="vessel"> + + <!-- pas de vessel sélectionné --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.vessel</message> + </field-validator> + + </field> + + <field name="ocean"> + + <!-- pas d'ocean selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.ocean</message> + </field-validator> + + </field> + + <field name="startDate"> + + <!-- pas de date de debut selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.startDate</message> + </field-validator> + + <!-- coherence startDate > date de toute route --> + <!--<field-validator type="collectionFieldExpression">--> + <!--<param name="mode">ALL</param>--> + <!--<param name="useSensitiveContext">true</param>--> + <!--<param name="collectionFieldName">route</param>--> + <!--<param name="expression"><![CDATA[--> + <!--startDate.time <= current.date.time--> + <!--]]>--> + <!--</param>--> + <!--<message>validator.trip.invalid.startDate##${index}</message>--> + <!--</field-validator>--> + + </field> + + <field name="endDate"> + + <!-- pas de date de fin selectionnee --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.endDate</message> + </field-validator> + + <!-- date de fin avant date de debut --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endDate == null || endDate.time >= startDate.time ]]> + </param> + <message>validator.trip.endDate.after.startDate</message> + </field-validator> + + <!-- coherence endDate > date de toute route --> + <!--<field-validator type="collectionFieldExpression">--> + <!--<param name="mode">ALL</param>--> + <!--<param name="useSensitiveContext">true</param>--> + <!--<param name="collectionFieldName">route</param>--> + <!--<param name="expression"><![CDATA[--> + <!--current.date.time <= endDate.time--> + <!--]]>--> + <!--</param>--> + <!--<message>validator.trip.invalid.endDate##${index}</message>--> + <!--</field-validator>--> + + </field> + + <!--<field name="route">--> + + <!--<!– coherence date des routes –>--> + <!--<field-validator type="collectionFieldExpression">--> + <!--<param name="mode">ALL</param>--> + <!--<param name="useSensitiveContext">true</param>--> + <!--<param name="expression"><![CDATA[--> + <!--previous == null || previous.date.time <= current.date.time--> + <!--]]>--> + <!--</param>--> + <!--<message>validator.trip.invalid.date##${index}</message>--> + <!--</field-validator>--> + + <!--</field>--> + + <field name="formsUrl"> + + <!-- formsUrl url pas valide --> + <field-validator type="url" short-circuit="true"> + <message>validator.trip.invalid.formsUrl</message> + </field-validator> + + </field> + + <field name="reportsUrl"> + + <!-- reportsUrl url pas valide --> + <field-validator type="url" short-circuit="true"> + <message>validator.trip.invalid.reportsUrl</message> + </field-validator> + + </field> + + <field name="comment"> + + <!-- comentaire de moins de 1024 caractères --> + <field-validator type="stringlength"> + <param name="maxLength">1024</param> + <message>validator.trip.comment.tobig</message> + </field-validator> + + <!-- comment requis selon le type de departureHarbour choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ departureHarbour == null || !departureHarbour.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.departureHarbour</message> + </field-validator> + + <!-- comment requis selon le type de landingHarbour choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ landingHarbour == null || !landingHarbour.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.landingHarbour</message> + </field-validator> + + <!-- comment requis selon le type de vessel choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ vessel == null || !vessel.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.vessel</message> + </field-validator> + + <!-- comment requis selon le type de ocean choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ ocean == null || !ocean.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.ocean</message> + </field-validator> + + <!-- comment requis selon le type de dataEntryOperator choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ dataEntryOperator == null || !dataEntryOperator.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.dataEntryOperator</message> + </field-validator> + + <!-- comment requis selon le type de observer choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ observer == null || !observer.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.observer</message> + </field-validator> + + <!-- comment requis selon le type de captain choisi --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ captain == null || !captain.needComment || (comment != null && !comment.empty) ]]> + </param> + <message>validator.trip.required.comment.for.captain</message> + </field-validator> + + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..e60f881 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr.ird.observe.services.dto.seine/TripSeineDto-n1-update-warning-validation.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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="departureHarbour"> + + <!-- pas de departureHarbour selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.null.departureHarbour</message> + </field-validator> + + </field> + + <field name="landingHarbour"> + + <!-- pas de landingHarbour selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.null.landingHarbour</message> + </field-validator> + + </field> + + <field name="ocean"> + + <!-- pas d'ocean selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.ocean</message> + </field-validator> + + </field> + + <!--<field name="route">--> + + <!--<!– une route est ouverte (interdit la cloture de la maree) –>--> + <!--<!–<field-validator type="openableEntity">–>--> + <!--<!–<message>validator.tripSeine.unclosed.route##${openValueAsString}</message>–>--> + <!--<!–</field-validator>–>--> + + <!--<!– coherence loch des routes –>--> + <!--<field-validator type="collectionFieldExpression">--> + <!--<param name="mode">ALL</param>--> + <!--<param name="useSensitiveContext">true</param>--> + <!--<!–param name="expressionForFirst"><![CDATA[ current.startLogValue == null || current.startLogValue == 0 ]]></param–>--> + <!--<param name="expression">--> + <!--<![CDATA[previous == null || current.startLogValue == null || previous.endLogValue == null || previous.endLogValue <= current.startLogValue ]]>--> + <!--</param>--> + <!--<message>validator.trip.invalid.loch##${current.startLogValue}##${current.date}##${previous.endLogValue}</message>--> + <!--</field-validator>--> + <!-- --> + <!--</field>--> + + <field name="captain"> + + <!-- pas de captain selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.null.captain</message> + </field-validator> + + </field> + + <field name="dataEntryOperator"> + + <!-- pas de dataEntryOperator selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.null.dataEntryOperator</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>.