Author: tchemit Date: 2013-11-10 13:25:46 +0100 (Sun, 10 Nov 2013) New Revision: 1341 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1341 Log: fixes #3741: [OPERATION] une erreur ?\195?\160 analyser Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-error-validation.xml trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2013-11-08 16:59:13 UTC (rev 1340) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2013-11-10 12:25:46 UTC (rev 1341) @@ -284,7 +284,7 @@ if (uiValue == null) { Preconditions.checkState( - defaultNotEmptyDate == null, + defaultNotEmptyDate != null, "'defaultNotEmptyDate' could not be null."); Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-error-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-error-validation.xml 2013-11-08 16:59:13 UTC (rev 1340) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-error-validation.xml 2013-11-10 12:25:46 UTC (rev 1341) @@ -49,6 +49,27 @@ <message>tutti.validator.error.fishingOperation.dates.endBeforeStart</message> </field-validator> + + <field-validator type="skipablefieldexpression" short-circuit="true"> + <param name="skip"> + <![CDATA[ gearShootingEndDate == null || gearShootingStartDate == null || gearShootingStartLatitude == null || gearShootingStartLongitude == null || gearShootingEndLatitude == null || gearShootingEndLongitude == null || !gearShootingStartDate.equals(gearShootingEndDate)]]> + </param> + <param name="expression"> + <![CDATA[ (gearShootingStartLatitude.equals(gearShootingEndLatitude) && gearShootingStartLongitude.equals(gearShootingEndLongitude)) ]]> + </param> + <message>tutti.validator.error.fishingOperation.invalid.dates.for.position</message> + </field-validator> + + <field-validator type="skipablefieldexpression" short-circuit="true"> + <param name="skip"> + <![CDATA[ gearShootingEndDate == null || gearShootingStartDate == null || gearShootingStartLatitude == null || gearShootingStartLongitude == null || gearShootingEndLatitude == null || gearShootingEndLongitude == null || !(gearShootingStartLatitude.equals(gearShootingEndLatitude) && gearShootingStartLongitude.equals(gearShootingEndLongitude))]]> + </param> + <param name="expression"> + <![CDATA[ gearShootingStartDate.equals(gearShootingEndDate) ]]> + </param> + <message>tutti.validator.error.fishingOperation.invalid.position.for.dates</message> + </field-validator> + </field> <field name="comment"> Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml 2013-11-08 16:59:13 UTC (rev 1340) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml 2013-11-10 12:25:46 UTC (rev 1341) @@ -93,6 +93,26 @@ <message>tutti.validator.error.fishingOperation.dates.startOutOfCruiseDates</message> </field-validator> + <field-validator type="skipablefieldexpression" short-circuit="true"> + <param name="skip"> + <![CDATA[ gearShootingEndDate == null || gearShootingStartDate == null || gearShootingStartLatitude == null || gearShootingStartLongitude == null || gearShootingEndLatitude == null || gearShootingEndLongitude == null || !gearShootingStartDate.equals(gearShootingEndDate)]]> + </param> + <param name="expression"> + <![CDATA[ (gearShootingStartLatitude.equals(gearShootingEndLatitude) && gearShootingStartLongitude.equals(gearShootingEndLongitude)) ]]> + </param> + <message>tutti.validator.error.fishingOperation.invalid.dates.for.position</message> + </field-validator> + + <field-validator type="skipablefieldexpression" short-circuit="true"> + <param name="skip"> + <![CDATA[ gearShootingEndDate == null || gearShootingStartDate == null || gearShootingStartLatitude == null || gearShootingStartLongitude == null || gearShootingEndLatitude == null || gearShootingEndLongitude == null || !(gearShootingStartLatitude.equals(gearShootingEndLatitude) && gearShootingStartLongitude.equals(gearShootingEndLongitude))]]> + </param> + <param name="expression"> + <![CDATA[ gearShootingStartDate.equals(gearShootingEndDate) ]]> + </param> + <message>tutti.validator.error.fishingOperation.invalid.position.for.dates</message> + </field-validator> + </field> <!--gear shooting start latitude validation --> Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-11-08 16:59:13 UTC (rev 1340) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-11-10 12:25:46 UTC (rev 1341) @@ -205,6 +205,8 @@ tutti.validator.error.fishingOperation.fishingOperationNumber.required= tutti.validator.error.fishingOperation.fishingOperationValid.required= tutti.validator.error.fishingOperation.gear.required= +tutti.validator.error.fishingOperation.invalid.dates.for.position= +tutti.validator.error.fishingOperation.invalid.position.for.dates= tutti.validator.error.fishingOperation.stationNumber.required= tutti.validator.error.fishingOperation.stationNumber.too.long= tutti.validator.error.fishingOperation.strataLocation.required= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-11-08 16:59:13 UTC (rev 1340) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-11-10 12:25:46 UTC (rev 1341) @@ -205,6 +205,8 @@ tutti.validator.error.fishingOperation.fishingOperationNumber.required=Le numéro de trait est obligatoire tutti.validator.error.fishingOperation.fishingOperationValid.required=La validité du trait est obligatoire tutti.validator.error.fishingOperation.gear.required=L'engin est obligatoire +tutti.validator.error.fishingOperation.invalid.dates.for.position=Les dates ne peuvent pas être identiques si les positions sont différentes +tutti.validator.error.fishingOperation.invalid.position.for.dates=Si les positions sont identiques, les dates ne peuvent être identiques tutti.validator.error.fishingOperation.stationNumber.required=Le numéro de station est obligatoire tutti.validator.error.fishingOperation.stationNumber.too.long=Valeur trop longue (limitée à %s caractères) tutti.validator.error.fishingOperation.strataLocation.required=La strate, sous-strate ou localité doit être renseignée