diff --git a/src/main/java/org/olat/commons/calendar/restapi/CalendarWebService.java b/src/main/java/org/olat/commons/calendar/restapi/CalendarWebService.java index b131cd9350af5e7a4e84a51079d55218664e6dc6..fc831c44fa6a6bf6742797203e63f82b284245df 100644 --- a/src/main/java/org/olat/commons/calendar/restapi/CalendarWebService.java +++ b/src/main/java/org/olat/commons/calendar/restapi/CalendarWebService.java @@ -196,6 +196,7 @@ public class CalendarWebService { private void transfer(EventVO event, KalendarEvent kalEvent) { kalEvent.setDescription(event.getDescription()); kalEvent.setLocation(event.getLocation()); + kalEvent.setAllDayEvent(event.isAllDayEvent()); } @GET diff --git a/src/main/java/org/olat/commons/calendar/restapi/EventVO.java b/src/main/java/org/olat/commons/calendar/restapi/EventVO.java index dbf162d0c3e550b7e09a38b6f48ba5e3baebb33c..b76ad46a6bacce3d651edae1a22302fd41c8ea77 100644 --- a/src/main/java/org/olat/commons/calendar/restapi/EventVO.java +++ b/src/main/java/org/olat/commons/calendar/restapi/EventVO.java @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.olat.commons.calendar.model.KalendarEvent; @XmlAccessorType(XmlAccessType.FIELD) -@XmlRootElement(name = "catalogVO") +@XmlRootElement(name = "eventVO") public class EventVO { private String id; @@ -39,6 +39,7 @@ public class EventVO { private Date begin; private Date end; + private boolean allDayEvent; private Date creationDate; private String createdBy; @@ -54,6 +55,7 @@ public class EventVO { location = event.getLocation(); begin = event.getBegin(); end = event.getEnd(); + allDayEvent = event.isAllDayEvent(); calendarId = event.getCalendar().getType() + "_" + event.getCalendar().getCalendarID(); creationDate = new Date(event.getCreated()); } @@ -106,6 +108,14 @@ public class EventVO { this.end = end; } + public boolean isAllDayEvent() { + return allDayEvent; + } + + public void setAllDayEvent(boolean allDayEvent) { + this.allDayEvent = allDayEvent; + } + public Date getCreationDate() { return creationDate; }