RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr23S08CUEdicionCalendarioLaboral: Allowing navigation between versions through the selected dates on the right calendar.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-08-27 20:07:32 +02:00 • committed by Óscar González Fernández
parent b64b8f1aae
commit c14afa2b1a
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
View file

@ -74,14 +74,6 @@ public class BaseCalendarModel implements IBaseCalendarModel {
Validate.notNull(baseCalendar);
this.baseCalendar = getFromDB(baseCalendar);
try {
this.baseCalendar = this.baseCalendar.newVersion();
} catch (IllegalArgumentException e) {
LocalDate expiringDate = this.baseCalendar.getPreviousCalendar()
.getExpiringDate();
this.baseCalendar = this.baseCalendar.newVersion(expiringDate
.plusDays(1));
}
forceLoadHoursPerDayAndExceptionDays(this.baseCalendar);
}
@ -198,8 +190,15 @@ public class BaseCalendarModel implements IBaseCalendarModel {
}
@Override
@Transactional(readOnly = true)
public void setSelectedDay(Date date) {
this.selectedDate = date;
BaseCalendar validCalendar = baseCalendar.getCalendarVersion(date);
if (!validCalendar.equals(baseCalendar)) {
baseCalendar = validCalendar;
forceLoadHoursPerDayAndExceptionDays(baseCalendar);
}
}
@Override

7
navalplanner-webapp/src/main/webapp/calendars/_edition.zul
View file

@ -81,13 +81,10 @@
<hbox visible="@{controller.isEditing}">
<label value="${i18n:_('Valid from')}" />
<datebox id="dateValidFrom" value="@{controller.dateValidFrom}" />
<label value="${i18n:_('to')}" />
<datebox value="@{controller.expiringDate}" />
</hbox>
<!-- hbox>
<label value="${i18n:_('Expiring date')}" />
<datebox value="@{controller.expiringDate}" disabled="true" />
</hbox -->
<hbox>
<button onClick="controller.save();"
label="${arg.save_button_label}" />

3
navalplanner-webapp/src/test/java/org/navalplanner/web/calendars/BaseCalendarModelTest.java
View file

@ -72,8 +72,7 @@ public class BaseCalendarModelTest {
baseCalendarModel.confirmSave();
assertThat(baseCalendarModel.getBaseCalendars().size(), equalTo(1));
assertThat(baseCalendarModel.getBaseCalendars().get(0)
.getPreviousCalendar().getId(),
assertThat(baseCalendarModel.getBaseCalendars().get(0).getId(),
equalTo(baseCalendar.getId()));
assertThat(baseCalendarModel.getBaseCalendars().get(0).getHours(
Days.MONDAY), equalTo(4));