branch feature/7618 updated (1aeef2a -> 130be6f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7618 in repository observe. See http://git.codelutin.com/observe.git from 1aeef2a migration des écrans des renconttre pour les palangre (refs #7618) new 623340c ajout des validateurs (refs #7618) new 130be6f affecter la champe enabled dans le binder de reférence de referentiel (refs #7618) The 2 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 130be6f41a60adfa79f9673a39484d635dc31d25 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 22 09:14:47 2015 +0200 affecter la champe enabled dans le binder de reférence de referentiel (refs #7618) commit 623340cb216d8bae27f70d35fa0ee7ae8ce03253 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 22 09:09:56 2015 +0200 ajout des validateurs (refs #7618) Summary of changes: .../longline/ActivityLonglineEncounterDto-n1-update-error-validation.xml | 0 .../services/dto/longline/EncounterDto-n1-update-error-validation.xml | 0 .../services/dto/longline/EncounterDto-n1-update-warning-validation.xml | 0 .../observe/services/builder/EntityToReferentialReferenceDtoBuilder.java | 1 + 4 files changed, 1 insertion(+) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-globalComposition-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-warning-validation.xml (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7618 in repository observe. See http://git.codelutin.com/observe.git commit 623340cb216d8bae27f70d35fa0ee7ae8ce03253 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 22 09:09:56 2015 +0200 ajout des validateurs (refs #7618) --- ...lineEncounterDto-n1-update-error-validation.xml | 39 +++++++++++++++ .../EncounterDto-n1-update-error-validation.xml | 58 ++++++++++++++++++++++ .../EncounterDto-n1-update-warning-validation.xml | 56 +++++++++++++++++++++ 3 files changed, 153 insertions(+) diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-n1-update-error-validation.xml new file mode 100644 index 0000000..e0387a2 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-n1-update-error-validation.xml @@ -0,0 +1,39 @@ +<?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="comment"> + + <!-- comentaire de moins de 1024 caractères --> + <field-validator type="stringlength"> + <param name="maxLength">1024</param> + <message>validator.activity.comment.tobig</message> + </field-validator> + + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-error-validation.xml new file mode 100644 index 0000000..e1bec7e --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-error-validation.xml @@ -0,0 +1,58 @@ +<?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="encounterType"> + + <!-- pas de encounterType selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.encounter.required.encounterType</message> + </field-validator> + + <!-- encounterType desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ encounterType.enabled ]]> + </param> + <message>validator.encounter.desactivated.encounterType</message> + </field-validator> + + </field> + + <field name="species"> + + <!-- species desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ species == null || species.enabled ]]> + </param> + <message>validator.encounter.desactivated.species</message> + </field-validator> + + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..11c5956 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-n1-update-warning-validation.xml @@ -0,0 +1,56 @@ +<?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="species"> + + <!-- pas de species selectionnee --> + <field-validator type="required" short-circuit="true"> + <message>validator.encounter.required.species</message> + </field-validator> + + </field> + + <field name="distance"> + + <!-- pas de distance renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.encounter.required.distance</message> + </field-validator> + + </field> + + <field name="count"> + + <!-- pas de count renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.encounter.required.count</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>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7618 in repository observe. See http://git.codelutin.com/observe.git commit 130be6f41a60adfa79f9673a39484d635dc31d25 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 22 09:14:47 2015 +0200 affecter la champe enabled dans le binder de reférence de referentiel (refs #7618) --- .../observe/services/builder/EntityToReferentialReferenceDtoBuilder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java index 64261be..4351cf6 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java @@ -98,6 +98,7 @@ public class EntityToReferentialReferenceDtoBuilder<E extends ReferenceEntity, D } result.setId(entity.getTopiaId()); + result.setEnabled(entity.isEnabled()); return result; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm