Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
fc84cb80
by tchemit at 2019-07-23T13:08:19Z
2 changed files:
- validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SamplePartLogbookDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SamplePartLogbookDto-update-warning-validation.xml
Changes:
| ... | ... | @@ -74,6 +74,16 @@ |
| 74 | 74 |
<message>observe.validation.targetLength.positive.length</message>
|
| 75 | 75 |
</field-validator>
|
| 76 | 76 |
|
| 77 |
+ <!-- validation de la taille par borne -->
|
|
| 78 |
+ <field-validator type="species_lengthDto">
|
|
| 79 |
+ <param name="ratio">1.0</param>
|
|
| 80 |
+ <param name="enable">true</param>
|
|
| 81 |
+ <param name="expression">
|
|
| 82 |
+ <![CDATA[ species != null && length != null ]]>
|
|
| 83 |
+ </param>
|
|
| 84 |
+ <message>observe.validation.targetLength.bound.length##${min}##${max}</message>
|
|
| 85 |
+ </field-validator>
|
|
| 86 |
+ |
|
| 77 | 87 |
</field>
|
| 78 | 88 |
|
| 79 | 89 |
<field name="weight">
|
| ... | ... | @@ -23,22 +23,7 @@ |
| 23 | 23 |
"-//Apache Struts//XWork Validator 1.0.3//EN"
|
| 24 | 24 |
"http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
|
| 25 | 25 |
<validators>
|
| 26 |
- |
|
| 27 |
- <field name="length">
|
|
| 28 |
- |
|
| 29 |
- <!-- validation de la taille par borne -->
|
|
| 30 |
- <field-validator type="species_lengthDto">
|
|
| 31 |
- <param name="ratio">1.0</param>
|
|
| 32 |
- <param name="enable">true</param>
|
|
| 33 |
- <param name="expression">
|
|
| 34 |
- <![CDATA[ species != null && length != null ]]>
|
|
| 35 |
- </param>
|
|
| 36 |
- <message>observe.validation.targetLength.bound.length##${min}##${max}</message>
|
|
| 37 |
- </field-validator>
|
|
| 38 |
- |
|
| 39 |
- </field>
|
|
| 40 |
- |
|
| 41 |
- |
|
| 26 |
+
|
|
| 42 | 27 |
<field name="weight">
|
| 43 | 28 |
|
| 44 | 29 |
<!-- validation du weight par borne (uniquement pour mode saisie par individus) -->
|