diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java index ba4dcc61e..00b701557 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java @@ -174,7 +174,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { public void setSelectedDay(Date date) { baseCalendarModel.setSelectedDay(date); - reloadCurrentWindow(); + reloadDayInformation(); } public Date getSelectedDay() { @@ -212,7 +212,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { // TODO check hours parameter is >= 0 baseCalendarModel.createException(hours); - reloadCurrentWindow(); + reloadDayInformation(); } public List getHoursPerDay() { @@ -226,7 +226,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { public void removeException() { baseCalendarModel.removeException(); - reloadCurrentWindow(); + reloadDayInformation(); } public HoursPerDayRenderer getHoursPerDayRenderer() { @@ -264,7 +264,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { @Override public void onEvent(Event event) throws Exception { - reloadCurrentWindow(); + reloadDayInformation(); } }); @@ -302,7 +302,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { @Override public void onEvent(Event event) throws Exception { - reloadCurrentWindow(); + reloadDayInformation(); } }); @@ -321,6 +321,14 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { } } + private void reloadDayInformation() { + if (baseCalendarModel.isEditing()) { + Util.reloadBindings(editWindow.getFellow("dayInformation")); + } else { + Util.reloadBindings(createWindow.getFellow("dayInformation")); + } + } + public void goToCreateDerivedForm(BaseCalendar baseCalendar) { baseCalendarModel.initCreateDerived(baseCalendar); if (baseCalendarModel.isDerived()) {