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

Commits:

11 changed files:

Changes:

  • services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java
    ... ... @@ -686,16 +686,14 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements
    686 686
    687 687 
                 // on doit effectuer une conversion taille - taille avant de convertir en poids
    688 688 
                 Optional<LengthLengthParameter> optionalLengthLengthParameter = activityContext.findLengthLengthParameter(species, sex, inputSizeMeasureType, outputSizeMeasureType);
    689 
    -            if (optionalLengthLengthParameter == null) {
    689 
    +            if (optionalLengthLengthParameter.isPresent()) {
    690 
    +                length = optionalLengthLengthParameter.get().computeFromFormulaOne(length);
    691 
    +            } else {
    690 692
    691 693 
                     if (log.isWarnEnabled()) {
    692 694 
                         log.warn("Could not find lengLengthParameter for input: " + inputSizeMeasureType + " - output: " + outputSizeMeasureType);
    693 695 
                     }
    694 696 
                     return;
    695 
    -            } else {
    696 
    -
    697 
    -                length = optionalLengthLengthParameter.get().computeFromFormulaOne(length);
    698 
    -
    699 697 
                 }
    700 698 
             }
    701 699

  • validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-error-validation.xml
    ... ... @@ -42,6 +42,11 @@
    42 42 
       </field>
    43 43
    44 44 
       <field name="ocean">
    45 
    +    <!-- pas de ocean selectionne -->
    46 
    +    <field-validator type="required" short-circuit="true">
    47 
    +      <message>observe.validation.lengthLengthParameter.null.ocean</message>
    48 
    +    </field-validator>
    49 
    +
    45 50 
         <!-- clef unique species - gender - ocean - startDate -->
    46 51 
         <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true">
    47 52 
           <param name="collectionFieldName">editingReferentielList</param>
    ... ... @@ -52,6 +57,11 @@
    52 57 
       </field>
    53 58
    54 59 
       <field name="sex">
    60 
    +    <!-- pas de sex selectionne -->
    61 
    +    <field-validator type="required" short-circuit="true">
    62 
    +      <message>observe.validation.lengthLengthParameter.null.sex</message>
    63 
    +    </field-validator>
    64 
    +
    55 65 
         <!-- clef unique species - gender - ocean - startDate -->
    56 66 
         <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true">
    57 67 
           <param name="collectionFieldName">editingReferentielList</param>
    ... ... @@ -73,6 +83,11 @@
    73 83
    74 84 
       <field name="inputSizeMeasureType">
    75 85
    86 
    +    <!-- pas de inputSizeMeasureType selectionne -->
    87 
    +    <field-validator type="required" short-circuit="true">
    88 
    +      <message>observe.validation.lengthLengthParameter.null.inputSizeMeasureType</message>
    89 
    +    </field-validator>
    90 
    +
    76 91 
         <!-- intputSizeMeasureType desactive -->
    77 92 
         <field-validator type="fieldexpression">
    78 93 
           <param name="expression">
    ... ... @@ -85,6 +100,11 @@
    85 100
    86 101 
       <field name="outputSizeMeasureType">
    87 102
    103 
    +    <!-- pas de outputSizeMeasureType selectionne -->
    104 
    +    <field-validator type="required" short-circuit="true">
    105 
    +      <message>observe.validation.lengthLengthParameter.null.outputSizeMeasureType</message>
    106 
    +    </field-validator>
    107 
    +
    88 108 
         <!-- outputSizeMeasureType desactive -->
    89 109 
         <field-validator type="fieldexpression">
    90 110 
           <param name="expression">

  • validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-warning-validation.xml
    ... ... @@ -43,27 +43,6 @@
    43 43 
         </field-validator>
    44 44 
       </field>
    45 45
    46 
    -  <field name="inputSizeMeasureType">
    47 
    -    <!-- pas de inputSizeMeasureType renseigne -->
    48 
    -    <field-validator type="required">
    49 
    -      <message>observe.validation.lengthLengthParameter.null.inputSizeMeasureType</message>
    50 
    -    </field-validator>
    51 
    -  </field>
    52 
    -
    53 
    -  <field name="outputSizeMeasureType">
    54 
    -    <!-- pas de outputSizeMeasureType renseigne -->
    55 
    -    <field-validator type="required">
    56 
    -      <message>observe.validation.lengthLengthParameter.null.outputSizeMeasureType</message>
    57 
    -    </field-validator>
    58 
    -  </field>
    59 
    -
    60 
    -  <field name="ocean">
    61 
    -    <!-- pas de ocean renseigne -->
    62 
    -    <field-validator type="required">
    63 
    -      <message>observe.validation.lengthWeightParameter.null.ocean</message>
    64 
    -    </field-validator>
    65 
    -  </field>
    66 
    -
    67 46 
       <field name="startDate">
    68 47 
         <!-- pas de startDate renseigne -->
    69 48 
         <field-validator type="required">
    ... ... @@ -80,5 +59,4 @@
    80 59 
         </field-validator>
    81 60 
       </field>
    82 61
    83 
    -
    84 62 
     </validators>

  • validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-error-validation.xml
    ... ... @@ -41,6 +41,11 @@
    41 41 
       </field>
    42 42
    43 43 
       <field name="ocean">
    44 
    +    <!-- pas de ocean selectionne -->
    45 
    +    <field-validator type="required" short-circuit="true">
    46 
    +      <message>observe.validation.lengthLengthParameter.null.ocean</message>
    47 
    +    </field-validator>
    48 
    +
    44 49 
         <!-- clef unique species - gender - ocean - startDate -->
    45 50 
         <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true">
    46 51 
           <param name="collectionFieldName">editingReferentielList</param>
    ... ... @@ -53,7 +58,7 @@
    53 58 
       <field name="sex">
    54 59 
         <!-- pas de sex selectionne -->
    55 60 
         <field-validator type="required" short-circuit="true">
    56 
    -      <message>observe.validation.lengthLengthParameter.required.sex</message>
    61 
    +      <message>observe.validation.lengthLengthParameter.null.sex</message>
    57 62 
         </field-validator>
    58 63
    59 64 
         <!-- clef unique species - gender - ocean - startDate -->
    ... ... @@ -74,6 +79,38 @@
    74 79 
         </field-validator>
    75 80 
       </field>
    76 81
    82 
    +  <field name="inputSizeMeasureType">
    83 
    +
    84 
    +    <!-- pas de inputSizeMeasureType selectionne -->
    85 
    +    <field-validator type="required" short-circuit="true">
    86 
    +      <message>observe.validation.lengthLengthParameter.null.inputSizeMeasureType</message>
    87 
    +    </field-validator>
    88 
    +
    89 
    +    <!-- intputSizeMeasureType desactive -->
    90 
    +    <field-validator type="fieldexpression">
    91 
    +      <param name="expression">
    92 
    +        <![CDATA[ intputSizeMeasureType == null || intputSizeMeasureType.enabled ]]>
    93 
    +      </param>
    94 
    +      <message>observe.validation.lengthLengthParameter.disabled.inputSizeMeasureType</message>
    95 
    +    </field-validator>
    96 
    +  </field>
    97 
    +
    98 
    +
    99 
    +  <field name="outputSizeMeasureType">
    100 
    +
    101 
    +    <!-- pas de outputSizeMeasureType selectionne -->
    102 
    +    <field-validator type="required" short-circuit="true">
    103 
    +      <message>observe.validation.lengthLengthParameter.null.outputSizeMeasureType</message>
    104 
    +    </field-validator>
    105 
    +
    106 
    +    <!-- outputSizeMeasureType desactive -->
    107 
    +    <field-validator type="fieldexpression">
    108 
    +      <param name="expression">
    109 
    +        <![CDATA[ outputSizeMeasureType == null || outputSizeMeasureType.enabled ]]>
    110 
    +      </param>
    111 
    +      <message>observe.validation.lengthLengthParameter.disabled.inputSizeMeasureType</message>
    112 
    +    </field-validator>
    113 
    +  </field>
    77 114
    78 115 
       <field name="inputOutputFormula">
    79 116 
         <!-- pas de relation inputOutputFormula renseignee -->

  • validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-warning-validation.xml
    ... ... @@ -59,5 +59,4 @@
    59 59 
         </field-validator>
    60 60 
       </field>
    61 61
    62 
    -
    63 62 
     </validators>

  • validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-error-validation.xml
    ... ... @@ -41,18 +41,12 @@
    41 41 
         </field-validator>
    42 42 
       </field>
    43 43
    44 
    -  <field name="sizeMeasureType">
    45 
    -
    46 
    -    <!-- sizeMeasureType desactive -->
    47 
    -    <field-validator type="fieldexpression">
    48 
    -      <param name="expression">
    49 
    -        <![CDATA[ sizeMeasureType == null || sizeMeasureType.enabled ]]>
    50 
    -      </param>
    51 
    -      <message>observe.validation.lengthWeightParameter.disabled.sizeMeasureType</message>
    44 
    +  <field name="ocean">
    45 
    +    <!-- pas de ocean selectionne -->
    46 
    +    <field-validator type="required" short-circuit="true">
    47 
    +      <message>observe.validation.lengthWeightParameter.null.ocean</message>
    52 48 
         </field-validator>
    53 
    -  </field>
    54 49
    55 
    -  <field name="ocean">
    56 50 
         <!-- clef unique species - gender - ocean - startDate -->
    57 51 
         <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true">
    58 52 
           <param name="collectionFieldName">editingReferentielList</param>
    ... ... @@ -63,6 +57,11 @@
    63 57 
       </field>
    64 58
    65 59 
       <field name="sex">
    60 
    +    <!-- pas de sex selectionne -->
    61 
    +    <field-validator type="required" short-circuit="true">
    62 
    +      <message>observe.validation.lengthWeightParameter.null.sex</message>
    63 
    +    </field-validator>
    64 
    +
    66 65 
         <!-- clef unique species - gender - ocean - startDate -->
    67 66 
         <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true">
    68 67 
           <param name="collectionFieldName">editingReferentielList</param>
    ... ... @@ -82,6 +81,21 @@
    82 81 
         </field-validator>
    83 82 
       </field>
    84 83
    84 
    +  <field name="sizeMeasureType">
    85 
    +    <!-- pas de sizeMeasureType renseigne -->
    86 
    +    <field-validator type="required">
    87 
    +      <message>observe.validation.lengthWeightParameter.null.sizeMeasureType</message>
    88 
    +    </field-validator>
    89 
    +
    90 
    +    <!-- sizeMeasureType desactive -->
    91 
    +    <field-validator type="fieldexpression">
    92 
    +      <param name="expression">
    93 
    +        <![CDATA[ sizeMeasureType == null || sizeMeasureType.enabled ]]>
    94 
    +      </param>
    95 
    +      <message>observe.validation.lengthWeightParameter.disabled.sizeMeasureType</message>
    96 
    +    </field-validator>
    97 
    +  </field>
    98 
    +
    85 99 
       <field name="lengthWeightFormula">
    86 100 
         <!-- pas de relation weight renseignee -->
    87 101 
         <field-validator type="requiredstring" short-circuit="true">

  • validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-warning-validation.xml
    ... ... @@ -43,21 +43,6 @@
    43 43 
         </field-validator>
    44 44 
       </field>
    45 45
    46 
    -  <field name="ocean">
    47 
    -    <!-- pas de ocean renseigne -->
    48 
    -    <field-validator type="required">
    49 
    -      <message>observe.validation.lengthWeightParameter.null.ocean</message>
    50 
    -    </field-validator>
    51 
    -  </field>
    52 
    -
    53 
    -  <field name="sizeMeasureType">
    54 
    -    <!-- pas de sizeMeasureType renseigne -->
    55 
    -    <field-validator type="required">
    56 
    -      <message>observe.validation.lengthWeightParameter.null.sizeMeasureType</message>
    57 
    -    </field-validator>
    58 
    -  </field>
    59 
    -
    60 
    -
    61 46 
       <field name="startDate">
    62 47 
         <!-- pas de startDate renseigne -->
    63 48 
         <field-validator type="required">

  • validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-update-error-validation.xml
    ... ... @@ -51,6 +51,11 @@
    51 51 
       </field>
    52 52
    53 53 
       <field name="ocean">
    54 
    +    <!-- pas de ocean renseigne -->
    55 
    +    <field-validator type="required">
    56 
    +      <message>observe.validation.lengthWeightParameter.null.ocean</message>
    57 
    +    </field-validator>
    58 
    +
    54 59 
         <!-- clef unique species - gender - ocean - startDate -->
    55 60 
         <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true">
    56 61 
           <param name="collectionFieldName">editingReferentielList</param>
    ... ... @@ -61,6 +66,11 @@
    61 66 
       </field>
    62 67
    63 68 
       <field name="sex">
    69 
    +    <!-- pas de sex selectionne -->
    70 
    +    <field-validator type="required" short-circuit="true">
    71 
    +      <message>observe.validation.lengthWeightParameter.null.sex</message>
    72 
    +    </field-validator>
    73 
    +
    64 74 
         <!-- clef unique species - gender - ocean - startDate -->
    65 75 
         <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true">
    66 76 
           <param name="collectionFieldName">editingReferentielList</param>
    ... ... @@ -80,6 +90,21 @@
    80 90 
         </field-validator>
    81 91 
       </field>
    82 92
    93 
    +  <field name="sizeMeasureType">
    94 
    +    <!-- pas de sizeMeasureType renseigne -->
    95 
    +    <field-validator type="required">
    96 
    +      <message>observe.validation.lengthWeightParameter.null.sizeMeasureType</message>
    97 
    +    </field-validator>
    98 
    +
    99 
    +    <!-- sizeMeasureType desactive -->
    100 
    +    <field-validator type="fieldexpression">
    101 
    +      <param name="expression">
    102 
    +        <![CDATA[ sizeMeasureType == null || sizeMeasureType.enabled ]]>
    103 
    +      </param>
    104 
    +      <message>observe.validation.lengthWeightParameter.disabled.sizeMeasureType</message>
    105 
    +    </field-validator>
    106 
    +  </field>
    107 
    +
    83 108 
       <field name="lengthWeightFormula">
    84 109 
         <!-- pas de relation weight renseignee -->
    85 110 
         <field-validator type="requiredstring" short-circuit="true">

  • validation/src/main/resources/i18n/validation_en_GB.properties
    ... ... @@ -458,6 +458,7 @@ observe.validation.lengthLengthParameter.invalid.uniqueKey=Tuple (gender/ocean/s
    458 458 
     observe.validation.lengthLengthParameter.null.inputSizeMeasureType=Input size measure type is not filled.
    459 459 
     observe.validation.lengthLengthParameter.null.ocean=Ocean is not filled.
    460 460 
     observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Output size measure type is not filled.
    461 
    +observe.validation.lengthLengthParameter.null.sex=Sex must be filled.
    461 462 
     observe.validation.lengthLengthParameter.required.coefficients=Coefficients are required.
    462 463 
     observe.validation.lengthLengthParameter.required.endDate=End date must be filled.
    463 464 
     observe.validation.lengthLengthParameter.required.inputOutputFormula=Formula is required.

  • validation/src/main/resources/i18n/validation_es_ES.properties
    ... ... @@ -460,6 +460,7 @@ observe.validation.lengthLengthParameter.invalid.uniqueKey=Tupla (sexo/océano/e
    460 460 
     observe.validation.lengthLengthParameter.null.inputSizeMeasureType=Le type de mensuration d'entrée n'est pas renseigné. \#TODO
    461 461 
     observe.validation.lengthLengthParameter.null.ocean=No se ha seleccionado oceano.
    462 462 
     observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. \#TODO
    463 
    +observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. \#TODO
    463 464 
     observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. \#TODO
    464 465 
     observe.validation.lengthLengthParameter.required.endDate=Fecha de fin de validez debe ser especificada.
    465 466 
     observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. \#TODO

  • validation/src/main/resources/i18n/validation_fr_FR.properties
    ... ... @@ -458,6 +458,7 @@ observe.validation.lengthLengthParameter.invalid.uniqueKey=Le tuple (sexe/océan
    458 458 
     observe.validation.lengthLengthParameter.null.inputSizeMeasureType=Le type de mensuration d'entrée n'est pas renseigné.
    459 459 
     observe.validation.lengthLengthParameter.null.ocean=Aucun océan sélectionné.
    460 460 
     observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné.
    461 
    +observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné.
    461 462 
     observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires.
    462 463 
     observe.validation.lengthLengthParameter.required.endDate=Date de fin de validité non renseignée.
    463 464 
     observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire.

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