Author: kmorin Date: 2013-02-03 15:52:46 +0100 (Sun, 03 Feb 2013) New Revision: 309 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/309 Log: add validation to check that the fishing operation is between the cruise dates Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-03 13:06:27 UTC (rev 308) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-03 14:52:46 UTC (rev 309) @@ -232,7 +232,7 @@ final EditFishingOperationUIModel model = getModel(); initUI(ui); - + initBeanList(ui.getSaisisseurList(), persistenceService.getAllPerson(), model.getSaisisseur()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-02-03 13:06:27 UTC (rev 308) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-02-03 14:52:46 UTC (rev 309) @@ -43,6 +43,7 @@ import java.util.List; import static org.nuiton.i18n.I18n.n_; +import org.nuiton.util.DateUtil; /** * Model for UI {@link EditFishingOperationUI}. @@ -708,6 +709,10 @@ protected FishingOperation newEntity() { return fishingOperation; } + + public boolean isDateInCruise(Date date) { + return DateUtil.between(date, cruise.getBeginDate(), cruise.getEndDate()); + } public void convertGearShootingCoordinatesDDToDMS() { SexagecimalPosition position; Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml 2013-02-03 13:06:27 UTC (rev 308) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml 2013-02-03 14:52:46 UTC (rev 309) @@ -37,6 +37,13 @@ </param> <message>tutti.validator.error.fishingOperation.dates.endBeforeStart</message> </field-validator> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ gearShootingStartDate == null || isDateInCruise(gearShootingStartDate) ]]> + </param> + <message>tutti.validator.error.fishingOperation.dates.startOutOfCruiseDates</message> + </field-validator> </field> <field name="gearShootingEndDate"> @@ -46,6 +53,13 @@ </param> <message>tutti.validator.error.fishingOperation.dates.endBeforeStart</message> </field-validator> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ gearShootingEndDate == null || isDateInCruise(gearShootingEndDate) ]]> + </param> + <message>tutti.validator.error.fishingOperation.dates.endOutOfCruiseDates</message> + </field-validator> </field> <!--gear shooting start latitude validation --> Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml 2013-02-03 13:06:27 UTC (rev 308) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml 2013-02-03 14:52:46 UTC (rev 309) @@ -77,6 +77,13 @@ <message>tutti.validator.error.fishingOperation.dates.endBeforeStart</message> </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ gearShootingStartDate == null || isDateInCruise(gearShootingStartDate) ]]> + </param> + <message>tutti.validator.error.fishingOperation.dates.startOutOfCruiseDates</message> + </field-validator> + </field> <field name="gearShootingEndDate"> @@ -88,6 +95,13 @@ <message>tutti.validator.error.fishingOperation.dates.endBeforeStart</message> </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ gearShootingEndDate == null || isDateInCruise(gearShootingEndDate) ]]> + </param> + <message>tutti.validator.error.fishingOperation.dates.startOutOfCruiseDates</message> + </field-validator> + </field> <!--gear shooting start latitude validation --> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-03 13:06:27 UTC (rev 308) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-03 14:52:46 UTC (rev 309) @@ -216,6 +216,8 @@ tutti.label.tab.catches=Captures tutti.label.tab.catchesCaracteristics=Résumé tutti.label.tab.fishingOperation=Trait +tutti.label.tab.fishingOperation.environment=Environnement +tutti.label.tab.fishingOperation.gearShooting=Mise en oeuvre de l'engin tutti.label.tab.fishingOperation.general=Trait tutti.label.tab.fishingOperation.hydrology=Paramètres hydrologiques tutti.label.tab.macroDechet=Macro déchets @@ -390,6 +392,8 @@ tutti.validator.error.cruise.year.required=L'année est obligatoire tutti.validator.error.fishingOperation.date.required=La date du fishingOperation est obligatoire tutti.validator.error.fishingOperation.dates.endBeforeStart=La date de fin doit être après la date de début +tutti.validator.error.fishingOperation.dates.endOutOfCruiseDates=La date de fin est en dehors des dates de la campagne +tutti.validator.error.fishingOperation.dates.startOutOfCruiseDates=La date de début est en dehors des dates de la campagne tutti.validator.error.fishingOperation.fishingOperationNumber.required=Le numéro de trait est obligatoire 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)