Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

7 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/SetUI.jcss
    ... ... @@ -27,6 +27,7 @@
    27 27
     #endPursingTimeStamp {
    
    28 28
       propertyDayDate: {SetDto.PROPERTY_END_PURSING_DATE};
    
    29 29
       propertyTimeDate: {SetDto.PROPERTY_END_PURSING_TIME};
    
    30
    +  showReset:true;
    
    30 31
     }
    
    31 32
     
    
    32 33
     #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
    3244 3244
     observe.validation.set.endPursingDate.after.date=End pursing date must be after observation date.
    
    3245 3245
     observe.validation.set.endPursingTimeStamp.after.startTime=Pursing time must be after starting time.
    
    3246 3246
     observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp=End time must be after end pursing time.
    
    3247
    +observe.validation.set.endSetTimeStamp.after.startTime=End time must be after start time.
    
    3247 3248
     observe.validation.set.null.currentDirection=Current direction is not filled.
    
    3248 3249
     observe.validation.set.required.comment.for.reasonForNullSet=A comment is required for the selected reason for null set.
    
    3249 3250
     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
    3244 3244
     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.
    
    3245 3245
     observe.validation.set.endPursingTimeStamp.after.startTime=La hora final de recogida de la jareta debe ser superior o igual a la hora de comienzo.
    
    3246 3246
     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.
    
    3247
    +observe.validation.set.endSetTimeStamp.after.startTime=End time must be after start time. \#TODO
    
    3247 3248
     observe.validation.set.null.currentDirection=Dirección actual no introducida.
    
    3248 3249
     observe.validation.set.required.comment.for.reasonForNullSet=Es necesario un comentario para la causa de lance nulo seleccionado.
    
    3249 3250
     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
    3244 3244
     observe.validation.set.endPursingDate.after.date=La date de fin de coulissage doit être supérieure ou égal à la date du jour d'observation.
    
    3245 3245
     observe.validation.set.endPursingTimeStamp.after.startTime=L'heure de fin de coulissage doit être supérieure ou égal à l'heure de début.
    
    3246 3246
     observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp=L'heure de fin doit être supérieure ou égal à l'heure de fin de coulissage.
    
    3247
    +observe.validation.set.endSetTimeStamp.after.startTime=L'heure de fin doit être supérieure ou égal à l'heure de de début.
    
    3247 3248
     observe.validation.set.null.currentDirection=Direction courant non saisie.
    
    3248 3249
     observe.validation.set.required.comment.for.reasonForNullSet=Un commentaire est requis pour la cause coup nul sélectionnée.
    
    3249 3250
     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
    66 66
     observe.validation.set.endPursingDate.after.date
    
    67 67
     observe.validation.set.endPursingTimeStamp.after.startTime
    
    68 68
     observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp
    
    69
    +observe.validation.set.endSetTimeStamp.after.startTime
    
    69 70
     observe.validation.set.size.supportVesselName
    
    70 71
     observe.validation.set.startTime.after.time
    
    71 72
     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 @@
    64 64
           <message>observe.validation.set.size.supportVesselName##${ints.maxLength}</message>
    
    65 65
         </field-validator>
    
    66 66
       </field>
    
    67
    +  <field name="startTime">
    
    68
    +    <!-- startTime <= activity.time -->
    
    69
    +    <field-validator type="fieldexpression" short-circuit="true">
    
    70
    +      <param name="expression">
    
    71
    +        <![CDATA[ startTime == null || ! currentPsObservationActivity.timeSecond.after(startSetTime) ]]>
    
    72
    +      </param>
    
    73
    +      <message>observe.validation.set.startTime.after.time</message>
    
    74
    +    </field-validator>
    
    75
    +  </field>
    
    67 76
       <field name="endPursingDate">
    
    68 77
         <!-- routeEntity.date <= endPursingDate -->
    
    69 78
         <field-validator type="fieldexpression" short-circuit="true">
    
    ... ... @@ -92,10 +101,16 @@
    92 101
         </field-validator>
    
    93 102
       </field>
    
    94 103
       <field name="endSetTimeStamp">
    
    104
    +    <field-validator type="fieldexpression" short-circuit="true">
    
    105
    +      <param name="expression">
    
    106
    +        <![CDATA[ endSetTimeStamp == null || ! startTime.after(endSetTimeStamp) ]]>
    
    107
    +      </param>
    
    108
    +      <message>observe.validation.set.endSetTimeStamp.after.startTime</message>
    
    109
    +    </field-validator>
    
    95 110
         <!-- endPursingTimeStamp < = endSetTimeStamp && endSetTimeStamp - endPursingTimeStamp > 45 minutes -->
    
    96 111
         <field-validator type="fieldexpression" short-circuit="true">
    
    97 112
           <param name="expression">
    
    98
    -        <![CDATA[ endSetTimeStamp == null  || ! endPursingTimeStamp.after(endSetTimeStamp) ]]>
    
    113
    +        <![CDATA[ endSetTimeStamp == null || endPursingTimeStamp == null || ! endPursingTimeStamp.after(endSetTimeStamp) ]]>
    
    99 114
           </param>
    
    100 115
           <message>observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp</message>
    
    101 116
         </field-validator>
    
    ... ... @@ -104,7 +119,7 @@
    104 119
         <field-validator type="fieldexpressionwithparams">
    
    105 120
           <param name="intParams">maxLength:45</param>
    
    106 121
           <param name="expression">
    
    107
    -        <![CDATA[ (endSetTimeStamp.time - endPursingTimeStamp.time) >= (ints.maxLength * 60000) ]]>
    
    122
    +        <![CDATA[ endSetTimeStamp == null  || endPursingTimeStamp == null || (endSetTimeStamp.time - endPursingTimeStamp.time) >= (ints.maxLength * 60000) ]]>
    
    108 123
           </param>
    
    109 124
           <message>observe.validation.set.bound.delay##${ints.maxLength}</message>
    
    110 125
         </field-validator>
    

  • validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetDto-update-error-validation.xml
    ... ... @@ -53,6 +53,7 @@
    53 53
           <message/>
    
    54 54
         </field-validator>
    
    55 55
       </field>
    
    56
    +
    
    56 57
       <field name="supportVesselName">
    
    57 58
         <!-- supportVesselName de ${maxLength} caractères maximum -->
    
    58 59
         <field-validator type="fieldexpressionwithparams">
    
    ... ... @@ -91,7 +92,7 @@
    91 92
         </field-validator>
    
    92 93
       </field>
    
    93 94
       <field name="endSetDate">
    
    94
    -    <!-- endDateCoulissage <= endSetDate -->
    
    95
    +    <!-- endPursingDate <= endSetDate -->
    
    95 96
         <field-validator type="fieldexpression" short-circuit="true">
    
    96 97
           <param name="expression">
    
    97 98
             <![CDATA[ endPursingDate == null || ! endPursingDate.after(endSetDate) ]]>
    
    ... ... @@ -100,19 +101,25 @@
    100 101
         </field-validator>
    
    101 102
       </field>
    
    102 103
       <field name="endSetTimeStamp">
    
    104
    +    <field-validator type="fieldexpression" short-circuit="true">
    
    105
    +      <param name="expression">
    
    106
    +        <![CDATA[ endSetTimeStamp == null || ! startTime.after(endSetTimeStamp) ]]>
    
    107
    +      </param>
    
    108
    +      <message>observe.validation.set.endSetTimeStamp.after.startTime</message>
    
    109
    +    </field-validator>
    
    103 110
         <!-- endPursingTimeStamp < = endSetTimeStamp && endSetTimeStamp - endPursingTimeStamp > 45 minutes -->
    
    104 111
         <field-validator type="fieldexpression" short-circuit="true">
    
    105 112
           <param name="expression">
    
    106
    -        <![CDATA[ endSetTimeStamp == null  || ! endPursingTimeStamp.after(endSetTimeStamp) ]]>
    
    113
    +        <![CDATA[ endSetTimeStamp == null || endPursingTimeStamp == null || ! endPursingTimeStamp.after(endSetTimeStamp) ]]>
    
    107 114
           </param>
    
    108 115
           <message>observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp</message>
    
    109 116
         </field-validator>
    
    110 117
     
    
    111
    -    <!--verifier que la duree de la set est d'au moins 45 minutes -->
    
    118
    +    <!-- verifier que la duree de la set est d'au moins 45 minutes -->
    
    112 119
         <field-validator type="fieldexpressionwithparams">
    
    113 120
           <param name="intParams">maxLength:45</param>
    
    114 121
           <param name="expression">
    
    115
    -        <![CDATA[ (endSetTimeStamp.time - endPursingTimeStamp.time) >= (ints.maxLength * 60000) ]]>
    
    122
    +        <![CDATA[ endSetTimeStamp == null  || endPursingTimeStamp == null || (endSetTimeStamp.time - endPursingTimeStamp.time) >= (ints.maxLength * 60000) ]]>
    
    116 123
           </param>
    
    117 124
           <message>observe.validation.set.bound.delay##${ints.maxLength}</message>
    
    118 125
         </field-validator>