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

Commits:

12 changed files:

Changes:

  • core/api/validation/src/main/filtered-resources/META-INF/validation/model-default.json
    ... ... @@ -5397,7 +5397,7 @@
    5397 5397 
           ],
    5398 5398 
           "measuredCount": [
    5399 5399 
             "measuredCount is mandatory",
    5400 
    -        "measuredCount equals sum of count on sampleSpeciesMeasure"
    5400 
    +        "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)"
    5401 5401 
           ],
    5402 5402 
           "sampleSpeciesMeasure": [
    5403 5403 
             "sampleSpeciesMeasure is a mandatory collection",
    ... ... @@ -5435,7 +5435,7 @@
    5435 5435 
           ],
    5436 5436 
           "measuredCount": [
    5437 5437 
             "measuredCount is mandatory",
    5438 
    -        "measuredCount equals sum of count on sampleSpeciesMeasure"
    5438 
    +        "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)"
    5439 5439 
           ],
    5440 5440 
           "sampleSpeciesMeasure": [
    5441 5441 
             "sampleSpeciesMeasure is a mandatory collection",

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/SampleSpeciesDto-create-error-validation.json
    ... ... @@ -32,8 +32,9 @@
    32 32 
         },
    33 33 
         {
    34 34 
           "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator",
    35 
    -      "comment": "measuredCount equals sum of count on sampleSpeciesMeasure",
    35 
    +      "comment": "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)",
    36 36 
           "parameters": {
    37 
    +        "skip": "$o.measuredCount == null",
    37 38 
             "expression": "$o.measuredCount == $o.sampleSpeciesMeasureTotalCount"
    38 39 
           },
    39 40 
           "message": "observe.data.ps.SampleSpecies.validation.mismatch.measuredCount##$o.measuredCount##$o.sampleSpeciesMeasureTotalCount"

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/SampleSpeciesDto-update-error-validation.json
    ... ... @@ -32,8 +32,9 @@
    32 32 
         },
    33 33 
         {
    34 34 
           "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator",
    35 
    -      "comment": "measuredCount equals sum of count on sampleSpeciesMeasure",
    35 
    +      "comment": "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)",
    36 36 
           "parameters": {
    37 
    +        "skip": "$o.measuredCount == null",
    37 38 
             "expression": "$o.measuredCount == $o.sampleSpeciesMeasureTotalCount"
    38 39 
           },
    39 40 
           "message": "observe.data.ps.SampleSpecies.validation.mismatch.measuredCount##$o.measuredCount##$o.sampleSpeciesMeasureTotalCount"

  • core/api/validation/src/main/validation/META-INF/validation/model-default.json
    ... ... @@ -378,7 +378,7 @@
    378 378 
         "context": "create",
    379 379 
         "ERROR": {
    380 380 
           "measuredCount": [
    381 
    -        "measuredCount equals sum of count on sampleSpeciesMeasure"
    381 
    +        "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)"
    382 382 
           ]
    383 383 
         }
    384 384 
       },
    ... ... @@ -387,7 +387,7 @@
    387 387 
         "context": "update",
    388 388 
         "ERROR": {
    389 389 
           "measuredCount": [
    390 
    -        "measuredCount equals sum of count on sampleSpeciesMeasure"
    390 
    +        "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)"
    391 391 
           ]
    392 392 
         }
    393 393 
       },

  • core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/localmarket/SampleSpeciesDto-create-error-validation.json
    ... ... @@ -2,8 +2,9 @@
    2 2 
       "measuredCount": [
    3 3 
         {
    4 4 
           "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator",
    5 
    -      "comment": "measuredCount equals sum of count on sampleSpeciesMeasure",
    5 
    +      "comment": "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)",
    6 6 
           "parameters": {
    7 
    +        "skip": "$o.measuredCount == null",
    7 8 
             "expression": "$o.measuredCount == $o.sampleSpeciesMeasureTotalCount"
    8 9 
           },
    9 10 
           "message": "observe.data.ps.SampleSpecies.validation.mismatch.measuredCount##$o.measuredCount##$o.sampleSpeciesMeasureTotalCount"

  • core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/localmarket/SampleSpeciesDto-update-error-validation.json
    ... ... @@ -2,8 +2,9 @@
    2 2 
       "measuredCount": [
    3 3 
         {
    4 4 
           "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator",
    5 
    -      "comment": "measuredCount equals sum of count on sampleSpeciesMeasure",
    5 
    +      "comment": "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)",
    6 6 
           "parameters": {
    7 
    +        "skip": "$o.measuredCount == null",
    7 8 
             "expression": "$o.measuredCount == $o.sampleSpeciesMeasureTotalCount"
    8 9 
           },
    9 10 
           "message": "observe.data.ps.SampleSpecies.validation.mismatch.measuredCount##$o.measuredCount##$o.sampleSpeciesMeasureTotalCount"

  • core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/SampleSpecies/validation-create.json
    ... ... @@ -13,7 +13,7 @@
    13 13 
       },
    14 14 
       "measuredCount": {
    15 15 
         "errors": [
    16 
    -      "measuredCount equals sum of count on sampleSpeciesMeasure",
    16 
    +      "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)",
    17 17 
           "measuredCount is mandatory"
    18 18 
         ]
    19 19 
       },

  • core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/SampleSpecies/validation-update.json
    ... ... @@ -13,7 +13,7 @@
    13 13 
       },
    14 14 
       "measuredCount": {
    15 15 
         "errors": [
    16 
    -      "measuredCount equals sum of count on sampleSpeciesMeasure",
    16 
    +      "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)",
    17 17 
           "measuredCount is mandatory"
    18 18 
         ]
    19 19 
       },

  • server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SampleSpecies/validation-create-error.json
    ... ... @@ -32,8 +32,9 @@
    32 32 
         },
    33 33 
         {
    34 34 
           "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator",
    35 
    -      "comment": "measuredCount equals sum of count on sampleSpeciesMeasure",
    35 
    +      "comment": "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)",
    36 36 
           "parameters": {
    37 
    +        "skip": "$o.measuredCount == null",
    37 38 
             "expression": "$o.measuredCount == $o.sampleSpeciesMeasureTotalCount"
    38 39 
           },
    39 40 
           "message": "observe.data.ps.SampleSpecies.validation.mismatch.measuredCount##$o.measuredCount##$o.sampleSpeciesMeasureTotalCount"

  • server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SampleSpecies/validation-create.json
    ... ... @@ -13,7 +13,7 @@
    13 13 
       },
    14 14 
       "measuredCount": {
    15 15 
         "errors": [
    16 
    -      "measuredCount equals sum of count on sampleSpeciesMeasure",
    16 
    +      "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)",
    17 17 
           "measuredCount is mandatory"
    18 18 
         ]
    19 19 
       },

  • server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SampleSpecies/validation-update-error.json
    ... ... @@ -32,8 +32,9 @@
    32 32 
         },
    33 33 
         {
    34 34 
           "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator",
    35 
    -      "comment": "measuredCount equals sum of count on sampleSpeciesMeasure",
    35 
    +      "comment": "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)",
    36 36 
           "parameters": {
    37 
    +        "skip": "$o.measuredCount == null",
    37 38 
             "expression": "$o.measuredCount == $o.sampleSpeciesMeasureTotalCount"
    38 39 
           },
    39 40 
           "message": "observe.data.ps.SampleSpecies.validation.mismatch.measuredCount##$o.measuredCount##$o.sampleSpeciesMeasureTotalCount"

  • server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/SampleSpecies/validation-update.json
    ... ... @@ -13,7 +13,7 @@
    13 13 
       },
    14 14 
       "measuredCount": {
    15 15 
         "errors": [
    16 
    -      "measuredCount equals sum of count on sampleSpeciesMeasure",
    16 
    +      "measuredCount equals sum of count on sampleSpeciesMeasure (except if measuredCount is null)",
    17 17 
           "measuredCount is mandatory"
    18 18 
         ]
    19 19 
       },

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