Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 803fa23f by tchemit at 2019-02-20T09:57:10Z [LL] Composition globale : non contrôle de la somme des proportions - Closes #1236 - - - - - 6 changed files: - pom.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-baitsComposition-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-branchlinesComposition-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-floatlinesComposition-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-hooksComposition-error-validation.xml - validation/src/main/resources/validators.xml Changes: ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.16</observeToolkitVersion> + <observeToolkitVersion>3.7.17</observeToolkitVersion> <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>--> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>--> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-baitsComposition-error-validation.xml ===================================== @@ -31,9 +31,7 @@ </field-validator> </field> <field name="baitsCompositionProportionSum"> - <field-validator type="boundNumber" short-circuit="true"> - <param name="min">0.0</param> - <param name="max">100.0</param> + <field-validator type="proportionTotal" short-circuit="true"> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-branchlinesComposition-error-validation.xml ===================================== @@ -31,9 +31,7 @@ </field-validator> </field> <field name="branchlinesCompositionProportionSum"> - <field-validator type="boundNumber" short-circuit="true"> - <param name="min">0.0</param> - <param name="max">100.0</param> + <field-validator type="proportionTotal" short-circuit="true"> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-floatlinesComposition-error-validation.xml ===================================== @@ -31,9 +31,7 @@ </field-validator> </field> <field name="floatlinesCompositionProportionSum"> - <field-validator type="boundNumber" short-circuit="true"> - <param name="min">0.0</param> - <param name="max">100.0</param> + <field-validator type="proportionTotal" short-circuit="true"> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-hooksComposition-error-validation.xml ===================================== @@ -31,9 +31,7 @@ </field-validator> </field> <field name="hooksCompositionProportionSum"> - <field-validator type="boundNumber" short-circuit="true"> - <param name="min">0.0</param> - <param name="max">100.0</param> + <field-validator type="proportionTotal" short-circuit="true"> <message/> </field-validator> </field> ===================================== validation/src/main/resources/validators.xml ===================================== @@ -60,6 +60,7 @@ <validator name="collectionNotFilled" class="fr.ird.observe.validation.validators.CollectionNotFilledFieldValidator"/> <validator name="positiveNumber" class="fr.ird.observe.validation.validators.PositiveNumberFieldValidator"/> <validator name="boundNumber" class="fr.ird.observe.validation.validators.BoundNumberFieldValidator"/> + <validator name="proportionTotal" class="fr.ird.observe.validation.validators.ProportionTotalFieldValidator"/> <validator name="referentialUniqueCode" class="fr.ird.observe.validation.validators.ReferentialUniqueCodeValidator"/> <validator name="referentialUniqueField" class="fr.ird.observe.validation.validators.ReferentialUniqueFieldValidator"/> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/803fa23f87bc46339372f15a2c51... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/803fa23f87bc46339372f15a2c51... You're receiving this email because of your account on gitlab.com.