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

Commits:

18 changed files:

Changes:

  • core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json
    ... ... @@ -9087,7 +9087,7 @@
    9087 9087 
           {
    9088 9088 
             "name": "weight",
    9089 9089 
             "comments": [
    9090 
    -          "0.0001 <= weight <= 100.0 except if !countOrWeightValid",
    9090 
    +          "0.0001 <= weight <= 1500.0 except if !countOrWeightValid",
    9091 9091 
               "weight is a strictly positive number",
    9092 9092 
               "weight is mandatory except if countOrWeightValid"
    9093 9093 
             ]
    ... ... @@ -9186,7 +9186,7 @@
    9186 9186 
           {
    9187 9187 
             "name": "weight",
    9188 9188 
             "comments": [
    9189 
    -          "0.0001 <= weight <= 100.0 except if !countOrWeightValid",
    9189 
    +          "0.0001 <= weight <= 1500.0 except if !countOrWeightValid",
    9190 9190 
               "weight is a strictly positive number",
    9191 9191 
               "weight is mandatory except if countOrWeightValid"
    9192 9192 
             ]

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/BatchDto-create-error-validation.xml
    ... ... @@ -116,11 +116,11 @@
    116 116 
           <message/>
    117 117 
         </field-validator>
    118 118
    119 
    -    <!-- 0.0001 <= weight <= 100.0 except if !countOrWeightValid -->
    119 
    +    <!-- 0.0001 <= weight <= 1500.0 except if !countOrWeightValid -->
    120 120 
         <field-validator type="boundNumber">
    121 121 
           <param name="skip"><![CDATA[ !countOrWeightValid ]]></param>
    122 122 
           <param name="min">0.0001</param>
    123 
    -      <param name="max">100.0</param>
    123 
    +      <param name="max">1500.0</param>
    124 124 
           <message/>
    125 125 
         </field-validator>
    126 126 
       </field>

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/BatchDto-update-error-validation.xml
    ... ... @@ -116,11 +116,11 @@
    116 116 
           <message/>
    117 117 
         </field-validator>
    118 118
    119 
    -    <!-- 0.0001 <= weight <= 100.0 except if !countOrWeightValid -->
    119 
    +    <!-- 0.0001 <= weight <= 1500.0 except if !countOrWeightValid -->
    120 120 
         <field-validator type="boundNumber">
    121 121 
           <param name="skip"><![CDATA[ !countOrWeightValid ]]></param>
    122 122 
           <param name="min">0.0001</param>
    123 
    -      <param name="max">100.0</param>
    123 
    +      <param name="max">1500.0</param>
    124 124 
           <message/>
    125 125 
         </field-validator>
    126 126 
       </field>

  • core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/Batch/validation-create.json
    ... ... @@ -58,7 +58,7 @@
    58 58 
       },
    59 59 
       "weight": {
    60 60 
         "errors": [
    61 
    -      "0.0001 <= weight <= 100.0 except if !countOrWeightValid",
    61 
    +      "0.0001 <= weight <= 1500.0 except if !countOrWeightValid",
    62 62 
           "weight is a strictly positive number",
    63 63 
           "weight is mandatory except if countOrWeightValid"
    64 64 
         ]

  • core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/Batch/validation-update.json
    ... ... @@ -58,7 +58,7 @@
    58 58 
       },
    59 59 
       "weight": {
    60 60 
         "errors": [
    61 
    -      "0.0001 <= weight <= 100.0 except if !countOrWeightValid",
    61 
    +      "0.0001 <= weight <= 1500.0 except if !countOrWeightValid",
    62 62 
           "weight is a strictly positive number",
    63 63 
           "weight is mandatory except if countOrWeightValid"
    64 64 
         ]

  • model/src/main/models/Observe/dto/attribute/boundNumber.properties
    ... ... @@ -61,7 +61,7 @@ data.ps.common.Trip.attribute.landingTotalWeight=0.0:2000.0:!targetWellsSampling
    61 61 
     data.ps.common.Trip.attribute.localMarketTotalWeight=0.0:1500.0:!localmarketWellsSamplingEnabled && !localmarketSurveySamplingEnabled
    62 62 
     data.ps.common.Trip.attribute.timeAtSea=10:2400:!logbookEnabled
    63 63 
     data.ps.landing.Landing.attribute.weight=0.0:2000.0
    64 
    -data.ps.localmarket.Batch.attribute.weight=0.0001:100.0:!countOrWeightValid
    64 
    +data.ps.localmarket.Batch.attribute.weight=0.0001:1500.0:!countOrWeightValid
    65 65 
     data.ps.localmarket.SurveyPart.attribute.proportion=0.0:100.0
    66 66 
     data.ps.logbook.Activity.attribute.currentDirection=0:359
    67 67 
     data.ps.logbook.Activity.attribute.currentSpeed=0.0:40.0

  • server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-create-error.xml
    ... ... @@ -116,11 +116,11 @@
    116 116 
           <message/>
    117 117 
         </field-validator>
    118 118
    119 
    -    <!-- 0.0001 <= weight <= 100.0 except if !countOrWeightValid -->
    119 
    +    <!-- 0.0001 <= weight <= 1500.0 except if !countOrWeightValid -->
    120 120 
         <field-validator type="boundNumber">
    121 121 
           <param name="skip"><![CDATA[ !countOrWeightValid ]]></param>
    122 122 
           <param name="min">0.0001</param>
    123 
    -      <param name="max">100.0</param>
    123 
    +      <param name="max">1500.0</param>
    124 124 
           <message/>
    125 125 
         </field-validator>
    126 126 
       </field>

  • server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-create.json
    ... ... @@ -58,7 +58,7 @@
    58 58 
       },
    59 59 
       "weight": {
    60 60 
         "errors": [
    61 
    -      "0.0001 <= weight <= 100.0 except if !countOrWeightValid",
    61 
    +      "0.0001 <= weight <= 1500.0 except if !countOrWeightValid",
    62 62 
           "weight is a strictly positive number",
    63 63 
           "weight is mandatory except if countOrWeightValid"
    64 64 
         ]

  • server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-update-error.xml
    ... ... @@ -116,11 +116,11 @@
    116 116 
           <message/>
    117 117 
         </field-validator>
    118 118
    119 
    -    <!-- 0.0001 <= weight <= 100.0 except if !countOrWeightValid -->
    119 
    +    <!-- 0.0001 <= weight <= 1500.0 except if !countOrWeightValid -->
    120 120 
         <field-validator type="boundNumber">
    121 121 
           <param name="skip"><![CDATA[ !countOrWeightValid ]]></param>
    122 122 
           <param name="min">0.0001</param>
    123 
    -      <param name="max">100.0</param>
    123 
    +      <param name="max">1500.0</param>
    124 124 
           <message/>
    125 125 
         </field-validator>
    126 126 
       </field>

  • server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-update.json
    ... ... @@ -58,7 +58,7 @@
    58 58 
       },
    59 59 
       "weight": {
    60 60 
         "errors": [
    61 
    -      "0.0001 <= weight <= 100.0 except if !countOrWeightValid",
    61 
    +      "0.0001 <= weight <= 1500.0 except if !countOrWeightValid",
    62 62 
           "weight is a strictly positive number",
    63 63 
           "weight is mandatory except if countOrWeightValid"
    64 64 
         ]

  • server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/GetSome/index.html
    ... ... @@ -269,6 +269,13 @@
    269 269 
                             <td>[equals, not_equals, null, not_null, min, max]</td>
    270 270 
                             <td>See documentation for filter type: <code>Timestamp</code>.</td>
    271 271 
                         </tr>
    272 
    +                    <tr>
    273 
    +                        <td>longline</td>
    274 
    +                        <td>boolean</td>
    275 
    +                        <td><code>false|true</code></td>
    276 
    +                        <td>[equals, not_equals]</td>
    277 
    +                        <td>See documentation for filter type: <code>boolean</code>.</td>
    278 
    +                    </tr>
    272 279 
                         <tr>
    273 280 
                             <td>needComment</td>
    274 281 
                             <td>boolean</td>
    ... ... @@ -276,6 +283,13 @@
    276 283 
                             <td>[equals, not_equals]</td>
    277 284 
                             <td>See documentation for filter type: <code>boolean</code>.</td>
    278 285 
                         </tr>
    286 
    +                    <tr>
    287 
    +                        <td>seine</td>
    288 
    +                        <td>boolean</td>
    289 
    +                        <td><code>false|true</code></td>
    290 
    +                        <td>[equals, not_equals]</td>
    291 
    +                        <td>See documentation for filter type: <code>boolean</code>.</td>
    292 
    +                    </tr>
    279 293 
                         <tr>
    280 294 
                             <td>status</td>
    281 295 
                             <td>ReferenceStatus</td>

  • server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/definition.json
    ... ... @@ -11,5 +11,7 @@
    11 11 
       "label5": "String",
    12 12 
       "label6": "String",
    13 13 
       "label7": "String",
    14 
    -  "label8": "String"
    14 
    +  "label8": "String",
    15 
    +  "longline": "boolean",
    16 
    +  "seine": "boolean"
    15 17 
     }
    \ No newline at end of file

  • server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-create-error.xml
    ... ... @@ -124,6 +124,20 @@
    124 124 
         </field-validator>
    125 125 
       </field>
    126 126
    127 
    +  <field name="longline">
    128 
    +    <!-- longline is mandatory -->
    129 
    +    <field-validator type="mandatory" short-circuit="true">
    130 
    +      <message/>
    131 
    +    </field-validator>
    132 
    +  </field>
    133 
    +
    134 
    +  <field name="seine">
    135 
    +    <!-- seine is mandatory -->
    136 
    +    <field-validator type="mandatory" short-circuit="true">
    137 
    +      <message/>
    138 
    +    </field-validator>
    139 
    +  </field>
    140 
    +
    127 141 
       <field name="uri">
    128 142 
         <!-- uri (if not null) is not a blank string -->
    129 143 
         <field-validator type="notBlankString" short-circuit="true">

  • server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-create-warning.xml
    ... ... @@ -24,6 +24,14 @@
    24 24 
         "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 25 
     <validators>
    26 26
    27 
    +  <field name="atLeastOneSelected">
    28 
    +    <!-- At least one of the following properties must be selected (longline,seine) -->
    29 
    +    <field-validator type="fieldexpression" short-circuit="true">
    30 
    +      <param name="expression"> <![CDATA[ atLeastOneSelected ]]> </param>
    31 
    +      <message>observe.referential.common.VesselType.validation.atLeastOneSelected</message>
    32 
    +    </field-validator>
    33 
    +  </field>
    34 
    +
    27 35 
       <field name="label1">
    28 36 
        <!-- label1 is not translated -->
    29 37 
         <field-validator type="fieldexpression">

  • server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-create.json
    1 1 
     {
    2 
    +  "atLeastOneSelected": {
    3 
    +    "warnings": [
    4 
    +      "At least one of the following properties must be selected (longline,seine)"
    5 
    +    ]
    6 
    +  },
    2 7 
       "code": {
    3 8 
         "errors": [
    4 9 
           "code (if not null) is not a blank string",
    ... ... @@ -64,6 +69,16 @@
    64 69 
           "label8 (if not null) is not a blank string"
    65 70 
         ]
    66 71 
       },
    72 
    +  "longline": {
    73 
    +    "errors": [
    74 
    +      "longline is mandatory"
    75 
    +    ]
    76 
    +  },
    77 
    +  "seine": {
    78 
    +    "errors": [
    79 
    +      "seine is mandatory"
    80 
    +    ]
    81 
    +  },
    67 82 
       "status": {
    68 83 
         "warnings": [
    69 84 
           "referential is enabled"

  • server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-update-error.xml
    ... ... @@ -124,6 +124,20 @@
    124 124 
         </field-validator>
    125 125 
       </field>
    126 126
    127 
    +  <field name="longline">
    128 
    +    <!-- longline is mandatory -->
    129 
    +    <field-validator type="mandatory" short-circuit="true">
    130 
    +      <message/>
    131 
    +    </field-validator>
    132 
    +  </field>
    133 
    +
    134 
    +  <field name="seine">
    135 
    +    <!-- seine is mandatory -->
    136 
    +    <field-validator type="mandatory" short-circuit="true">
    137 
    +      <message/>
    138 
    +    </field-validator>
    139 
    +  </field>
    140 
    +
    127 141 
       <field name="uri">
    128 142 
         <!-- uri (if not null) is not a blank string -->
    129 143 
         <field-validator type="notBlankString" short-circuit="true">

  • server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-update-warning.xml
    ... ... @@ -24,6 +24,14 @@
    24 24 
         "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 25 
     <validators>
    26 26
    27 
    +  <field name="atLeastOneSelected">
    28 
    +    <!-- At least one of the following properties must be selected (longline,seine) -->
    29 
    +    <field-validator type="fieldexpression" short-circuit="true">
    30 
    +      <param name="expression"> <![CDATA[ atLeastOneSelected ]]> </param>
    31 
    +      <message>observe.referential.common.VesselType.validation.atLeastOneSelected</message>
    32 
    +    </field-validator>
    33 
    +  </field>
    34 
    +
    27 35 
       <field name="label1">
    28 36 
         <!-- label1 is not translated -->
    29 37 
         <field-validator type="fieldexpression">

  • server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-update.json
    1 1 
     {
    2 
    +  "atLeastOneSelected": {
    3 
    +    "warnings": [
    4 
    +      "At least one of the following properties must be selected (longline,seine)"
    5 
    +    ]
    6 
    +  },
    2 7 
       "code": {
    3 8 
         "errors": [
    4 9 
           "code (if not null) is not a blank string",
    ... ... @@ -64,6 +69,16 @@
    64 69 
           "label8 (if not null) is not a blank string"
    65 70 
         ]
    66 71 
       },
    72 
    +  "longline": {
    73 
    +    "errors": [
    74 
    +      "longline is mandatory"
    75 
    +    ]
    76 
    +  },
    77 
    +  "seine": {
    78 
    +    "errors": [
    79 
    +      "seine is mandatory"
    80 
    +    ]
    81 
    +  },
    67 82 
       "status": {
    68 83 
         "warnings": [
    69 84 
           "referential is enabled"

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help