From 1f48767b785d580588bbc10d1a750baba207fda5 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 5 Jul 2012 09:20:28 +0200
Subject: [PATCH] OMA-78: add all day event flag
---
.../commons/calendar/restapi/CalendarWebService.java | 1 +
.../org/olat/commons/calendar/restapi/EventVO.java | 12 +++++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
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 b131cd9350a..fc831c44fa6 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 dbf162d0c3e..b76ad46a6ba 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;
}
--
GitLab