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

Commits:

21 changed files:

Changes:

  • pom.xml
    ... ... @@ -161,7 +161,7 @@
    161 161 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    162 162 
         <buildDate>${maven.build.timestamp}</buildDate>
    163 163
    164 
    -    <lib.version.toolkit>5.0.51-SNAPSHOT</lib.version.toolkit>
    164 
    +    <lib.version.toolkit>5.0.51</lib.version.toolkit>
    165 165
    166 166 
         <lib.version.ognl>3.1.29</lib.version.ognl>
    167 167 
         <!--can't use 1.4.197 (date has changed + blob also)-->
    ... ... @@ -174,7 +174,7 @@
    174 174 
         <!--    <lib.version.java4all.http>1.0.30</lib.version.java4all.http>-->
    175 175 
     <!--        <lib.version.java4all.topia>1.52-SNAPSHOT</lib.version.java4all.topia>-->
    176 176 
     <!--        <lib.version.java4all.eugene>3.0-alpha-42-SNAPSHOT</lib.version.java4all.eugene>-->
    177 
    -        <lib.version.java4all.jaxx>3.0.2-SNAPSHOT </lib.version.java4all.jaxx>
    177 
    +<!--        <lib.version.java4all.jaxx>3.0.2-SNAPSHOT </lib.version.java4all.jaxx>-->
    178 178 
         <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>-->
    179 179 
         <!--<lib.version.java4all.application-template>1.0.2-SNAPSHOT</lib.version.java4all.application-template>-->
    180 180 
         <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->

  • server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Create/validation-error.xml
    ... ... @@ -137,11 +137,11 @@
    137 137 
           <message/>
    138 138 
         </field-validator>
    139 139
    140 
    -    <!-- 0.1 <= landingTotalWeight <= 3000.0 except if !targetWellsSamplingEnabled -->
    140 
    +    <!-- 0.0 <= landingTotalWeight <= 2000.0 except if !targetWellsSamplingEnabled -->
    141 141 
         <field-validator type="boundNumber">
    142 142 
           <param name="skip"><![CDATA[ !targetWellsSamplingEnabled ]]></param>
    143 
    -      <param name="min">0.1</param>
    144 
    -      <param name="max">3000.0</param>
    143 
    +      <param name="min">0.0</param>
    144 
    +      <param name="max">2000.0</param>
    145 145 
           <message/>
    146 146 
         </field-validator>
    147 147 
       </field>

  • server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Create/validation.json
    ... ... @@ -78,7 +78,7 @@
    78 78 
       "landingTotalWeight": {
    79 79 
         "errors": [
    80 80 
           "landingTotalWeight is a positive number",
    81 
    -      "0.1 <= landingTotalWeight <= 3000.0 except if !targetWellsSamplingEnabled"
    81 
    +      "0.0 <= landingTotalWeight <= 2000.0 except if !targetWellsSamplingEnabled"
    82 82 
         ]
    83 83 
       },
    84 84 
       "landingWellContentStatus": {

  • server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Update/validation-error.xml
    ... ... @@ -146,11 +146,11 @@
    146 146 
           <message/>
    147 147 
         </field-validator>
    148 148
    149 
    -    <!-- 0.1 <= landingTotalWeight <= 3000.0 except if !targetWellsSamplingEnabled -->
    149 
    +    <!-- 0.0 <= landingTotalWeight <= 2000.0 except if !targetWellsSamplingEnabled -->
    150 150 
         <field-validator type="boundNumber">
    151 151 
           <param name="skip"><![CDATA[ !targetWellsSamplingEnabled ]]></param>
    152 
    -      <param name="min">0.1</param>
    153 
    -      <param name="max">3000.0</param>
    152 
    +      <param name="min">0.0</param>
    153 
    +      <param name="max">2000.0</param>
    154 154 
           <message/>
    155 155 
         </field-validator>
    156 156 
       </field>

  • server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Update/validation.json
    ... ... @@ -79,7 +79,7 @@
    79 79 
       "landingTotalWeight": {
    80 80 
         "errors": [
    81 81 
           "landingTotalWeight is a positive number",
    82 
    -      "0.1 <= landingTotalWeight <= 3000.0 except if !targetWellsSamplingEnabled"
    82 
    +      "0.0 <= landingTotalWeight <= 2000.0 except if !targetWellsSamplingEnabled"
    83 83 
         ]
    84 84 
       },
    85 85 
       "landingWellContentStatus": {

  • server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-create-error.xml
    ... ... @@ -137,11 +137,11 @@
    137 137 
           <message/>
    138 138 
         </field-validator>
    139 139
    140 
    -    <!-- 0.1 <= landingTotalWeight <= 3000.0 except if !targetWellsSamplingEnabled -->
    140 
    +    <!-- 0.0 <= landingTotalWeight <= 2000.0 except if !targetWellsSamplingEnabled -->
    141 141 
         <field-validator type="boundNumber">
    142 142 
           <param name="skip"><![CDATA[ !targetWellsSamplingEnabled ]]></param>
    143 
    -      <param name="min">0.1</param>
    144 
    -      <param name="max">3000.0</param>
    143 
    +      <param name="min">0.0</param>
    144 
    +      <param name="max">2000.0</param>
    145 145 
           <message/>
    146 146 
         </field-validator>
    147 147 
       </field>

  • server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-create.json
    ... ... @@ -78,7 +78,7 @@
    78 78 
       "landingTotalWeight": {
    79 79 
         "errors": [
    80 80 
           "landingTotalWeight is a positive number",
    81 
    -      "0.1 <= landingTotalWeight <= 3000.0 except if !targetWellsSamplingEnabled"
    81 
    +      "0.0 <= landingTotalWeight <= 2000.0 except if !targetWellsSamplingEnabled"
    82 82 
         ]
    83 83 
       },
    84 84 
       "landingWellContentStatus": {

  • server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-update-error.xml
    ... ... @@ -146,11 +146,11 @@
    146 146 
           <message/>
    147 147 
         </field-validator>
    148 148
    149 
    -    <!-- 0.1 <= landingTotalWeight <= 3000.0 except if !targetWellsSamplingEnabled -->
    149 
    +    <!-- 0.0 <= landingTotalWeight <= 2000.0 except if !targetWellsSamplingEnabled -->
    150 150 
         <field-validator type="boundNumber">
    151 151 
           <param name="skip"><![CDATA[ !targetWellsSamplingEnabled ]]></param>
    152 
    -      <param name="min">0.1</param>
    153 
    -      <param name="max">3000.0</param>
    152 
    +      <param name="min">0.0</param>
    153 
    +      <param name="max">2000.0</param>
    154 154 
           <message/>
    155 155 
         </field-validator>
    156 156 
       </field>

  • server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-update.json
    ... ... @@ -79,7 +79,7 @@
    79 79 
       "landingTotalWeight": {
    80 80 
         "errors": [
    81 81 
           "landingTotalWeight is a positive number",
    82 
    -      "0.1 <= landingTotalWeight <= 3000.0 except if !targetWellsSamplingEnabled"
    82 
    +      "0.0 <= landingTotalWeight <= 2000.0 except if !targetWellsSamplingEnabled"
    83 83 
         ]
    84 84 
       },
    85 85 
       "landingWellContentStatus": {

  • server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-create-error.xml
    ... ... @@ -25,9 +25,9 @@
    25 25 
     <validators>
    26 26
    27 27 
       <field name="bigsWeight">
    28 
    -    <!-- bigsWeight is mandatory except if totalWeight != null && totalWeight > 0 -->
    28 
    +    <!-- bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) -->
    29 29 
         <field-validator type="mandatory" short-circuit="true">
    30 
    -      <param name="skip"><![CDATA[ totalWeight != null && totalWeight > 0 ]]></param>
    30 
    +      <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) ]]></param>
    31 31 
           <message>observe.data.ps.logbook.Sample.bigsWeight.validation.required</message>
    32 32 
         </field-validator>
    33 33
    ... ... @@ -119,9 +119,9 @@
    119 119 
       </field>
    120 120
    121 121 
       <field name="smallsWeight">
    122 
    -    <!-- smallsWeight is mandatory except if totalWeight != null && totalWeight > 0 -->
    122 
    +    <!-- smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) -->
    123 123 
         <field-validator type="mandatory" short-circuit="true">
    124 
    -      <param name="skip"><![CDATA[ totalWeight != null && totalWeight > 0 ]]></param>
    124 
    +      <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) ]]></param>
    125 125 
           <message>observe.data.ps.logbook.Sample.smallsWeight.validation.required</message>
    126 126 
         </field-validator>
    127 127
    ... ... @@ -153,9 +153,9 @@
    153 153 
       </field>
    154 154
    155 155 
       <field name="totalWeight">
    156 
    -    <!-- totalWeight is mandatory except if bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0 -->
    156 
    +    <!-- totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0) -->
    157 157 
         <field-validator type="mandatory" short-circuit="true">
    158 
    -      <param name="skip"><![CDATA[ bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0 ]]></param>
    158 
    +      <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0) ]]></param>
    159 159 
           <message>observe.data.ps.logbook.Sample.totalWeight.validation.required</message>
    160 160 
         </field-validator>
    161 161

  • server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-create.json
    1 1 
     {
    2 2 
       "bigsWeight": {
    3 3 
         "errors": [
    4 
    -      "bigsWeight is mandatory except if totalWeight != null && totalWeight > 0",
    4 
    +      "bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)",
    5 5 
           "bigsWeight is a positive number",
    6 6 
           "0.0 <= bigsWeight <= 150.0 except if !weightValid",
    7 7 
           "bigsWeight not allowed if totalWeight filled"
    ... ... @@ -52,7 +52,7 @@
    52 52 
       },
    53 53 
       "smallsWeight": {
    54 54 
         "errors": [
    55 
    -      "smallsWeight is mandatory except if totalWeight != null && totalWeight > 0",
    55 
    +      "smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)",
    56 56 
           "smallsWeight is a positive number",
    57 57 
           "0.0 <= smallsWeight <= 150.0 except if !weightValid",
    58 58 
           "smallsWeight not allowed if totalWeight filled"
    ... ... @@ -65,7 +65,7 @@
    65 65 
       },
    66 66 
       "totalWeight": {
    67 67 
         "errors": [
    68 
    -      "totalWeight is mandatory except if bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0",
    68 
    +      "totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)",
    69 69 
           "totalWeight is a positive number",
    70 70 
           "0.0 <= totalWeight <= 150.0 except if !weightValid",
    71 71 
           "totalWeight not allowed if bigsWeight and smallsWeight filled"

  • server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-update-error.xml
    ... ... @@ -25,9 +25,9 @@
    25 25 
     <validators>
    26 26
    27 27 
       <field name="bigsWeight">
    28 
    -    <!-- bigsWeight is mandatory except if totalWeight != null && totalWeight > 0 -->
    28 
    +    <!-- bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) -->
    29 29 
         <field-validator type="mandatory" short-circuit="true">
    30 
    -      <param name="skip"><![CDATA[ totalWeight != null && totalWeight > 0 ]]></param>
    30 
    +      <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) ]]></param>
    31 31 
           <message>observe.data.ps.logbook.Sample.bigsWeight.validation.required</message>
    32 32 
         </field-validator>
    33 33
    ... ... @@ -119,9 +119,9 @@
    119 119 
       </field>
    120 120
    121 121 
       <field name="smallsWeight">
    122 
    -    <!-- smallsWeight is mandatory except if totalWeight != null && totalWeight > 0 -->
    122 
    +    <!-- smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) -->
    123 123 
         <field-validator type="mandatory" short-circuit="true">
    124 
    -      <param name="skip"><![CDATA[ totalWeight != null && totalWeight > 0 ]]></param>
    124 
    +      <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) ]]></param>
    125 125 
           <message>observe.data.ps.logbook.Sample.smallsWeight.validation.required</message>
    126 126 
         </field-validator>
    127 127
    ... ... @@ -153,9 +153,9 @@
    153 153 
       </field>
    154 154
    155 155 
       <field name="totalWeight">
    156 
    -    <!-- totalWeight is mandatory except if bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0 -->
    156 
    +    <!-- totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0) -->
    157 157 
         <field-validator type="mandatory" short-circuit="true">
    158 
    -      <param name="skip"><![CDATA[ bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0 ]]></param>
    158 
    +      <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0) ]]></param>
    159 159 
           <message>observe.data.ps.logbook.Sample.totalWeight.validation.required</message>
    160 160 
         </field-validator>
    161 161

  • server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-update.json
    1 1 
     {
    2 2 
       "bigsWeight": {
    3 3 
         "errors": [
    4 
    -      "bigsWeight is mandatory except if totalWeight != null && totalWeight > 0",
    4 
    +      "bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)",
    5 5 
           "bigsWeight is a positive number",
    6 6 
           "0.0 <= bigsWeight <= 150.0 except if !weightValid",
    7 7 
           "bigsWeight not allowed if totalWeight filled"
    ... ... @@ -52,7 +52,7 @@
    52 52 
       },
    53 53 
       "smallsWeight": {
    54 54 
         "errors": [
    55 
    -      "smallsWeight is mandatory except if totalWeight != null && totalWeight > 0",
    55 
    +      "smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)",
    56 56 
           "smallsWeight is a positive number",
    57 57 
           "0.0 <= smallsWeight <= 150.0 except if !weightValid",
    58 58 
           "smallsWeight not allowed if totalWeight filled"
    ... ... @@ -65,7 +65,7 @@
    65 65 
       },
    66 66 
       "totalWeight": {
    67 67 
         "errors": [
    68 
    -      "totalWeight is mandatory except if bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0",
    68 
    +      "totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)",
    69 69 
           "totalWeight is a positive number",
    70 70 
           "0.0 <= totalWeight <= 150.0 except if !weightValid",
    71 71 
           "totalWeight not allowed if bigsWeight and smallsWeight filled"

  • server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-create-error.xml
    ... ... @@ -33,14 +33,9 @@
    33 33 
       </field>
    34 34
    35 35 
       <field name="weightedWeight">
    36 
    -    <!-- weightedWeight is mandatory except if dataEmpty -->
    37 
    -    <field-validator type="mandatory" short-circuit="true">
    38 
    -      <param name="skip"><![CDATA[ dataEmpty ]]></param>
    39 
    -      <message/>
    40 
    -    </field-validator>
    41 
    -
    42 
    -    <!-- weightedWeight is a positive number -->
    36 
    +    <!-- weightedWeight is a strictly positive number -->
    43 37 
         <field-validator type="positiveNumber">
    38 
    +      <param name="strict">true</param>
    44 39 
           <message/>
    45 40 
         </field-validator>
    46 41 
       </field>

  • server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-create-warning.xml
    ... ... @@ -31,11 +31,4 @@
    31 31 
         </field-validator>
    32 32 
       </field>
    33 33
    34 
    -  <field name="weightedWeight">
    35 
    -    <!-- the hole data is empty -->
    36 
    -    <field-validator type="dataEmpty" short-circuit="true">
    37 
    -      <message/>
    38 
    -    </field-validator>
    39 
    -  </field>
    40 
    -
    41 34 
     </validators>

  • server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-create.json
    ... ... @@ -9,11 +9,7 @@
    9 9 
       },
    10 10 
       "weightedWeight": {
    11 11 
         "errors": [
    12 
    -      "weightedWeight is mandatory except if dataEmpty",
    13 
    -      "weightedWeight is a positive number"
    14 
    -    ],
    15 
    -    "warnings": [
    16 
    -      "the hole data is empty"
    12 
    +      "weightedWeight is a strictly positive number"
    17 13 
         ]
    18 14 
       }
    19 15 
     }
    \ No newline at end of file

  • server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-update-error.xml
    ... ... @@ -33,14 +33,9 @@
    33 33 
       </field>
    34 34
    35 35 
       <field name="weightedWeight">
    36 
    -    <!-- weightedWeight is mandatory except if dataEmpty -->
    37 
    -    <field-validator type="mandatory" short-circuit="true">
    38 
    -      <param name="skip"><![CDATA[ dataEmpty ]]></param>
    39 
    -      <message/>
    40 
    -    </field-validator>
    41 
    -
    42 
    -    <!-- weightedWeight is a positive number -->
    36 
    +    <!-- weightedWeight is a strictly positive number -->
    43 37 
         <field-validator type="positiveNumber">
    38 
    +      <param name="strict">true</param>
    44 39 
           <message/>
    45 40 
         </field-validator>
    46 41 
       </field>

  • server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-update-warning.xml
    ... ... @@ -31,11 +31,4 @@
    31 31 
         </field-validator>
    32 32 
       </field>
    33 33
    34 
    -  <field name="weightedWeight">
    35 
    -    <!-- the hole data is empty -->
    36 
    -    <field-validator type="dataEmpty" short-circuit="true">
    37 
    -      <message/>
    38 
    -    </field-validator>
    39 
    -  </field>
    40 
    -
    41 34 
     </validators>

  • server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-update.json
    ... ... @@ -9,11 +9,7 @@
    9 9 
       },
    10 10 
       "weightedWeight": {
    11 11 
         "errors": [
    12 
    -      "weightedWeight is mandatory except if dataEmpty",
    13 
    -      "weightedWeight is a positive number"
    14 
    -    ],
    15 
    -    "warnings": [
    16 
    -      "the hole data is empty"
    12 
    +      "weightedWeight is a strictly positive number"
    17 13 
         ]
    18 14 
       }
    19 15 
     }
    \ No newline at end of file

  • tests/test/src/main/resources/fixtures/referential/ps/common/WeightCategory/content.json
    ... ... @@ -2,7 +2,7 @@
    2 2 
       "topiaId": "fr.ird.referential.ps.common.WeightCategory#1464000000000#001",
    3 3 
       "topiaCreateDate": "2021-09-17T00:00:00.000Z",
    4 4 
       "lastUpdateDate": "2021-09-17T00:00:00.000Z",
    5 
    -  "code": "L-1-1",
    5 
    +  "code": "L-YFT-1",
    6 6 
       "needComment": false,
    7 7 
       "status": "enabled",
    8 8 
       "label1": "[SOVETCO: Albacore -10] - [STARKIST: Yellowfin R1 + R2+ R3]",

  • tests/test/src/main/resources/fixtures/referential/ps/common/WeightCategory/create.json
    1 1 
     {
    2 
    -  "code": "L-1-1",
    2 
    +  "code": "L-YFT-1",
    3 3 
       "needComment": false,
    4 4 
       "status": "enabled",
    5 5 
       "label1": "[SOVETCO: Albacore -10] - [STARKIST: Yellowfin R1 + R2+ R3]",

    • —
    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.