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

ItEr23S08CUEdicionCalendarioLaboral: Checking and managing errors when expiring date is set.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-08-28 14:46:43 +02:00 • committed by Óscar González Fernández
parent 0177a578e8
commit 65503d0318
5 changed files with 42 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java
View file

@ -651,4 +651,12 @@ public class BaseCalendarTest {
calendar.newVersion(new LocalDate());
}
@Test(expected = UnsupportedOperationException.class)
public void testNotAllowSetExpiringDateIfNotNextCalendar() {
BaseCalendar calendar = createBasicCalendar();
assertThat(calendar.getNextCalendar(), nullValue());
calendar.setExpiringDate(WEDNESDAY_LOCAL_DATE);
}
}

26
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
View file

@ -461,13 +461,16 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
}
public void setDateValidFrom(Date date) {
Component component = editWindow.getFellow("dateValidFrom");
try {
baseCalendarModel.setDateValidFrom(date);
} catch (IllegalArgumentException e) {
throw new WrongValueException(
editWindow.getFellow("dateValidFrom"),
e.getMessage());
throw new WrongValueException(component, e.getMessage());
} catch (UnsupportedOperationException e) {
throw new WrongValueException(component, e.getMessage());
}
Clients.closeErrorBox(component);
}
public Date getExpiringDate() {
@ -475,8 +478,17 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
}
public void setExpiringDate(Date date) {
// TODO check possible wrong dates
baseCalendarModel.setExpiringDate(date);
Component component = editWindow.getFellow("expiringDate");
try {
baseCalendarModel.setExpiringDate((new LocalDate(date)).plusDays(1)
.toDateTimeAtStartOfDay().toDate());
} catch (IllegalArgumentException e) {
throw new WrongValueException(component, e.getMessage());
} catch (UnsupportedOperationException e) {
throw new WrongValueException(component, e.getMessage());
}
Clients.closeErrorBox(component);
}
public void goToCreateCopyForm(BaseCalendar baseCalendar) {
@ -801,4 +813,8 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
Util.reloadBindings(createNewVersion);
}
public boolean isLastVersion() {
return baseCalendarModel.isLastVersion();
}
}

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

@ -359,7 +359,7 @@ public class BaseCalendarModel implements IBaseCalendarModel {
if ((getBaseCalendar() != null)
&& (getBaseCalendar().getExpiringDate() != null)) {
getBaseCalendar()
.setExpiringDate((new LocalDate(date)).plusDays(1));
.setExpiringDate(date);
}
}
@ -412,6 +412,14 @@ public class BaseCalendarModel implements IBaseCalendarModel {
}
}
@Override
public boolean isLastVersion() {
if (getBaseCalendar() != null) {
return (getBaseCalendar().getNextCalendar() == null);
}
return false;
}
/*
* Final conversation steps
*/

2
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/IBaseCalendarModel.java
View file

@ -116,6 +116,8 @@ public interface IBaseCalendarModel {
void createNewVersion(Date date);
boolean isLastVersion();
/*
* Final conversation steps
*/

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

@ -85,7 +85,8 @@
<datebox id="dateValidFrom" value="@{controller.dateValidFrom}"
disabled="@{controller.isDateValidFromPast}" />
<label value="${i18n:_('to')}" />
<datebox value="@{controller.expiringDate}" />
<datebox id="expiringDate" value="@{controller.expiringDate}"
disabled="@{controller.isLastVersion}" />
</hbox>
<hbox>