Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a2480e4a by tchemit at 2019-09-24T14:13:28Z [V8 ou V9] Passer l'heure de fin de coulissage en optionnel - Closes #1385 - - - - - 7 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/SetUI.jcss - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - validation/src/main/i18n/getters/validation-messages.getter - validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-update-error-validation.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/SetUI.jcss ===================================== @@ -27,6 +27,7 @@ #endPursingTimeStamp { propertyDayDate: {SetDto.PROPERTY_END_PURSING_DATE}; propertyTimeDate: {SetDto.PROPERTY_END_PURSING_TIME}; + showReset:true; } #endSetTimeStamp { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -3244,6 +3244,7 @@ observe.validation.set.endDate.after.endPursingDate=End date must be fater pursi observe.validation.set.endPursingDate.after.date=End pursing date must be after observation date. observe.validation.set.endPursingTimeStamp.after.startTime=Pursing time must be after starting time. observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp=End time must be after end pursing time. +observe.validation.set.endSetTimeStamp.after.startTime=End time must be after start time. observe.validation.set.null.currentDirection=Current direction is not filled. observe.validation.set.required.comment.for.reasonForNullSet=A comment is required for the selected reason for null set. observe.validation.set.size.supportVesselName=Support vessel name size can't exceed %1 characters. ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -3244,6 +3244,7 @@ observe.validation.set.endDate.after.endPursingDate=El día de fin debe ser supe observe.validation.set.endPursingDate.after.date=El día de final de recogida de la jareta debe ser superior o igual a la día de observación. observe.validation.set.endPursingTimeStamp.after.startTime=La hora final de recogida de la jareta debe ser superior o igual a la hora de comienzo. observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp=La hora de fin debe ser superior o igual a la hora de fin de recogida de la jareta. +observe.validation.set.endSetTimeStamp.after.startTime=End time must be after start time. \#TODO observe.validation.set.null.currentDirection=Dirección actual no introducida. observe.validation.set.required.comment.for.reasonForNullSet=Es necesario un comentario para la causa de lance nulo seleccionado. observe.validation.set.size.supportVesselName=El count del supply debe tener una longitud inferior a %1$s caracteres. ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -3244,6 +3244,7 @@ observe.validation.set.endDate.after.endPursingDate=La date de fin doit être su observe.validation.set.endPursingDate.after.date=La date de fin de coulissage doit être supérieure ou égal à la date du jour d'observation. observe.validation.set.endPursingTimeStamp.after.startTime=L'heure de fin de coulissage doit être supérieure ou égal à l'heure de début. observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp=L'heure de fin doit être supérieure ou égal à l'heure de fin de coulissage. +observe.validation.set.endSetTimeStamp.after.startTime=L'heure de fin doit être supérieure ou égal à l'heure de de début. observe.validation.set.null.currentDirection=Direction courant non saisie. observe.validation.set.required.comment.for.reasonForNullSet=Un commentaire est requis pour la cause coup nul sélectionnée. observe.validation.set.size.supportVesselName=Le nom supply doit avoir une taille inférieure à %1$s caractères. ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -66,6 +66,7 @@ observe.validation.set.endDate.after.endPursingDate observe.validation.set.endPursingDate.after.date observe.validation.set.endPursingTimeStamp.after.startTime observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp +observe.validation.set.endSetTimeStamp.after.startTime observe.validation.set.size.supportVesselName observe.validation.set.startTime.after.time observe.validation.setLongline.baitsComposition.uniqueKey ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-create-error-validation.xml ===================================== @@ -64,6 +64,15 @@ <message>observe.validation.set.size.supportVesselName##${ints.maxLength}</message> </field-validator> </field> + <field name="startTime"> + <!-- startTime <= activity.time --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ startTime == null || ! currentPsObservationActivity.timeSecond.after(startSetTime) ]]> + </param> + <message>observe.validation.set.startTime.after.time</message> + </field-validator> + </field> <field name="endPursingDate"> <!-- routeEntity.date <= endPursingDate --> <field-validator type="fieldexpression" short-circuit="true"> @@ -92,10 +101,16 @@ </field-validator> </field> <field name="endSetTimeStamp"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endSetTimeStamp == null || ! startTime.after(endSetTimeStamp) ]]> + </param> + <message>observe.validation.set.endSetTimeStamp.after.startTime</message> + </field-validator> <!-- endPursingTimeStamp < = endSetTimeStamp && endSetTimeStamp - endPursingTimeStamp > 45 minutes --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ endSetTimeStamp == null || ! endPursingTimeStamp.after(endSetTimeStamp) ]]> + <![CDATA[ endSetTimeStamp == null || endPursingTimeStamp == null || ! endPursingTimeStamp.after(endSetTimeStamp) ]]> </param> <message>observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp</message> </field-validator> @@ -104,7 +119,7 @@ <field-validator type="fieldexpressionwithparams"> <param name="intParams">maxLength:45</param> <param name="expression"> - <![CDATA[ (endSetTimeStamp.time - endPursingTimeStamp.time) >= (ints.maxLength * 60000) ]]> + <![CDATA[ endSetTimeStamp == null || endPursingTimeStamp == null || (endSetTimeStamp.time - endPursingTimeStamp.time) >= (ints.maxLength * 60000) ]]> </param> <message>observe.validation.set.bound.delay##${ints.maxLength}</message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-update-error-validation.xml ===================================== @@ -53,6 +53,7 @@ <message/> </field-validator> </field> + <field name="supportVesselName"> <!-- supportVesselName de ${maxLength} caractères maximum --> <field-validator type="fieldexpressionwithparams"> @@ -91,7 +92,7 @@ </field-validator> </field> <field name="endSetDate"> - <!-- endDateCoulissage <= endSetDate --> + <!-- endPursingDate <= endSetDate --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ endPursingDate == null || ! endPursingDate.after(endSetDate) ]]> @@ -100,19 +101,25 @@ </field-validator> </field> <field name="endSetTimeStamp"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endSetTimeStamp == null || ! startTime.after(endSetTimeStamp) ]]> + </param> + <message>observe.validation.set.endSetTimeStamp.after.startTime</message> + </field-validator> <!-- endPursingTimeStamp < = endSetTimeStamp && endSetTimeStamp - endPursingTimeStamp > 45 minutes --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ endSetTimeStamp == null || ! endPursingTimeStamp.after(endSetTimeStamp) ]]> + <![CDATA[ endSetTimeStamp == null || endPursingTimeStamp == null || ! endPursingTimeStamp.after(endSetTimeStamp) ]]> </param> <message>observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp</message> </field-validator> - <!--verifier que la duree de la set est d'au moins 45 minutes --> + <!-- verifier que la duree de la set est d'au moins 45 minutes --> <field-validator type="fieldexpressionwithparams"> <param name="intParams">maxLength:45</param> <param name="expression"> - <![CDATA[ (endSetTimeStamp.time - endPursingTimeStamp.time) >= (ints.maxLength * 60000) ]]> + <![CDATA[ endSetTimeStamp == null || endPursingTimeStamp == null || (endSetTimeStamp.time - endPursingTimeStamp.time) >= (ints.maxLength * 60000) ]]> </param> <message>observe.validation.set.bound.delay##${ints.maxLength}</message> </field-validator> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a2480e4a5376d987e306af26bf39... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a2480e4a5376d987e306af26bf39... You're receiving this email because of your account on gitlab.com.