diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java index 1d99772b9..567c21d04 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java @@ -474,19 +474,6 @@ public abstract class BaseCalendarEditionController extends return baseCalendarModel.getHoursOfDay(); } - public boolean isSelectedDateFromPast() { - Date selectedDay = baseCalendarModel.getSelectedDay(); - if (selectedDay != null) { - return isPast(selectedDay); - } - - return true; - } - - public boolean isNotSelectedDateFromPast() { - return !isSelectedDateFromPast(); - } - public void createException() { Combobox exceptionTypes = (Combobox) window.getFellow("exceptionTypes"); CalendarExceptionType type = (CalendarExceptionType) exceptionTypes @@ -515,13 +502,6 @@ public abstract class BaseCalendarEditionController extends } else { Clients.closeErrorBox(dateboxEndDate); } - if (startDate.compareTo(new Date()) <= 0) { - throw new WrongValueException( - dateboxStartDate, - _("Exception start date should be greater than current date")); - } else { - Clients.closeErrorBox(dateboxStartDate); - } if (startDate.compareTo(endDate) > 0) { throw new WrongValueException( dateboxEndDate, @@ -903,9 +883,6 @@ public abstract class BaseCalendarEditionController extends reloadDayInformation(); } }); - if (isSelectedDateFromPast()) { - result.setDisabled(true); - } return result; } @@ -956,13 +933,6 @@ public abstract class BaseCalendarEditionController extends } else { Clients.closeErrorBox(dateboxEndDate); } - if (startDate.compareTo(new Date()) <= 0) { - throw new WrongValueException( - dateboxStartDate, - _("Exception start date should be greater than current date")); - } else { - Clients.closeErrorBox(dateboxStartDate); - } if (startDate.compareTo(endDate) > 0) { throw new WrongValueException( dateboxEndDate, diff --git a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul index 14c789052..fb4a69b4d 100644 --- a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul +++ b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul @@ -91,8 +91,7 @@ @@ -132,11 +128,9 @@