From 61902d479a655bd88c2abed84b3eddb04b265fe0 Mon Sep 17 00:00:00 2001 From: srosse <stephane.rosse@frentix.com> Date: Thu, 11 Oct 2018 11:51:15 +0200 Subject: [PATCH] OO-3293: enhance curriculum REST API with calendars setting --- .../curriculum/restapi/CurriculumElementTypeVO.java | 10 ++++++++++ .../curriculum/restapi/CurriculumElementVO.java | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementTypeVO.java b/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementTypeVO.java index af70ab83ada..43833d3afef 100644 --- a/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementTypeVO.java +++ b/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementTypeVO.java @@ -43,6 +43,7 @@ public class CurriculumElementTypeVO { private String cssClass; private String externalId; private String managedFlagsString; + private String calendars; public CurriculumElementTypeVO() { // @@ -57,6 +58,7 @@ public class CurriculumElementTypeVO { vo.setCssClass(type.getCssClass()); vo.setExternalId(type.getExternalId()); vo.setManagedFlagsString(CurriculumElementTypeManagedFlag.toString(type.getManagedFlags())); + vo.setCalendars(type.getCalendars().name()); return vo; } @@ -115,4 +117,12 @@ public class CurriculumElementTypeVO { public void setManagedFlagsString(String managedFlagsString) { this.managedFlagsString = managedFlagsString; } + + public String getCalendars() { + return calendars; + } + + public void setCalendars(String calendars) { + this.calendars = calendars; + } } diff --git a/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementVO.java b/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementVO.java index 892a1c9c3c2..70815f5975a 100644 --- a/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementVO.java +++ b/src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementVO.java @@ -49,6 +49,7 @@ public class CurriculumElementVO { private String externalId; private String managedFlagsString; + private String calendars; private Long parentElementKey; private Long curriculumKey; @@ -79,6 +80,7 @@ public class CurriculumElementVO { if(element.getType() != null) { vo.setCurriculumElementTypeKey(element.getType().getKey()); } + vo.setCalendars(element.getCalendars().name()); return vo; } @@ -154,6 +156,14 @@ public class CurriculumElementVO { this.managedFlagsString = managedFlagsString; } + public String getCalendars() { + return calendars; + } + + public void setCalendars(String calendars) { + this.calendars = calendars; + } + public Long getParentElementKey() { return parentElementKey; } -- GitLab