branch develop updated (dd02f87 -> 5e810cf)
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 dd02f87 Correction du label d'un noeud de création + correction des traductions correspondantes new 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) new 5e810cf Merge branch 'feature/7618' into develop The 4 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 5e810cfcc8cdcf419935efe460ead4a68adfbe5c Merge: dd02f87 130be6f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 22 09:15:31 2015 +0200 Merge branch 'feature/7618' into develop 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) commit 1aeef2ae7d22b2b19b3dbd7d167e52dfd321a286 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 21 17:35:09 2015 +0200 migration des écrans des renconttre pour les palangre (refs #7618) Summary of changes: .../content/table/impl/longline/EncounterUI.jaxx | 12 +++--- .../table/impl/longline/EncounterUIHandler.java | 42 ++++++++------------- .../table/impl/longline/EncounterUIModel.java | 44 +++++++++++++++------- ...lineEncounterDto-n1-update-error-validation.xml | 0 .../EncounterDto-n1-update-error-validation.xml | 0 .../EncounterDto-n1-update-warning-validation.xml | 0 .../ActivityLongLineEncouterServiceController.java | 5 ++- .../longline/ActivityLongLineEncouterService.java | 3 +- .../EntityToReferentialReferenceDtoBuilder.java | 1 + .../services/entity/EntitiesSetFactory.java | 7 +++- .../ActivityLongLineEncouterServiceTopia.java | 8 ++-- 11 files changed, 69 insertions(+), 53 deletions(-) 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 1aeef2ae7d22b2b19b3dbd7d167e52dfd321a286 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 21 17:35:09 2015 +0200 migration des écrans des renconttre pour les palangre (refs #7618) --- .../content/table/impl/longline/EncounterUI.jaxx | 12 +++--- .../table/impl/longline/EncounterUIHandler.java | 42 ++++++++------------- .../table/impl/longline/EncounterUIModel.java | 44 +++++++++++++++------- .../ActivityLongLineEncouterServiceController.java | 5 ++- .../longline/ActivityLongLineEncouterService.java | 3 +- .../services/entity/EntitiesSetFactory.java | 7 +++- .../ActivityLongLineEncouterServiceTopia.java | 8 ++-- 7 files changed, 68 insertions(+), 53 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx index b869f83..6075382 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx @@ -21,19 +21,17 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='ActivityLonglineDto, EncounterDto' + superGenericType='ActivityLonglineEncouterDto, EncounterDto' contentTitle='{n("observe.encounter.title")}' saveNewEntryText='{n("observe.encounter.action.create")}' - saveNewEntryTip='{n("observe.encounter.action.create.tip")}' - - > + saveNewEntryTip='{n("observe.encounter.action.create.tip")}'> <style source="../../CommonTable.css"/> <import> fr.ird.observe.services.dto.ReferenceDto fr.ird.observe.services.dto.CommentableDto - fr.ird.observe.services.dto.longline.ActivityLonglineDto + fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto fr.ird.observe.services.dto.longline.EncounterDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.longline.EncounterTypeDto @@ -55,7 +53,7 @@ <EncounterUIModel id='model'/> <!-- edit bean --> - <ActivityLonglineDto id='bean'/> + <ActivityLonglineEncouterDto id='bean'/> <!-- table edit bean --> <EncounterDto id='tableEditBean'/> @@ -65,7 +63,7 @@ <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' context='n1-update-encounter' - beanClass='fr.ird.observe.services.dto.longline.ActivityLonglineDto' + beanClass='fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto' errorTableModel='{getErrorTableModel()}'/> <!-- le validateur d'une entrée de tableau --> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java index 81859fb..6285af6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java @@ -24,20 +24,21 @@ package fr.ird.observe.ui.content.table.impl.longline; 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.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineDtos; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDtos; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; -import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.service.longline.ActivityLongLineEncouterService; 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; @@ -48,7 +49,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineDto, EncounterDto> { +public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEncouterDto, EncounterDto> { /** Logger */ static private Log log = LogFactory.getLog(EncounterUIHandler.class); @@ -86,8 +87,8 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineDt n("observe.encounter.table.count"), n("observe.encounter.table.count.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, EncounterTypeDto.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SpeciesDto.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, ReferenceDto.class, EncounterTypeDto.class.getSimpleName())); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, ReferenceDto.class, SpeciesDto.class.getSimpleName())); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); } @@ -98,30 +99,19 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineDt } @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.getSpeciesListLonglineEncounterId(); - prepareSpeciesList(speciesListId, getUi().getSpecies() , n("observe.error.speciesList.longline.encounter.notFound")); - - super.initUI(); - - } - - @Override - protected void doPersist(ActivityLonglineDto bean) { - getActivityLonglineService().save(getSelectedParentId(), bean); + protected void doPersist(ActivityLonglineEncouterDto bean) { + SaveResultDto saveResultDtoave = getActivityLongLineEncouterService().save(bean); + bean.setLastUpdate(saveResultDtoave.getLastUpdate()); } @Override protected void loadEditBean(String beanId) { - FormDto<ActivityLonglineDto> formDto = getActivityLonglineService().loadToEdit(beanId); + FormDto<ActivityLonglineEncouterDto> formDto = getActivityLongLineEncouterService().loadToEdit(beanId); getModel().setFormDto(formDto); - ActivityLonglineDtos.copyActivityLonglineDto(formDto.getForm(), getBean()); + ActivityLonglineEncouterDtos.copyActivityLonglineEncouterDto(formDto.getForm(), getBean()); } - protected ActivityLonglineService getActivityLonglineService() { - return ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + protected ActivityLongLineEncouterService getActivityLongLineEncouterService() { + return ObserveSwingApplicationContext.get().newService(ActivityLongLineEncouterService.class); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java index 3ee0fb9..d0a28e2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java @@ -23,13 +23,15 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import com.google.common.collect.Lists; -import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; import fr.ird.observe.services.dto.longline.EncounterDto; +import fr.ird.observe.services.dto.longline.EncounterDtos; 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,21 +40,21 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class EncounterUIModel extends ContentTableUIModel<ActivityLonglineDto, EncounterDto> { +public class EncounterUIModel extends ContentTableUIModel<ActivityLonglineEncouterDto, EncounterDto> { private static final long serialVersionUID = 1L; public EncounterUIModel(EncounterUI ui) { - super(ActivityLonglineDto.class, + super(ActivityLonglineEncouterDto.class, EncounterDto.class, new String[]{ - //FIXME -// ActivityLonglineDto.PROPERTY_ENCOUNTER, - ActivityLonglineDto.PROPERTY_COMMENT}, - new String[]{EncounterDto.PROPERTY_SPECIES, - EncounterDto.PROPERTY_DISTANCE, - EncounterDto.PROPERTY_COUNT, - EncounterDto.PROPERTY_ENCOUNTER_TYPE}); + ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER, + ActivityLonglineEncouterDto.PROPERTY_COMMENT}, + new String[]{ + EncounterDto.PROPERTY_SPECIES, + EncounterDto.PROPERTY_DISTANCE, + EncounterDto.PROPERTY_COUNT, + EncounterDto.PROPERTY_ENCOUNTER_TYPE}); List<ContentTableMeta<EncounterDto>> metas = Lists.newArrayList( ContentTableModel.newTableMeta(EncounterDto.class, EncounterDto.PROPERTY_ENCOUNTER_TYPE, false), @@ -65,8 +67,24 @@ public class EncounterUIModel extends ContentTableUIModel<ActivityLonglineDto, E } @Override - protected ContentTableModel<ActivityLonglineDto, EncounterDto> createTableModel(ObserveContentTableUI<ActivityLonglineDto, EncounterDto> ui, List<ContentTableMeta<EncounterDto>> contentTableMetas) { - // FIXME - return null; + protected ContentTableModel<ActivityLonglineEncouterDto, EncounterDto> createTableModel( + ObserveContentTableUI<ActivityLonglineEncouterDto, EncounterDto> ui, + List<ContentTableMeta<EncounterDto>> contentTableMetas) { + return new ContentTableModel<ActivityLonglineEncouterDto, EncounterDto>(ui, contentTableMetas) { + @Override + protected Collection<EncounterDto> getChilds(ActivityLonglineEncouterDto bean) { + return bean.getEncounter(); + } + + @Override + protected void load(EncounterDto source, EncounterDto target) { + EncounterDtos.copyEncounterDto(source, target); + } + + @Override + protected void setChilds(ActivityLonglineEncouterDto parent, List<EncounterDto> childs) { + parent.setEncounter(childs); + } + }; } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java index b4655c8..6230410 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineEncouterServiceController.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.web.controller.v1.longline; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.ActivityLongLineEncouterService; /** @@ -47,7 +48,7 @@ public class ActivityLongLineEncouterServiceController extends ObserveAuthentica } @Override - public String save(FormDto<ActivityLonglineEncouterDto> form) { - return service.save(form); + public SaveResultDto save(ActivityLonglineEncouterDto dto) { + return service.save(dto); } } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java index 6caa913..a47b8a0 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; @@ -44,6 +45,6 @@ public interface ActivityLongLineEncouterService extends ObserveService { @WriteDataPermission @Write @PostRequest - String save(FormDto<ActivityLonglineEncouterDto> form); + SaveResultDto save(ActivityLonglineEncouterDto dto); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java index 7d19cc2..488666e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java @@ -5,6 +5,7 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; import fr.ird.observe.entities.Entities; +import fr.ird.observe.entities.longline.Encounter; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.Persons; @@ -112,7 +113,11 @@ public class EntitiesSetFactory { NonTargetCatch.PROPERTY_SPECIES, speciesListConfiguration.getSpeciesListSeineNonTargetCatchId()); - + // Encounter + registerSpeciesListEntitiesSet(builder, + Encounter.class, + Encounter.PROPERTY_SPECIES, + speciesListConfiguration.getSpeciesListLonglineEncounterId()); this.cache = builder.build(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java index 03e6aaa..8fc6cd7 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java @@ -30,6 +30,8 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; +import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.dto.result.SaveResultDtos; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -64,13 +66,13 @@ public class ActivityLongLineEncouterServiceTopia extends ObserveServiceTopia im } @Override - public String save(FormDto<ActivityLonglineEncouterDto> form) { + public SaveResultDto save(ActivityLonglineEncouterDto dto) { - ActivityLongline activityLongline = dtoToEntity(ActivityLonglineEncouterDto.class, ActivityLongline.class, form.getForm()); + ActivityLongline activityLongline = dtoToEntity(ActivityLonglineEncouterDto.class, ActivityLongline.class, dto); activityLongline = saveEntity(ActivityLongline.class, activityLongline); - return activityLongline.getTopiaId(); + return SaveResultDtos.newSaveResult(activityLongline.getTopiaId(), activityLongline.getLastUpdate()); } -- 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 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 develop 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>.
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 5e810cfcc8cdcf419935efe460ead4a68adfbe5c Merge: dd02f87 130be6f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 22 09:15:31 2015 +0200 Merge branch 'feature/7618' into develop .../content/table/impl/longline/EncounterUI.jaxx | 12 ++--- .../table/impl/longline/EncounterUIHandler.java | 42 ++++++---------- .../table/impl/longline/EncounterUIModel.java | 44 +++++++++++----- ...lineEncounterDto-n1-update-error-validation.xml | 39 +++++++++++++++ .../EncounterDto-n1-update-error-validation.xml | 58 ++++++++++++++++++++++ .../EncounterDto-n1-update-warning-validation.xml | 56 +++++++++++++++++++++ .../ActivityLongLineEncouterServiceController.java | 5 +- .../longline/ActivityLongLineEncouterService.java | 3 +- .../EntityToReferentialReferenceDtoBuilder.java | 1 + .../services/entity/EntitiesSetFactory.java | 7 ++- .../ActivityLongLineEncouterServiceTopia.java | 8 +-- 11 files changed, 222 insertions(+), 53 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