Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
a464dde5
by tchemit at 2019-07-23T12:29:14Z
5 changed files:
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jaxx
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jcss
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/ActivityLonglineObsUI.jaxx
- validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-warning-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-warning-validation.xml
Changes:
| ... | ... | @@ -74,7 +74,10 @@ |
| 74 | 74 |
|
| 75 | 75 |
<field name='longitude' component='coordinate'/>
|
| 76 | 76 |
<field name='latitude' component='coordinate'/>
|
| 77 |
- <field name='quadrant' component='coordinate'/>
|
|
| 77 |
+ <field name='endDate' component='endTimeStamp'/>
|
|
| 78 |
+ <field name='endTime' component='endTimeStamp'/>
|
|
| 79 |
+ <field name='startDate' component='startTimeStamp'/>
|
|
| 80 |
+ <field name='startTime' component='startTimeStamp'/>
|
|
| 78 | 81 |
|
| 79 | 82 |
</BeanValidator>
|
| 80 | 83 |
|
| ... | ... | @@ -36,6 +36,7 @@ |
| 36 | 36 |
#endTimeStamp {
|
| 37 | 37 |
propertyDayDate:{ActivityLonglineLogbookUIModel.PROPERTY_END_DATE};
|
| 38 | 38 |
propertyTimeDate:{ActivityLonglineLogbookUIModel.PROPERTY_END_TIME};
|
| 39 |
+ showReset:true;
|
|
| 39 | 40 |
}
|
| 40 | 41 |
|
| 41 | 42 |
#coordinate {
|
| ... | ... | @@ -68,6 +68,8 @@ |
| 68 | 68 |
<field name='longitude' component='coordinate'/>
|
| 69 | 69 |
<field name='latitude' component='coordinate'/>
|
| 70 | 70 |
<field name='quadrant' component='coordinate'/>
|
| 71 |
+ <field name='date' component='timeStamp'/>
|
|
| 72 |
+ <field name='time' component='timeStamp'/>
|
|
| 71 | 73 |
|
| 72 | 74 |
</BeanValidator>
|
| 73 | 75 |
|
| ... | ... | @@ -41,7 +41,7 @@ |
| 41 | 41 |
</field>
|
| 42 | 42 |
|
| 43 | 43 |
<field name="endDate">
|
| 44 |
- <field-validator type="mandatory" short-circuit="true">
|
|
| 44 |
+ <field-validator type="notFilled" short-circuit="true">
|
|
| 45 | 45 |
<message/>
|
| 46 | 46 |
</field-validator>
|
| 47 | 47 |
</field>
|
| ... | ... | @@ -41,7 +41,7 @@ |
| 41 | 41 |
</field>
|
| 42 | 42 |
|
| 43 | 43 |
<field name="endDate">
|
| 44 |
- <field-validator type="mandatory" short-circuit="true">
|
|
| 44 |
+ <field-validator type="notFilled" short-circuit="true">
|
|
| 45 | 45 |
<message/>
|
| 46 | 46 |
</field-validator>
|
| 47 | 47 |
</field>
|