Author: vbriand Date: 2011-04-28 11:46:31 +0200 (Thu, 28 Apr 2011) New Revision: 113 Url: http://chorem.org/repositories/revision/chorem/113 Log: Added a test to check if the end date is not set before the begin date Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-28 09:07:36 UTC (rev 112) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-04-28 09:46:31 UTC (rev 113) @@ -3,6 +3,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Date; import java.util.List; import java.util.UUID; @@ -152,6 +153,8 @@ beginDate != null && estimatedEndDate != null) { SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); + Date begin = new Date(), + end = new Date(); //This is tested manually instead of using a validator because //otherwise the company is not set (the validator returns INPUT and @@ -173,18 +176,28 @@ //Lenient mode disabled because results may be very odd formatter.setLenient(false); try { - projectOrder.setBeginDate(formatter.parse(beginDate)); + begin = formatter.parse(beginDate); + projectOrder.setBeginDate(begin); } catch (ParseException e) { result = INPUT; addFieldError("beginDate", getText(n_("chorem.date.wrongFormat"))); } try { - projectOrder.setEndDate(formatter.parse(estimatedEndDate)); + end = formatter.parse(estimatedEndDate); + projectOrder.setEndDate(end); } catch (ParseException e) { result = INPUT; addFieldError("estimatedEndDate", getText(n_("chorem.date.wrongFormat"))); } - //TODO:tester si la date de fin est > à la date de début + + //If end and begin have been initialized + if (result != INPUT) { + if (end.before(begin)) { + result = INPUT; + addFieldError("estimatedEndDate", getText(n_("chorem.endDate.afterBegin"))); + } + } + projectOrder.setType(type); if (result.equals(SUCCESS)) { proxy.store(projectOrder);