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

Commits:

6 changed files:

Changes:

  • pom.xml
    ... ... @@ -155,7 +155,7 @@
    155 155
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    
    156 156
         <buildDate>${maven.build.timestamp}</buildDate>
    
    157 157
     
    
    158
    -    <observeToolkitVersion>3.7.16</observeToolkitVersion>
    
    158
    +    <observeToolkitVersion>3.7.17</observeToolkitVersion>
    
    159 159
         <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>-->
    
    160 160
         <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
    
    161 161
         <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
    

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-baitsComposition-error-validation.xml
    ... ... @@ -31,9 +31,7 @@
    31 31
         </field-validator>
    
    32 32
       </field>
    
    33 33
       <field name="baitsCompositionProportionSum">
    
    34
    -    <field-validator type="boundNumber" short-circuit="true">
    
    35
    -      <param name="min">0.0</param>
    
    36
    -      <param name="max">100.0</param>
    
    34
    +    <field-validator type="proportionTotal" short-circuit="true">
    
    37 35
           <message/>
    
    38 36
         </field-validator>
    
    39 37
       </field>
    

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-branchlinesComposition-error-validation.xml
    ... ... @@ -31,9 +31,7 @@
    31 31
         </field-validator>
    
    32 32
       </field>
    
    33 33
       <field name="branchlinesCompositionProportionSum">
    
    34
    -    <field-validator type="boundNumber" short-circuit="true">
    
    35
    -      <param name="min">0.0</param>
    
    36
    -      <param name="max">100.0</param>
    
    34
    +    <field-validator type="proportionTotal" short-circuit="true">
    
    37 35
           <message/>
    
    38 36
         </field-validator>
    
    39 37
       </field>
    

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-floatlinesComposition-error-validation.xml
    ... ... @@ -31,9 +31,7 @@
    31 31
         </field-validator>
    
    32 32
       </field>
    
    33 33
       <field name="floatlinesCompositionProportionSum">
    
    34
    -    <field-validator type="boundNumber" short-circuit="true">
    
    35
    -      <param name="min">0.0</param>
    
    36
    -      <param name="max">100.0</param>
    
    34
    +    <field-validator type="proportionTotal" short-circuit="true">
    
    37 35
           <message/>
    
    38 36
         </field-validator>
    
    39 37
       </field>
    

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-hooksComposition-error-validation.xml
    ... ... @@ -31,9 +31,7 @@
    31 31
         </field-validator>
    
    32 32
       </field>
    
    33 33
       <field name="hooksCompositionProportionSum">
    
    34
    -    <field-validator type="boundNumber" short-circuit="true">
    
    35
    -      <param name="min">0.0</param>
    
    36
    -      <param name="max">100.0</param>
    
    34
    +    <field-validator type="proportionTotal" short-circuit="true">
    
    37 35
           <message/>
    
    38 36
         </field-validator>
    
    39 37
       </field>
    

  • validation/src/main/resources/validators.xml
    ... ... @@ -60,6 +60,7 @@
    60 60
       <validator name="collectionNotFilled" class="fr.ird.observe.validation.validators.CollectionNotFilledFieldValidator"/>
    
    61 61
       <validator name="positiveNumber" class="fr.ird.observe.validation.validators.PositiveNumberFieldValidator"/>
    
    62 62
       <validator name="boundNumber" class="fr.ird.observe.validation.validators.BoundNumberFieldValidator"/>
    
    63
    +  <validator name="proportionTotal" class="fr.ird.observe.validation.validators.ProportionTotalFieldValidator"/>
    
    63 64
     
    
    64 65
       <validator name="referentialUniqueCode" class="fr.ird.observe.validation.validators.ReferentialUniqueCodeValidator"/>
    
    65 66
       <validator name="referentialUniqueField" class="fr.ird.observe.validation.validators.ReferentialUniqueFieldValidator"/>