branch develop updated (620eb01 -> 03d0c00)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 620eb01 Merge branch 'feature/7601' into develop new d398a48 Migration de l'écran de la faune observés sur l'object (refs #7602) new b1f853b mise en place de la validation (refs #7602) new 03d0c00 Merge branch 'feature/7602' into develop The 3 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 03d0c00aa44f5964eb4883a0afb4703ce9d78751 Merge: 620eb01 b1f853b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 16 09:45:41 2015 +0200 Merge branch 'feature/7602' into develop commit b1f853beb89ba955506eb43270203e689ae5c4d8 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 16 09:45:19 2015 +0200 mise en place de la validation (refs #7602) commit d398a4805550d78f52338acccd0d9f2699477c05 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 16 09:38:37 2015 +0200 Migration de l'écran de la faune observés sur l'object (refs #7602) Summary of changes: .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 14 ++++---- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 40 ++++++++-------------- .../impl/seine/ObjectObservedSpeciesUIModel.java | 39 +++++++++++++++------ ...servedSpeciesDto-n1-update-error-validation.xml | 0 .../ObjectObservedSpeciesServiceController.java | 4 +-- .../observe/entities/referentiel/SpeciesLists.java | 4 ++- .../seine/ObjectObservedSpeciesService.java | 2 +- .../services/entity/ObserveEntitiesFilters.java | 5 +++ .../seine/ObjectObservedSpeciesServiceTopia.java | 5 ++- 9 files changed, 62 insertions(+), 51 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-n1-update-error-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 develop in repository observe. See http://git.codelutin.com/observe.git commit d398a4805550d78f52338acccd0d9f2699477c05 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 16 09:38:37 2015 +0200 Migration de l'écran de la faune observés sur l'object (refs #7602) --- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 12 +++---- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 40 ++++++++-------------- .../impl/seine/ObjectObservedSpeciesUIModel.java | 39 +++++++++++++++------ .../ObjectObservedSpeciesServiceController.java | 4 +-- .../observe/entities/referentiel/SpeciesLists.java | 4 ++- .../seine/ObjectObservedSpeciesService.java | 2 +- .../services/entity/ObserveEntitiesFilters.java | 5 +++ .../seine/ObjectObservedSpeciesServiceTopia.java | 5 ++- 8 files changed, 61 insertions(+), 50 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx index eecb3b0..1a4f028 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx @@ -21,19 +21,17 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='FloatingObjectDto, ObjectObservedSpeciesDto' + superGenericType='FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto' contentTitle='{n("observe.common.objectObservedSpecies")}' saveNewEntryText='{n("observe.action.create.objectObservedSpecies")}' - saveNewEntryTip='{n("observe.action.create.objectObservedSpecies.tip")}' - - > + saveNewEntryTip='{n("observe.action.create.objectObservedSpecies.tip")}'> <style source="../../CommonTable.css"/> <import> fr.ird.observe.services.dto.ReferenceDto fr.ird.observe.services.dto.CommentableDto - fr.ird.observe.services.dto.seine.FloatingObjectDto + fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto @@ -55,7 +53,7 @@ <ObjectObservedSpeciesUIModel id='model' constructorParams='this'/> <!-- edit bean --> - <FloatingObjectDto id='bean'/> + <FloatingObjectObservedSpeciesDto id='bean'/> <!-- table edit bean --> <ObjectObservedSpeciesDto id='tableEditBean'/> @@ -66,7 +64,7 @@ <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.seine.FloatingObjectDto' + beanClass='fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto' errorTableModel='{getErrorTableModel()}' context='n1-update-objectObservedSpecies'/> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index 85e26bf..2ba7e35 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -23,20 +23,20 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; -import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; +import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDtos; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; -import fr.ird.observe.services.dto.seine.TargetSampleDtos; -import fr.ird.observe.services.service.seine.FloatingObjectService; +import fr.ird.observe.services.service.seine.ObjectObservedSpeciesService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import static org.nuiton.i18n.I18n.n; @@ -45,7 +45,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<FloatingObjectDto, ObjectObservedSpeciesDto> { +public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto> { /** Logger */ static private Log log = @@ -87,36 +87,24 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati n("observe.objectObservedSpecies.table.count"), n("observe.objectObservedSpecies.table.count.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesStatusDto.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, ReferenceDto.class, SpeciesDto.class.getSimpleName())); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, ReferenceDto.class, SpeciesStatusDto.class.getSimpleName())); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); } @Override - public void initUI() throws Exception { - - // add a listPredicate to get only species from the correct configured speciesList - ObserveSwingApplicationConfig config = getUi().getContextValue(ObserveSwingApplicationConfig.class); - String speciesListId = config.getSpeciesListSeineObjectObservedSpeciesId(); - prepareSpeciesList(speciesListId, getUi().getSpecies(),n("observe.error.speciesList.seine.objectObservedSpecies.notFound")); - - super.initUI(); - - } - - @Override - protected void doPersist(FloatingObjectDto bean) { - getFloatingObjectService().save(getSelectedParentId(), bean); + protected void doPersist(FloatingObjectObservedSpeciesDto bean) { + getObjectObservedSpeciesService().save(bean); } @Override protected void loadEditBean(String beanId) { - FormDto<FloatingObjectDto> formDto = getFloatingObjectService().loadToEdit(beanId); + FormDto<FloatingObjectObservedSpeciesDto> formDto = getObjectObservedSpeciesService().loadToEdit(beanId); getModel().setFormDto(formDto); - TargetSampleDtos.copyCommentableDto(formDto.getForm(), getBean()); + FloatingObjectObservedSpeciesDtos.copyFloatingObjectObservedSpeciesDto(formDto.getForm(), getBean()); } - protected FloatingObjectService getFloatingObjectService() { - return ObserveSwingApplicationContext.get().newService(FloatingObjectService.class); + protected ObjectObservedSpeciesService getObjectObservedSpeciesService() { + return ObserveSwingApplicationContext.get().newService(ObjectObservedSpeciesService.class); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java index 49e803d..023ae0d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java @@ -23,13 +23,15 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import com.google.common.collect.Lists; -import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; +import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDtos; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; import fr.ird.observe.ui.content.table.ObserveContentTableUI; +import java.util.Collection; import java.util.List; /** @@ -38,22 +40,22 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ObjectObservedSpeciesUIModel extends ContentTableUIModel<FloatingObjectDto, ObjectObservedSpeciesDto> { +public class ObjectObservedSpeciesUIModel extends ContentTableUIModel<FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto> { private static final long serialVersionUID = 1L; public ObjectObservedSpeciesUIModel(ObjectObservedSpeciesUI ui) { - super(FloatingObjectDto.class, + super(FloatingObjectObservedSpeciesDto.class, ObjectObservedSpeciesDto.class, new String[]{ - //FIXME -// FloatingObjectDto.PROPERTY_OBJECT_OBSERVED_SPECIES, - FloatingObjectDto.PROPERTY_COMMENT}, + FloatingObjectObservedSpeciesDto.PROPERTY_OBJECT_OBSERVED_SPECIES, + FloatingObjectObservedSpeciesDto.PROPERTY_COMMENT}, new String[]{ ObjectObservedSpeciesDto.PROPERTY_SPECIES, ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS, - ObjectObservedSpeciesDto.PROPERTY_COUNT}); + ObjectObservedSpeciesDto.PROPERTY_COUNT} + ); List<ContentTableMeta<ObjectObservedSpeciesDto>> metas = Lists.newArrayList( ContentTableModel.newTableMeta(ObjectObservedSpeciesDto.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES, false), @@ -65,8 +67,25 @@ public class ObjectObservedSpeciesUIModel extends ContentTableUIModel<FloatingOb } @Override - protected ContentTableModel<FloatingObjectDto, ObjectObservedSpeciesDto> createTableModel(ObserveContentTableUI<FloatingObjectDto, ObjectObservedSpeciesDto> ui, List<ContentTableMeta<ObjectObservedSpeciesDto>> contentTableMetas) { - // FIXME - return null; + protected ContentTableModel<FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto> createTableModel( + ObserveContentTableUI<FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto> ui, + List<ContentTableMeta<ObjectObservedSpeciesDto>> contentTableMetas) { + + return new ContentTableModel<FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto>(ui, contentTableMetas) { + @Override + protected Collection<ObjectObservedSpeciesDto> getChilds(FloatingObjectObservedSpeciesDto bean) { + return bean.getObjectObservedSpecies(); + } + + @Override + protected void load(ObjectObservedSpeciesDto source, ObjectObservedSpeciesDto target) { + ObjectObservedSpeciesDtos.copyObjectObservedSpeciesDto(source, target); + } + + @Override + protected void setChilds(FloatingObjectObservedSpeciesDto parent, List<ObjectObservedSpeciesDto> childs) { + bean.setObjectObservedSpecies(childs); + } + }; } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java index f7e1146..0993183 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java @@ -47,7 +47,7 @@ public class ObjectObservedSpeciesServiceController extends ObserveAuthenticated } @Override - public String save(FormDto<FloatingObjectObservedSpeciesDto> form) { - return service.save(form); + public String save(FloatingObjectObservedSpeciesDto dto) { + return service.save(dto); } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesLists.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesLists.java index e10d867..57752d4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesLists.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesLists.java @@ -5,7 +5,9 @@ package fr.ird.observe.entities.referentiel; */ public class SpeciesLists { - // FIXME cette valeur n'est pas au bon endroit ici + // FIXME ces valeurs ne sont pas au bon endroit ici public static String SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1"; + public static String SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2"; + } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java index 01ac33d..09da991 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java @@ -44,6 +44,6 @@ public interface ObjectObservedSpeciesService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(FormDto<FloatingObjectObservedSpeciesDto> form); + String save(FloatingObjectObservedSpeciesDto dto); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java index 05f9ecc..d26a74b 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java @@ -13,6 +13,7 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.SpeciesLists; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.Vessels; +import fr.ird.observe.entities.seine.ObjectObservedSpecies; import fr.ird.observe.entities.seine.ObjectSchoolEstimate; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.dto.IdDto; @@ -128,6 +129,10 @@ public class ObserveEntitiesFilters { ObjectSchoolEstimate.PROPERTY_SPECIES, new SpeciesListEntitiesSet(ReferenceEntities.<Species>newEnablePredicate(), SpeciesLists.SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID)); + addFilter(ObjectObservedSpecies.class, + ObjectObservedSpecies.PROPERTY_SPECIES, + new SpeciesListEntitiesSet(ReferenceEntities.<Species>newEnablePredicate(), SpeciesLists.SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID)); + } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java index 9e1b4f4..3c4109a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java @@ -69,10 +69,9 @@ public class ObjectObservedSpeciesServiceTopia extends ObserveServiceTopia imple } @Override - public String save(FormDto<FloatingObjectObservedSpeciesDto> form) { + public String save(FloatingObjectObservedSpeciesDto dto) { - FloatingObject floatingObject = - dtoToEntity(FloatingObjectObservedSpeciesDto.class, FloatingObject.class, form.getForm()); + FloatingObject floatingObject = dtoToEntity(FloatingObjectObservedSpeciesDto.class, FloatingObject.class, dto); floatingObject = saveEntity(FloatingObject.class, floatingObject); -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit b1f853beb89ba955506eb43270203e689ae5c4d8 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 16 09:45:19 2015 +0200 mise en place de la validation (refs #7602) --- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 2 +- ...servedSpeciesDto-n1-update-error-validation.xml | 77 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx index 1a4f028..4de6832 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx @@ -66,7 +66,7 @@ autoField='true' beanClass='fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto' errorTableModel='{getErrorTableModel()}' - context='n1-update-objectObservedSpecies'/> + context='n1-update'/> <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-n1-update-error-validation.xml new file mode 100644 index 0000000..0f46753 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ObjectObservedSpeciesDto-n1-update-error-validation.xml @@ -0,0 +1,77 @@ +<?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.objectObservedSpecies.required.species</message> + </field-validator> + + <!-- species desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ species.enabled ]]> + </param> + <message>validator.objectObservedSpecies.desactivated.species</message> + </field-validator> + + </field> + + <field name="speciesStatus"> + + <!-- pas de status species selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.objectObservedSpecies.required.speciesStatus</message> + </field-validator> + + <!-- speciesStatus desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ speciesStatus.enabled ]]> + </param> + <message>validator.objectObservedSpecies.desactivated.speciesStatus</message> + </field-validator> + + </field> + + <field name="count"> + + <!-- count non renseigné --> + <field-validator type="required" short-circuit="true"> + <message>validator.objectObservedSpecies.required.count</message> + </field-validator> + + <!-- count strictement positif --> + <field-validator type="int" short-circuit="true"> + <param name="min">1</param> + <message>validator.objectObservedSpecies.positive.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 develop in repository observe. See http://git.codelutin.com/observe.git commit 03d0c00aa44f5964eb4883a0afb4703ce9d78751 Merge: 620eb01 b1f853b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 16 09:45:41 2015 +0200 Merge branch 'feature/7602' into develop .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 14 ++-- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 40 ++++------- .../impl/seine/ObjectObservedSpeciesUIModel.java | 39 ++++++++--- ...servedSpeciesDto-n1-update-error-validation.xml | 77 ++++++++++++++++++++++ .../ObjectObservedSpeciesServiceController.java | 4 +- .../observe/entities/referentiel/SpeciesLists.java | 4 +- .../seine/ObjectObservedSpeciesService.java | 2 +- .../services/entity/ObserveEntitiesFilters.java | 5 ++ .../seine/ObjectObservedSpeciesServiceTopia.java | 5 +- 9 files changed, 139 insertions(+), 51 deletions(-) -- 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