From c109d0793f0679166bf1ae69e4162dbeb4ae971b Mon Sep 17 00:00:00 2001
From: Simon Buckle <bounce@alfresco.com>
Date: Fri, 30 May 2008 12:51:46 +0000
Subject: [PATCH] Made the following changes to the calendar component: -
 Modified view layout - Added event caching - Wired in calendar dashboard
 component

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../slingshot/calendar/event.post.html.ftl    | 12 ++++++++++-
 .../alfresco/slingshot/calendar/event.post.js | 21 ++++++++++++++-----
 .../slingshot/calendar/eventList.get.json.ftl |  2 +-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.html.ftl
index c15f780513..b913747826 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.html.ftl
@@ -1,2 +1,12 @@
-${result}
+{
+<#if result.error?exists>
+  "error" : "${result.error}"
+<#else>
+  "event": {
+    "name": "${result.name}",
+    "from": "${result.from?string("M/d/yyyy")}"
+  }
+</#if>
+}
+
 
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js
index c8d05dff59..9cab7a9309 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js
@@ -6,19 +6,25 @@ function createEvent(siteId, params)
 {
   if (siteId === null)
   {
-    return "Site identifier is undefined";
+    return {
+      "error": "Site identifier is undefined"
+    };
   }
 
   var site = siteService.getSite(siteId);
   if (site === null)
   {
-    return "Could not find specified site";
+    return {
+      "error": "Could not find specified site"
+    };
   }
 
   var calendar = site.getContainer("calendar");
   if (calendar === null)
   {
-    return ""; /* TODO: return something more meaningful */
+    return {
+      "error": "Could not get container"
+    };
   }
 
   var timestamp = new Date().getTime();
@@ -26,7 +32,9 @@ function createEvent(siteId, params)
 
   if (event === null)
   {
-    return "Event creation failed";
+    return {
+      "error": "Could not create event"
+    };
   }
 
   event.properties["ia:whatEvent"] = params["what"];
@@ -42,7 +50,10 @@ function createEvent(siteId, params)
   event.properties["ia:toDate"] = to;
   event.save();
 
-  return "Event saved";
+  return {
+    "name": params["what"],
+    "from": from
+  };
 };
 
 
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.json.ftl
index 0e184cbddd..dbe2d21894 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.json.ftl
@@ -2,7 +2,7 @@
 <#if events?exists && events?size &gt; 0>
 <#assign prev = "">
 <#list events as event>
-<#assign date = event.properties["ia:fromDate"]?string("MM/dd/yyyy")>
+<#assign date = event.properties["ia:fromDate"]?string("M/d/yyyy")>
 <#if date != prev>
 <#assign counter = 0>
 <#if event_index &gt; 0>],</#if>