Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a464dde5 by tchemit at 2019-07-23T12:29:14Z [LL] Activité logbook : petits ajustements - Closes #1362 - - - - - 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: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jaxx ===================================== @@ -74,7 +74,10 @@ <field name='longitude' component='coordinate'/> <field name='latitude' component='coordinate'/> - <field name='quadrant' component='coordinate'/> + <field name='endDate' component='endTimeStamp'/> + <field name='endTime' component='endTimeStamp'/> + <field name='startDate' component='startTimeStamp'/> + <field name='startTime' component='startTimeStamp'/> </BeanValidator> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jcss ===================================== @@ -36,6 +36,7 @@ #endTimeStamp { propertyDayDate:{ActivityLonglineLogbookUIModel.PROPERTY_END_DATE}; propertyTimeDate:{ActivityLonglineLogbookUIModel.PROPERTY_END_TIME}; + showReset:true; } #coordinate { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/ActivityLonglineObsUI.jaxx ===================================== @@ -68,6 +68,8 @@ <field name='longitude' component='coordinate'/> <field name='latitude' component='coordinate'/> <field name='quadrant' component='coordinate'/> + <field name='date' component='timeStamp'/> + <field name='time' component='timeStamp'/> </BeanValidator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-warning-validation.xml ===================================== @@ -41,7 +41,7 @@ </field> <field name="endDate"> - <field-validator type="mandatory" short-circuit="true"> + <field-validator type="notFilled" short-circuit="true"> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-warning-validation.xml ===================================== @@ -41,7 +41,7 @@ </field> <field name="endDate"> - <field-validator type="mandatory" short-circuit="true"> + <field-validator type="notFilled" short-circuit="true"> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a464dde5e94c9d196988d8d45c33... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a464dde5e94c9d196988d8d45c33... You're receiving this email because of your account on gitlab.com.