Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: fe8162d9 by tchemit at 2020-02-13T12:12:37+01:00 [LL] Contrôle sur nombre de baskets trop limité - Closes #1433 - - - - - 2 changed files: - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-update-error-validation.xml Changes: ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-create-error-validation.xml ===================================== @@ -58,6 +58,30 @@ <message>observe.validation.setLongline.settingStartTimeStamp.before.settingEndTimeStamp</message> </field-validator> </field> + <field name="haulingStartTimeStamp"> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + <!-- settingEndTimeStamp < haulingStartTimeStamp --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndTimeStamp == null || settingEndTimeStamp.time < haulingStartTimeStamp.time ]]> + </param> + <message>observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp</message> + </field-validator> + </field> + <field name="haulingEndTimeStamp"> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + <!-- haulingStartTimeStamp < haulingEndTimeStamp --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartTimeStamp == null || haulingStartTimeStamp.time < haulingEndTimeStamp.time ]]> + </param> + <message>observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp</message> + </field-validator> + </field> <field name="settingVesselSpeed"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> @@ -100,41 +124,6 @@ <message/> </field-validator> </field> - <field name="haulingStartTimeStamp"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> - - <!-- settingEndTimeStamp < haulingStartTimeStamp --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ settingEndTimeStamp == null || settingEndTimeStamp.time < haulingStartTimeStamp.time ]]> - </param> - <message>observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp</message> - </field-validator> - </field> - <field name="haulingEndTimeStamp"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> - - <!-- haulingStartTimeStamp < haulingEndTimeStamp --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ haulingStartTimeStamp == null || haulingStartTimeStamp.time < haulingEndTimeStamp.time ]]> - </param> - <message>observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp</message> - </field-validator> - </field> - <field name="settingStartQuadrant"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> - <field-validator type="quadrantDto" short-circuit="true"> - <param name="ocean">currentTripLongline.ocean</param> - <message/> - </field-validator> - </field> <field name="settingStartLatitude"> <field-validator type="mandatory" short-circuit="true"> <message/> @@ -153,7 +142,7 @@ <message/> </field-validator> </field> - <field name="settingEndQuadrant"> + <field name="settingStartQuadrant"> <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> @@ -180,7 +169,7 @@ <message/> </field-validator> </field> - <field name="haulingStartQuadrant"> + <field name="settingEndQuadrant"> <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> @@ -207,7 +196,7 @@ <message/> </field-validator> </field> - <field name="haulingEndQuadrant"> + <field name="haulingStartQuadrant"> <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> @@ -234,6 +223,15 @@ <message/> </field-validator> </field> + <field name="haulingEndQuadrant"> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> + <message/> + </field-validator> + </field> <field name="totalSectionsCount"> <field-validator type="mandatory" short-circuit="true"> <message/> @@ -267,7 +265,7 @@ <field name="totalBasketsCount"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> - <param name="max">100.0</param> + <param name="max">400.0</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-update-error-validation.xml ===================================== @@ -49,6 +49,7 @@ <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> + <!-- settingStartTimeStamp < settingEndTimeStamp --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> @@ -264,7 +265,7 @@ <field name="totalBasketsCount"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> - <param name="max">1000.0</param> + <param name="max">400.0</param> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fe8162d94548348ffddf21f80e... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fe8162d94548348ffddf21f80e... You're receiving this email because of your account on gitlab.com.