Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
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:
| ... | ... | @@ -75,6 +75,7 @@ |
| 75 | 75 |
#enableTimestamp {
|
| 76 | 76 |
toolTipText:"observe.common.TdrObsDto.enableTimestamp.tip";
|
| 77 | 77 |
_skipBindingToBean:true;
|
| 78 |
+ _skipBindingFromBean:true;
|
|
| 78 | 79 |
}
|
| 79 | 80 |
|
| 80 | 81 |
#timestampPanel {
|
| ... | ... | @@ -1062,7 +1062,7 @@ public class DecoratorService extends DecoratorProvider { |
| 1062 | 1062 |
public void initPsObservationNonTargetLengthDto() {
|
| 1063 | 1063 |
|
| 1064 | 1064 |
registerDecorator(new NonTargetLengthDecorator());
|
| 1065 |
- registerDataReferenceDecorator(NonTargetLengthReference.class, "${speciesLabel}$s##${length}$f##${gender}$s");
|
|
| 1065 |
+ registerDataReferenceDecorator(NonTargetLengthReference.class, "${speciesLabel}$s##${length}$f##${sexLabel}$s");
|
|
| 1066 | 1066 |
}
|
| 1067 | 1067 |
|
| 1068 | 1068 |
@Override
|
| ... | ... | @@ -36,7 +36,7 @@ public class NonTargetLengthDecorator extends ObserveDecorator<NonTargetLengthDt |
| 36 | 36 |
|
| 37 | 37 |
public NonTargetLengthDecorator() throws IllegalArgumentException, NullPointerException {
|
| 38 | 38 |
super(NonTargetLengthDto.class,
|
| 39 |
- "${species/scientificLabel}$s##${length}$f##${gender}$s"
|
|
| 39 |
+ "${species/scientificLabel}$s##${length}$f##${sex}$s"
|
|
| 40 | 40 |
);
|
| 41 | 41 |
}
|
| 42 | 42 |
|
| ... | ... | @@ -84,7 +84,7 @@ conformity {*:1} fr.ird.observe.dto.referential.ps.observation.NonTargetCatchRel |
| 84 | 84 |
releasingTime {*:1} fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleasingTimeReference
|
| 85 | 85 |
lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
|
| 86 | 86 |
|
| 87 |
-data.ps.observation.NonTargetLength > data.Data | references=speciesLabel,length
|
|
| 87 |
+data.ps.observation.NonTargetLength > data.Data | references=speciesLabel,length,sexLabel
|
|
| 88 | 88 |
length + {*:1} Float
|
| 89 | 89 |
isLengthComputed + {*:1} boolean
|
| 90 | 90 |
picturesReferences + {*:1} String
|