This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 381e7f4fcf01492a36680c981d7e1b02e3349636 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 13:11:40 2016 +0100 Activer la raison de rejet si le devenir espèce le requière --- .../swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss | 1 + .../ui/content/table/impl/seine/NonTargetCatchUIHandler.java | 12 ++++++++---- .../dto/reference/ReferentialReferenceSetDefinitions.java | 3 ++- .../services/topia/binder/referential/SpeciesFateBinder.java | 9 ++------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss index abfbfed..3230c29 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss @@ -52,6 +52,7 @@ #reasonForDiscard { property:{NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD}; selectedItem:{tableEditBean.getReasonForDiscard()}; + enabled:{getHandler().showReasonForDiscard(tableEditBean.getSpeciesFate())}; } #wellLabel { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index c19bfb7..288c7f3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -25,8 +25,11 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -42,9 +45,6 @@ import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchHelper; import fr.ird.observe.services.service.seine.NonTargetCatchService; import fr.ird.observe.services.service.seine.TripSeineService; -import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -400,6 +400,10 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa } + public boolean showReasonForDiscard(ReferentialReference<SpeciesFateDto> speciesFate) { + return speciesFate != null && (boolean) speciesFate.getPropertyValue(SpeciesFateDto.PROPERTY_DISCARD); + } + protected NonTargetCatchService getNonTargetCatchService() { return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newNonTargetCatchService(); } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java index c3be1cb..5b06607 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java @@ -243,7 +243,8 @@ public enum ReferentialReferenceSetDefinitions { REASON_FOR_NULL_SET(newDefaultDefinitionBuilder(ReasonForNullSetDto.class)), - SPECIES_FATE(newDefaultDefinitionBuilder(SpeciesFateDto.class)), + SPECIES_FATE(newDefaultDefinitionBuilder(SpeciesFateDto.class) + .addProperty(boolean.class, SpeciesFateDto.PROPERTY_DISCARD)), SPECIES_STATUS(newDefaultDefinitionBuilder(SpeciesStatusDto.class)), diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java index 4b82d09..90b4329 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java @@ -41,7 +41,6 @@ public class SpeciesFateBinder extends ReferentialBinderSupport<SpeciesFate, Spe @Override public void copyToEntity(ReferentialLocale referentialLocale, SpeciesFateDto dto, SpeciesFate entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); entity.setDiscard(dto.isDiscard()); @@ -51,7 +50,6 @@ public class SpeciesFateBinder extends ReferentialBinderSupport<SpeciesFate, Spe @Override public void copyToDto(ReferentialLocale referentialLocale, SpeciesFate entity, SpeciesFateDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); dto.setDiscard(entity.isDiscard()); @@ -61,16 +59,13 @@ public class SpeciesFateBinder extends ReferentialBinderSupport<SpeciesFate, Spe @Override public ReferentialReference<SpeciesFateDto> toReferentialReference(ReferentialLocale referentialLocale, SpeciesFate entity) { - return toReferentialReference(entity, - entity.getCode(), getLabel(referentialLocale, entity)); - + return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity), entity.isDiscard()); } @Override public ReferentialReference<SpeciesFateDto> toReferentialReference(ReferentialLocale referentialLocale, SpeciesFateDto dto) { - return toReferentialReference(dto, - dto.getCode(), getLabel(referentialLocale, dto)); + return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto), dto.isDiscard()); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.