Tony CHEMIT pushed to branch feature/issue-2594 at ultreiaio / ird-observe

Commits:

8 changed files:

Changes:

  • core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json
    ... ... @@ -14664,7 +14664,7 @@
    14664 14664 
             "comments": [
    14665 14665 
               "check species weight bound on meanWeight if $o.meanWeight != null",
    14666 14666 
               "meanWeight is a positive number",
    14667 
    -          "meanWeight is mandatory except if $o.totalWeight !=null && $o.totalWeight > 0"
    14667 
    +          "meanWeight is mandatory except if $o.totalWeight != null && $o.totalWeight > 0"
    14668 14668 
             ]
    14669 14669 
           },
    14670 14670 
           {
    ... ... @@ -14678,7 +14678,7 @@
    14678 14678 
             "name": "totalWeight",
    14679 14679 
             "comments": [
    14680 14680 
               "totalWeight is a positive number",
    14681 
    -          "totalWeight is mandatory except if $o.meanWeight !=null && $o.meanWeight > 0"
    14681 
    +          "totalWeight is mandatory except if $o.meanWeight != null && $o.meanWeight > 0"
    14682 14682 
             ]
    14683 14683 
           },
    14684 14684 
           {
    ... ... @@ -14724,7 +14724,7 @@
    14724 14724 
             "comments": [
    14725 14725 
               "check species weight bound on meanWeight if $o.meanWeight != null",
    14726 14726 
               "meanWeight is a positive number",
    14727 
    -          "meanWeight is mandatory except if $o.totalWeight !=null && $o.totalWeight > 0"
    14727 
    +          "meanWeight is mandatory except if $o.totalWeight != null && $o.totalWeight > 0"
    14728 14728 
             ]
    14729 14729 
           },
    14730 14730 
           {
    ... ... @@ -14738,7 +14738,7 @@
    14738 14738 
             "name": "totalWeight",
    14739 14739 
             "comments": [
    14740 14740 
               "totalWeight is a positive number",
    14741 
    -          "totalWeight is mandatory except if $o.meanWeight !=null && $o.meanWeight > 0"
    14741 
    +          "totalWeight is mandatory except if $o.meanWeight != null && $o.meanWeight > 0"
    14742 14742 
             ]
    14743 14743 
           },
    14744 14744 
           {

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SchoolEstimateDto-create-error-validation.json
    ... ... @@ -8,9 +8,9 @@
    8 8 
       "meanWeight": [
    9 9 
         {
    10 10 
           "validator": "fr.ird.observe.validation.validator.MandatoryFieldValidator",
    11 
    -      "comment": "meanWeight is mandatory except if $o.totalWeight !=null && $o.totalWeight > 0",
    11 
    +      "comment": "meanWeight is mandatory except if $o.totalWeight != null && $o.totalWeight > 0",
    12 12 
           "parameters": {
    13 
    -        "skip": "$o.totalWeight !=null && $o.totalWeight > 0"
    13 
    +        "skip": "$o.totalWeight != null && $o.totalWeight > 0"
    14 14 
           },
    15 15 
           "message": "observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required"
    16 16 
         },
    ... ... @@ -41,9 +41,9 @@
    41 41 
       "totalWeight": [
    42 42 
         {
    43 43 
           "validator": "fr.ird.observe.validation.validator.MandatoryFieldValidator",
    44 
    -      "comment": "totalWeight is mandatory except if $o.meanWeight !=null && $o.meanWeight > 0",
    44 
    +      "comment": "totalWeight is mandatory except if $o.meanWeight != null && $o.meanWeight > 0",
    45 45 
           "parameters": {
    46 
    -        "skip": "$o.meanWeight !=null && $o.meanWeight > 0"
    46 
    +        "skip": "$o.meanWeight != null && $o.meanWeight > 0"
    47 47 
           },
    48 48 
           "message": "observe.data.ps.observation.SchoolEstimate.totalWeight.validation.required"
    49 49 
         },

  • core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SchoolEstimateDto-update-error-validation.json
    ... ... @@ -8,9 +8,9 @@
    8 8 
       "meanWeight": [
    9 9 
         {
    10 10 
           "validator": "fr.ird.observe.validation.validator.MandatoryFieldValidator",
    11 
    -      "comment": "meanWeight is mandatory except if $o.totalWeight !=null && $o.totalWeight > 0",
    11 
    +      "comment": "meanWeight is mandatory except if $o.totalWeight != null && $o.totalWeight > 0",
    12 12 
           "parameters": {
    13 
    -        "skip": "$o.totalWeight !=null && $o.totalWeight > 0"
    13 
    +        "skip": "$o.totalWeight != null && $o.totalWeight > 0"
    14 14 
           },
    15 15 
           "message": "observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required"
    16 16 
         },
    ... ... @@ -41,9 +41,9 @@
    41 41 
       "totalWeight": [
    42 42 
         {
    43 43 
           "validator": "fr.ird.observe.validation.validator.MandatoryFieldValidator",
    44 
    -      "comment": "totalWeight is mandatory except if $o.meanWeight !=null && $o.meanWeight > 0",
    44 
    +      "comment": "totalWeight is mandatory except if $o.meanWeight != null && $o.meanWeight > 0",
    45 45 
           "parameters": {
    46 
    -        "skip": "$o.meanWeight !=null && $o.meanWeight > 0"
    46 
    +        "skip": "$o.meanWeight != null && $o.meanWeight > 0"
    47 47 
           },
    48 48 
           "message": "observe.data.ps.observation.SchoolEstimate.totalWeight.validation.required"
    49 49 
         },

  • core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/SchoolEstimate/validation-create.json
    ... ... @@ -8,7 +8,7 @@
    8 8 
         "errors": [
    9 9 
           "check species weight bound on meanWeight if meanWeight != null",
    10 10 
           "meanWeight is a positive number",
    11 
    -      "meanWeight is mandatory except if totalWeight !=null && totalWeight > 0"
    11 
    +      "meanWeight is mandatory except if totalWeight != null && totalWeight > 0"
    12 12 
         ]
    13 13 
       },
    14 14 
       "species": {
    ... ... @@ -23,7 +23,7 @@
    23 23 
       "totalWeight": {
    24 24 
         "errors": [
    25 25 
           "totalWeight is a positive number",
    26 
    -      "totalWeight is mandatory except if meanWeight !=null && meanWeight > 0"
    26 
    +      "totalWeight is mandatory except if meanWeight != null && meanWeight > 0"
    27 27 
         ]
    28 28 
       },
    29 29 
       "weightMeasureMethod": {

  • core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/SchoolEstimate/validation-update.json
    ... ... @@ -8,7 +8,7 @@
    8 8 
         "errors": [
    9 9 
           "check species weight bound on meanWeight if meanWeight != null",
    10 10 
           "meanWeight is a positive number",
    11 
    -      "meanWeight is mandatory except if totalWeight !=null && totalWeight > 0"
    11 
    +      "meanWeight is mandatory except if totalWeight != null && totalWeight > 0"
    12 12 
         ]
    13 13 
       },
    14 14 
       "species": {
    ... ... @@ -23,7 +23,7 @@
    23 23 
       "totalWeight": {
    24 24 
         "errors": [
    25 25 
           "totalWeight is a positive number",
    26 
    -      "totalWeight is mandatory except if meanWeight !=null && meanWeight > 0"
    26 
    +      "totalWeight is mandatory except if meanWeight != null && meanWeight > 0"
    27 27 
         ]
    28 28 
       },
    29 29 
       "weightMeasureMethod": {

  • model/src/main/models/Observe/dto/attribute/notNullIf.properties
    ... ... @@ -58,5 +58,5 @@ data.ps.observation.Catch.attribute.catchWeight=$o.totalCount != null
    58 58 
     data.ps.observation.Catch.attribute.totalCount=$o.catchWeight != null
    59 59 
     data.ps.observation.SampleMeasure.attribute.length=$o.acquisitionMode == 1 && $o.weight != null
    60 60 
     data.ps.observation.SampleMeasure.attribute.weight=$o.acquisitionMode == 0 || $o.length != null
    61 
    -data.ps.observation.SchoolEstimate.attribute.meanWeight=$o.totalWeight !=null && $o.totalWeight > 0
    62 
    -data.ps.observation.SchoolEstimate.attribute.totalWeight=$o.meanWeight !=null && $o.meanWeight > 0
    61 
    +data.ps.observation.SchoolEstimate.attribute.meanWeight=$o.totalWeight != null && $o.totalWeight > 0
    62 
    +data.ps.observation.SchoolEstimate.attribute.totalWeight=$o.meanWeight != null && $o.meanWeight > 0

  • server/runner/src/main/webResources/doc/api/public/data/ps/observation/SchoolEstimate/validation-create.json
    ... ... @@ -8,7 +8,7 @@
    8 8 
         "errors": [
    9 9 
           "check species weight bound on meanWeight if meanWeight != null",
    10 10 
           "meanWeight is a positive number",
    11 
    -      "meanWeight is mandatory except if totalWeight !=null && totalWeight > 0"
    11 
    +      "meanWeight is mandatory except if totalWeight != null && totalWeight > 0"
    12 12 
         ]
    13 13 
       },
    14 14 
       "species": {
    ... ... @@ -23,7 +23,7 @@
    23 23 
       "totalWeight": {
    24 24 
         "errors": [
    25 25 
           "totalWeight is a positive number",
    26 
    -      "totalWeight is mandatory except if meanWeight !=null && meanWeight > 0"
    26 
    +      "totalWeight is mandatory except if meanWeight != null && meanWeight > 0"
    27 27 
         ]
    28 28 
       },
    29 29 
       "weightMeasureMethod": {

  • server/runner/src/main/webResources/doc/api/public/data/ps/observation/SchoolEstimate/validation-update.json
    ... ... @@ -8,7 +8,7 @@
    8 8 
         "errors": [
    9 9 
           "check species weight bound on meanWeight if meanWeight != null",
    10 10 
           "meanWeight is a positive number",
    11 
    -      "meanWeight is mandatory except if totalWeight !=null && totalWeight > 0"
    11 
    +      "meanWeight is mandatory except if totalWeight != null && totalWeight > 0"
    12 12 
         ]
    13 13 
       },
    14 14 
       "species": {
    ... ... @@ -23,7 +23,7 @@
    23 23 
       "totalWeight": {
    24 24 
         "errors": [
    25 25 
           "totalWeight is a positive number",
    26 
    -      "totalWeight is mandatory except if meanWeight !=null && meanWeight > 0"
    26 
    +      "totalWeight is mandatory except if meanWeight != null && meanWeight > 0"
    27 27 
         ]
    28 28 
       },
    29 29 
       "weightMeasureMethod": {

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