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

Commits:

4 changed files:

Changes:

  • validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetCatch-error-validation.xml
    ... ... @@ -25,9 +25,36 @@
    25 25 
         "-//Apache Struts//XWork Validator 1.0.3//EN"
    26 26 
         "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    27 27 
     <validators>
    28 
    +  <field name="species">
    29 
    +    <!-- species is mandatory -->
    30 
    +    <field-validator type="mandatory" short-circuit="true">
    31 
    +      <message/>
    32 
    +    </field-validator>
    33 
    +    <!-- SpeciesReference disabled -->
    34 
    +    <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true">
    35 
    +      <message/>
    36 
    +    </field-validator>
    37 
    +  </field>
    38 
    +  <field name="weightCategory">
    39 
    +    <!-- weightCategory is mandatory -->
    40 
    +    <field-validator type="mandatory" short-circuit="true">
    41 
    +      <message/>
    42 
    +    </field-validator>
    43 
    +    <!-- WeightCategoryReference disabled -->
    44 
    +    <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true">
    45 
    +      <message/>
    46 
    +    </field-validator>
    47 
    +  </field>
    28 48 
       <field name="well">
    49 
    +    <!-- well is a mandatory string -->
    29 50 
         <field-validator type="mandatoryString" short-circuit="true">
    30 51 
           <message/>
    31 52 
         </field-validator>
    32 53 
       </field>
    54 
    +  <field name="catchWeight">
    55 
    +    <!-- catchWeight is mandatory -->
    56 
    +    <field-validator type="mandatory" short-circuit="true">
    57 
    +      <message/>
    58 
    +    </field-validator>
    59 
    +  </field>
    33 60 
     </validators>

  • validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetCatch-warning-validation.xml
    ... ... @@ -25,6 +25,18 @@
    25 25 
         "-//Apache Struts//XWork Validator 1.0.3//EN"
    26 26 
         "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    27 27 
     <validators>
    28 
    +  <!-- SpeciesReference disabled -->
    29 
    +  <field name="species">
    30 
    +    <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true">
    31 
    +      <message/>
    32 
    +    </field-validator>
    33 
    +  </field>
    34 
    +  <!-- WeightCategoryReference disabled -->
    35 
    +  <field name="weightCategory">
    36 
    +    <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true">
    37 
    +      <message/>
    38 
    +    </field-validator>
    39 
    +  </field>
    28 40 
       <field name="catchWeight">
    29 41 
         <field-validator type="boundNumber" short-circuit="true">
    30 42 
           <param name="min">0.0</param>

  • validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetDiscarded-error-validation.xml
    ... ... @@ -25,7 +25,38 @@
    25 25 
         "-//Apache Struts//XWork Validator 1.0.3//EN"
    26 26 
         "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    27 27 
     <validators>
    28 
    +  <field name="species">
    29 
    +    <!-- species is mandatory -->
    30 
    +    <field-validator type="mandatory" short-circuit="true">
    31 
    +      <message/>
    32 
    +    </field-validator>
    33 
    +    <!-- SpeciesReference disabled -->
    34 
    +    <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true">
    35 
    +      <message/>
    36 
    +    </field-validator>
    37 
    +  </field>
    38 
    +  <field name="weightCategory">
    39 
    +    <!-- weightCategory is mandatory -->
    40 
    +    <field-validator type="mandatory" short-circuit="true">
    41 
    +      <message/>
    42 
    +    </field-validator>
    43 
    +    <!-- WeightCategoryReference disabled -->
    44 
    +    <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true">
    45 
    +      <message/>
    46 
    +    </field-validator>
    47 
    +  </field>
    28 48 
       <field name="reasonForDiscard">
    49 
    +    <!-- reasonForDiscard is mandatory -->
    50 
    +    <field-validator type="mandatory" short-circuit="true">
    51 
    +      <message/>
    52 
    +    </field-validator>
    53 
    +    <!-- ReasonForDiscardReference disabled -->
    54 
    +    <field-validator type="checkDisabledReferentialOnErrorScope" short-circuit="true">
    55 
    +      <message/>
    56 
    +    </field-validator>
    57 
    +  </field>
    58 
    +  <field name="catchWeight">
    59 
    +    <!-- catchWeight is mandatory -->
    29 60 
         <field-validator type="mandatory" short-circuit="true">
    30 61 
           <message/>
    31 62 
         </field-validator>

  • validation/src/main/resources/fr/ird/observe/dto/data/seine/TargetCatchDto-update-targetDiscarded-warning-validation.xml
    ... ... @@ -23,6 +23,25 @@
    23 23 
         "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 24 
         "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 25 
     <validators>
    26 
    +
    27 
    +  <field name="species">
    28 
    +    <!-- SpeciesReference disabled -->
    29 
    +    <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true">
    30 
    +      <message/>
    31 
    +    </field-validator>
    32 
    +  </field>
    33 
    +  <field name="weightCategory">
    34 
    +    <!-- WeightCategoryReference disabled -->
    35 
    +    <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true">
    36 
    +      <message/>
    37 
    +    </field-validator>
    38 
    +  </field>
    39 
    +  <field name="reasonForDiscard">
    40 
    +    <!-- ReasonForDiscardReference disabled -->
    41 
    +    <field-validator type="checkDisabledReferentialOnWarningScope" short-circuit="true">
    42 
    +      <message/>
    43 
    +    </field-validator>
    44 
    +  </field>
    26 45 
       <field name="catchWeight">
    27 46 
         <field-validator type="boundNumber" short-circuit="true">
    28 47 
           <param name="min">0.0</param>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.