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 80217501b9e69bcdddde21c3d0272986aa03016d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 13:27:10 2016 +0200 Ajout boolean sur SetSeine (service) --- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 58992 -> 59440 bytes .../services/topia/binder/data/SetSeineBinder.java | 5 +++++ .../binder/data/SetSeineTargetCatchDtoBinder.java | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo index 4cad8c4..43c7aa0 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-seine.zargo and b/services-dto/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java index 4fecada..d7c2b9d 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java @@ -59,6 +59,8 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { entity.setNonTargetDiscarded(dto.getNonTargetDiscarded()); entity.setCurrentMeasureDepth(dto.getCurrentMeasureDepth()); entity.setLastUpdateDate(dto.getLastUpdateDate()); + entity.setTargetCatchCompositionEstimatedByObserver(dto.isTargetCatchCompositionEstimatedByObserver()); + entity.setTargetDiscardCatchCompositionEstimatedByObserver(dto.isTargetDiscardCatchCompositionEstimatedByObserver()); entity.setSchoolType(SCHOOL_TYPE_TO_ENTITY.apply(dto.getSchoolType())); entity.setReasonForNullSet(toEntity(dto.getReasonForNullSet(), ReasonForNullSet.class)); @@ -83,6 +85,9 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { dto.setNonTargetDiscarded(entity.getNonTargetDiscarded()); dto.setCurrentMeasureDepth(entity.getCurrentMeasureDepth()); + dto.setTargetCatchCompositionEstimatedByObserver(entity.isTargetCatchCompositionEstimatedByObserver()); + dto.setTargetDiscardCatchCompositionEstimatedByObserver(entity.isTargetDiscardCatchCompositionEstimatedByObserver()); + dto.setSchoolType(SCHOOL_TYPE_TO_DTO.apply(entity.getSchoolType())); dto.setReasonForNullSet(toReferentialReference(referentialLocale, entity.getReasonForNullSet(), ReasonForNullSetDto.class)); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java index 1547ee9..07e0a4c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java @@ -45,6 +45,8 @@ public class SetSeineTargetCatchDtoBinder extends DataBinderSupport<SetSeine, Se copyDtoDataFieldsToEntity(dto, entity); entity.setTargetCatch(toEntityCollection(referentialLocale, dto.getTargetCatch(), TargetCatch.class, entity.getTargetCatch())); + entity.setTargetCatchCompositionEstimatedByObserver(dto.isTargetCatchCompositionEstimatedByObserver()); + entity.setTargetDiscardCatchCompositionEstimatedByObserver(dto.isTargetDiscardCatchCompositionEstimatedByObserver()); } @@ -54,6 +56,8 @@ public class SetSeineTargetCatchDtoBinder extends DataBinderSupport<SetSeine, Se copyEntityDataFieldsToDto(entity, dto); dto.setTargetCatch(toLinkedHashSetData(referentialLocale, entity.getTargetCatch(), TargetCatchDto.class)); + dto.setTargetCatchCompositionEstimatedByObserver(entity.isTargetCatchCompositionEstimatedByObserver()); + dto.setTargetDiscardCatchCompositionEstimatedByObserver(entity.isTargetDiscardCatchCompositionEstimatedByObserver()); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.