Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
0c43c46b
by Tony CHEMIT at 2017-08-02T21:28:50+02:00
3 changed files:
- client-validation/pom.xml
- client-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml
- services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/ActivitySeineBinder.java
Changes:
| ... | ... | @@ -31,7 +31,7 @@ |
| 31 | 31 |
|
| 32 | 32 |
<artifactId>client-validation</artifactId>
|
| 33 | 33 |
|
| 34 |
- <name>ObServe :: client Validation</name>
|
|
| 34 |
+ <name>ObServe :: Client Validation</name>
|
|
| 35 | 35 |
<description>ObServe Client Validation</description>
|
| 36 | 36 |
|
| 37 | 37 |
<dependencies>
|
| ... | ... | @@ -49,7 +49,7 @@ |
| 49 | 49 |
|
| 50 | 50 |
<!-- Aucun DCP saisie -->
|
| 51 | 51 |
<field-validator type="fieldexpression">
|
| 52 |
- <param name="expression"><![CDATA[ !dcpOperation || floatingObjectNotEmpty ]]></param>
|
|
| 52 |
+ <param name="expression"><![CDATA[ !dcpOperation || !floatingObjectEmpty ]]></param>
|
|
| 53 | 53 |
<message>observe.validation.activity.null.dcp</message>
|
| 54 | 54 |
</field-validator>
|
| 55 | 55 |
|
| ... | ... | @@ -102,6 +102,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi |
| 102 | 102 |
dto.setNextFpaZone(toReferentialReference(referentialLocale, entity.getNextFpaZone(), FpaZoneDto.class));
|
| 103 | 103 |
dto.setSetSeine(toDataReference(referentialLocale, entity.getSetSeine(), SetSeineDto.class));
|
| 104 | 104 |
dto.setObservedSystem(toReferentialReferenceList(referentialLocale, entity.getObservedSystem(), ObservedSystemDto.class));
|
| 105 |
+ dto.setFloatingObjectEmpty(entity.isFloatingObjectEmpty());
|
|
| 105 | 106 |
|
| 106 | 107 |
}
|
| 107 | 108 |
|