Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 991f39f4 by Tony CHEMIT at 2018-10-14T16:14:05Z Some data (in table forms) order is not deterministic - Closes #1112 - See #1144 - - - - - cf4ff6f4 by Tony CHEMIT at 2018-10-14T16:14:13Z [LL][PS] Améliorer le widget position - Closes #1133 - See #1144 - - - - - f0cc209f by Tony CHEMIT at 2018-10-14T16:14:19Z [LL][PS] Dans le widget liste déroulante d'espèces, après le code FAO et le non scientifique, ajouter le nom commun (vernaculaire) dans la langue courante - Closes #1131 - See #1144 - - - - - e99e032a by Tony CHEMIT at 2018-10-14T16:14:25Z fix coordinates validation message (and remove a lots of them \o/) (See #1144) - - - - - 9 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - persistence/src/main/models/Observe.model - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-update-error-validation.xml - 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 - validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss ===================================== @@ -41,6 +41,7 @@ DateTimeEditor { CoordinatesEditor { bean: {bean}; displayZeroWhenNull: true; + showGlobalResetButton:true; } NumberEditor { ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -626,7 +626,7 @@ public class DecoratorService extends DecoratorProvider { @Override public void initSpeciesDto() { registerDecorator(new SpeciesDecorator()); - registerReferentialReferenceDecorator(SpeciesReference.class, "${faoCode}$s##${scientificLabel}$s"); + registerReferentialReferenceDecorator(SpeciesReference.class, "${faoCode}$s##${scientificLabel}$s##${label}$s"); } @Override ===================================== persistence/src/main/models/Observe.model ===================================== @@ -72,10 +72,10 @@ latitude + {*:1} Float longitude + {*:1} Float seaSurfaceTemperature + {*:1} Float setLongline + {0..1} longline.SetLongline | dbName=set -encounter + {*} longline.Encounter | reverseDbName=activity +encounter + {*} longline.Encounter | reverseDbName=activity orderBy=topiaCreateDate vesselActivityLongline {*:1} referentiel.longline.VesselActivityLongline | dbName=vesselActivity lazy=false dataQuality {*:0..1} referentiel.DataQuality -sensorUsed + {*} longline.SensorUsed | reverseDbName=activity +sensorUsed + {*} longline.SensorUsed | reverseDbName=activity orderBy=topiaCreateDate fpaZone {*:1} referentiel.FpaZone getDate() Date getTime() Date @@ -153,14 +153,14 @@ basket {*:0..1} longline.Basket branchline {*:0..1} longline.Branchline catchFateLongline {*:1} referentiel.longline.CatchFateLongline | dbName=catchFate discardHealthness {*:1} referentiel.longline.Healthness -sizeMeasure + {*} longline.SizeMeasure | reverseDbName=catch +sizeMeasure + {*} longline.SizeMeasure | reverseDbName=catch orderBy=topiaCreateDate speciesCatch {*:1} referentiel.Species predator {*:*} referentiel.Species | manyToManyTableName=catch_predator reverseDbName=catch section {*:0..1} longline.Section maturityStatus {*:0..1} referentiel.longline.MaturityStatus stomacFullness {*:0..1} referentiel.longline.StomacFullness hookPosition {*:0..1} referentiel.longline.HookPosition -weightMeasure + {*} longline.WeightMeasure | reverseDbName=catch +weightMeasure + {*} longline.WeightMeasure | reverseDbName=catch orderBy=topiaCreateDate catchHealthness {*:1} referentiel.longline.Healthness sex {*:0..1} referentiel.Sex @@ -242,18 +242,18 @@ haulingEndLatitude + {*:1} Float | sqlType=numeric haulingEndLongitude + {*:1} Float | sqlType=numeric haulingBreaks + {*:1} Integer monitored + {*:1} Boolean -baitsComposition + {*} longline.BaitsComposition | reverseDbName=set -floatlinesComposition + {*} longline.FloatlinesComposition | reverseDbName=set -hooksComposition + {*} longline.HooksComposition | reverseDbName=set +baitsComposition + {*} longline.BaitsComposition | reverseDbName=set orderBy=topiaCreateDate +floatlinesComposition + {*} longline.FloatlinesComposition | reverseDbName=set orderBy=topiaCreateDate +hooksComposition + {*} longline.HooksComposition | reverseDbName=set orderBy=topiaCreateDate section + {*} longline.Section | unique orderBy=settingIdentifier reverseDbName=set settingShape {*:1} referentiel.longline.SettingShape -tdr + {*} longline.Tdr | reverseDbName=set +tdr + {*} longline.Tdr | reverseDbName=set orderBy=topiaCreateDate catchLongline + {*} longline.CatchLongline | ordered reverseDbName=set lineType {*:0..1} referentiel.longline.LineType lightsticksType {*:0..1} referentiel.longline.LightsticksType lightsticksColor {*:0..1} referentiel.longline.LightsticksColor mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_set reverseDbName=set -branchlinesComposition + {*} longline.BranchlinesComposition | reverseDbName=set +branchlinesComposition + {*} longline.BranchlinesComposition | reverseDbName=set orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date setSettingStartDate(date Date) @@ -312,7 +312,7 @@ maxFishingDepth + {*:1} Float meanFishingDepth + {*:1} Float medianFishingDepth + {*:1} Float branchline {*:0..1} longline.Branchline -tdrRecord + {*} longline.TdrRecord +tdrRecord + {*} longline.TdrRecord | orderBy=topiaCreateDate sensorBrand {*:0..1} referentiel.longline.SensorBrand species {*:*} referentiel.Species section {*:0..1} longline.Section @@ -671,8 +671,8 @@ isActivityFinDePeche() boolean isChangedZoneOperation() boolean seine.FloatingObject > CommentableEntity | entity -objectSchoolEstimate + {*} seine.ObjectSchoolEstimate -objectObservedSpecies + {*} seine.ObjectObservedSpecies +objectSchoolEstimate + {*} seine.ObjectSchoolEstimate | orderBy=topiaCreateDate +objectObservedSpecies + {*} seine.ObjectObservedSpecies | orderBy=topiaCreateDate objectOperation {*:1} referentiel.seine.ObjectOperation supportVesselName + {*:1} String transmittingBuoy + {*} seine.TransmittingBuoy | unique @@ -793,7 +793,7 @@ reasonForNullSet {*:0..1} referentiel.seine.ReasonForNullSet nonTargetSample + {*} seine.NonTargetSample | unique reverseDbName=set targetSample + {*} seine.TargetSample | unique reverseDbName=set targetCatch + {*} seine.TargetCatch | ordered reverseDbName=set -schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set +schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set orderBy=topiaCreateDate nonTargetCatchRelease + {*} seine.NonTargetCatchRelease | ordered reverseDbName=set hasTargetCatch() boolean hasRejetThon() boolean ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-create-error-validation.xml ===================================== @@ -98,7 +98,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -112,16 +112,6 @@ </field-validator> <!-- 0 <= latitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -137,16 +127,6 @@ </field-validator> <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-update-error-validation.xml ===================================== @@ -84,7 +84,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -98,17 +98,6 @@ </field-validator> <!-- 0 <= latitude <= 90 --> - - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -124,16 +113,6 @@ </field-validator> <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-create-error-validation.xml ===================================== @@ -211,7 +211,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -225,16 +225,6 @@ </field-validator> <!-- 0 <= settingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -250,16 +240,6 @@ </field-validator> <!-- 0 <= settingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -277,7 +257,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -291,16 +271,6 @@ </field-validator> <!-- 0 <= settingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -316,16 +286,6 @@ </field-validator> <!-- 0 <= settingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -343,7 +303,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -357,16 +317,6 @@ </field-validator> <!-- 0 <= haulingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -382,16 +332,6 @@ </field-validator> <!-- 0 <= haulingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -409,7 +349,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -423,16 +363,6 @@ </field-validator> <!-- 0 <= haulingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> @@ -448,16 +378,6 @@ </field-validator> <!-- 0 <= haulingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-update-error-validation.xml ===================================== @@ -234,35 +234,28 @@ </field-validator> <!-- 0 <= settingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max} - </message> + <field-validator type="coordinateLongitudeDto" short-circuit="true"> + <param name="editorName">settingStart</param> + <message/> + </field-validator> + + </field> + + <field name="settingStartQuadrant"> + + <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingStartLongitude == null || settingStartLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( settingStartLongitude >= 0)) - ]]> - </param> + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> - <param name="editorName">settingStart</param> - <message/> - </field-validator> - </field> <field name="settingEndLatitude"> @@ -273,16 +266,6 @@ </field-validator> <!-- 0 <= settingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -298,35 +281,28 @@ </field-validator> <!-- 0 <= settingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max} - </message> + <field-validator type="coordinateLongitudeDto" short-circuit="true"> + <param name="editorName">settingEnd</param> + <message/> + </field-validator> + + </field> + + <field name="settingEndQuadrant"> + + <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingEndLongitude == null || settingEndLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( settingEndLongitude >= 0)) - ]]> - </param> + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> - <param name="editorName">settingEnd</param> - <message/> - </field-validator> - </field> <field name="haulingStartLatitude"> @@ -337,16 +313,6 @@ </field-validator> <!-- 0 <= haulingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -362,35 +328,27 @@ </field-validator> <!-- 0 <= haulingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} - </message> + <field-validator type="coordinateLongitudeDto" short-circuit="true"> + <param name="editorName">haulingStart</param> + <message/> + </field-validator> + + </field> + <field name="haulingStartQuadrant"> + + <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingStartLongitude == null || haulingStartLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( haulingStartLongitude >= 0)) - ]]> - </param> + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> - <param name="editorName">haulingStart</param> - <message/> - </field-validator> - </field> @@ -402,16 +360,6 @@ </field-validator> <!-- 0 <= haulingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> @@ -427,35 +375,28 @@ </field-validator> <!-- 0 <= haulingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} - </message> + <field-validator type="coordinateLongitudeDto" short-circuit="true"> + <param name="editorName">haulingEnd</param> + <message/> + </field-validator> + + </field> + + <field name="haulingEndQuadrant"> + + <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingEndLongitude == null || haulingEndLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( haulingEndLongitude >= 0)) - ]]> - </param> + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> - <param name="editorName">haulingEnd</param> - <message/> - </field-validator> - </field> <field name="settingShape"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml ===================================== @@ -193,16 +193,6 @@ </field-validator> <!-- 0 <= latitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -218,16 +208,6 @@ </field-validator> <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml ===================================== @@ -51,17 +51,6 @@ </field-validator> <!-- 0 <= latitude <= 90 --> - - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -77,16 +66,6 @@ </field-validator> <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/56484c2af6d4afcdc955996a7b2... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/56484c2af6d4afcdc955996a7b2... You're receiving this email because of your account on gitlab.com.