Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e27a2789 by tchemit at 2019-07-24T15:42:13Z Fix Tdr screen loading - - - - - 45743b68 by tchemit at 2019-07-24T15:51:13Z fix NonTargetLengthDto decorator - - - - - 4 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/TdrObsUI.jcss - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/NonTargetLengthDecorator.java - dto/src/main/models/Observe-20-data-ps-observation.model Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/TdrObsUI.jcss ===================================== @@ -75,6 +75,7 @@ #enableTimestamp { toolTipText:"observe.common.TdrObsDto.enableTimestamp.tip"; _skipBindingToBean:true; + _skipBindingFromBean:true; } #timestampPanel { ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -1062,7 +1062,7 @@ public class DecoratorService extends DecoratorProvider { public void initPsObservationNonTargetLengthDto() { registerDecorator(new NonTargetLengthDecorator()); - registerDataReferenceDecorator(NonTargetLengthReference.class, "${speciesLabel}$s##${length}$f##${gender}$s"); + registerDataReferenceDecorator(NonTargetLengthReference.class, "${speciesLabel}$s##${length}$f##${sexLabel}$s"); } @Override ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/NonTargetLengthDecorator.java ===================================== @@ -36,7 +36,7 @@ public class NonTargetLengthDecorator extends ObserveDecorator<NonTargetLengthDt public NonTargetLengthDecorator() throws IllegalArgumentException, NullPointerException { super(NonTargetLengthDto.class, - "${species/scientificLabel}$s##${length}$f##${gender}$s" + "${species/scientificLabel}$s##${length}$f##${sex}$s" ); } ===================================== dto/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -84,7 +84,7 @@ conformity {*:1} fr.ird.observe.dto.referential.ps.observation.NonTargetCatchRel releasingTime {*:1} fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleasingTimeReference lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference -data.ps.observation.NonTargetLength > data.Data | references=speciesLabel,length +data.ps.observation.NonTargetLength > data.Data | references=speciesLabel,length,sexLabel length + {*:1} Float isLengthComputed + {*:1} boolean picturesReferences + {*:1} String View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5e98fbc50afeb8da47daf479273... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5e98fbc50afeb8da47daf479273... You're receiving this email because of your account on gitlab.com.