From de2ee2322af740251ac82ca06deb1f7585637024 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Wed, 11 Jun 2014 10:24:04 -0400
Subject: [PATCH] Change the NSString with NSNumber and add some JavaScript

---
 .../Appointments/SOGoAppointmentFolder.h      |  2 +-
 .../Appointments/SOGoAppointmentFolder.m      |  8 ++--
 UI/Scheduler/UIxCalendarSelector.m            |  6 +--
 .../SchedulerUI/UIxCalendarSelector.wox       |  6 +--
 UI/WebServerResources/SchedulerUI.js          | 44 ++++++++++---------
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.h b/SoObjects/Appointments/SOGoAppointmentFolder.h
index b09241cfd..05e760909 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.h
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.h
@@ -80,7 +80,7 @@ typedef enum {
 
 - (NSArray *) calendarUIDs;
 
-- (NSString *) activeTasks;
+- (NSNumber *) activeTasks;
 
 /* vevent UID handling */
 
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index a70a0eb16..0a8746083 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -3269,11 +3269,11 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   return users;
 }
 
-- (NSString *) activeTasks
+- (NSNumber *) activeTasks
 {
   NSArray *tasksList;
-  NSString *activeTasks;
   NSMutableArray *fields;
+  NSNumber *activeTasks;
   
   fields = [NSMutableArray arrayWithObjects: @"c_component", @"c_status", nil];
   
@@ -3284,8 +3284,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
                           component: @"vtodo"
                   additionalFilters: @"c_status != 2 AND c_status != 3"];
   
-  activeTasks = [NSString stringWithFormat:@"(%d)", [tasksList count]];
-  
+  activeTasks = [NSNumber numberWithInt:[tasksList count]];
+
   return activeTasks;
 }
 
diff --git a/UI/Scheduler/UIxCalendarSelector.m b/UI/Scheduler/UIxCalendarSelector.m
index 196299fad..fd9e99c76 100644
--- a/UI/Scheduler/UIxCalendarSelector.m
+++ b/UI/Scheduler/UIxCalendarSelector.m
@@ -92,8 +92,8 @@ _intValueFromHex (NSString *hexString)
   SOGoAppointmentFolder *folder;
   NSMutableDictionary *calendar;
   unsigned int count, max;
-  NSString *folderName, *fDisplayName, *fActiveTasks;
-  NSNumber *isActive;
+  NSString *folderName, *fDisplayName;
+  NSNumber *isActive, *fActiveTasks;
   
   if (!calendars)
   {
@@ -122,7 +122,7 @@ _intValueFromHex (NSString *hexString)
                    forKey: @"owner"];
       fActiveTasks = [folder activeTasks];
       if (fActiveTasks == nil)
-        fActiveTasks = @"";
+        fActiveTasks = 0;
       [calendar setObject:fActiveTasks forKey:@"activeTasks" ];
       [calendars addObject: calendar];
     }
diff --git a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
index e5f0b03e6..5b3bd488e 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
@@ -39,10 +39,8 @@ div.colorBox.calendarFolder<var:string value="currentCalendar.folder" />
        ><li class="denied" var:id="currentCalendar.id" var:owner="currentCalendar.owner" >
           <input type="checkbox" class="checkBox" const:disabled="disabled" var:checked="currentCalendar.active" />
           <div var:class="currentCalendarClass"><entity name="nbsp"/></div>
-          <span>
-            <var:string value="currentCalendar.displayName" />
-            <var:string value="currentCalendar.activeTasks" />
-          </span>
+          <var:string value="currentCalendar.displayName" />
+          <span id="activeTasks"><var:string value="currentCalendar.activeTasks"/></span>
        </li>
       </var:foreach>
     </ul>
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 8a3a44215..ec3d7ce81 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -2900,27 +2900,29 @@ function configureDragHandles() {
 }
 
 function initCalendarSelector() {
-    var selector = $("calendarSelector");
-    updateCalendarStatus(); // triggers the initial events refresh
-    selector.changeNotification = updateCalendarsList;
-
-    var list = $("calendarList");
-    list.on("mousedown", onCalendarSelectionChange);
-    list.on("dblclick", onCalendarModify);
-    list.on("selectstart", listRowMouseDownHandler);
-    list.attachMenu("calendarsMenu");
-
-    var items = list.childNodesWithTag("li");
-    for (var i = 0; i < items.length; i++) {
-        var input = items[i].childNodesWithTag("input")[0];
-        $(input).observe("click", clickEventWrapper(updateCalendarStatus));
-    }
-
-    var links = $("calendarSelectorButtons").childNodesWithTag("a");
-    $(links[0]).observe("click", clickEventWrapper(onCalendarNew));
-    $(links[1]).observe("click", clickEventWrapper(onCalendarWebAdd));
-    $(links[2]).observe("click", clickEventWrapper(onCalendarAdd));
-    $(links[3]).observe("click", clickEventWrapper(onCalendarRemove));
+  var selector = $("calendarSelector");
+  updateCalendarStatus(); // triggers the initial events refresh
+  selector.changeNotification = updateCalendarsList;
+  
+  var list = $("calendarList");
+  list.on("mousedown", onCalendarSelectionChange);
+  list.on("dblclick", onCalendarModify);
+  list.on("selectstart", listRowMouseDownHandler);
+  list.attachMenu("calendarsMenu");
+  
+  var items = list.childNodesWithTag("li");
+  for (var i = 0; i < items.length; i++) {
+    var input = items[i].childNodesWithTag("input")[0];
+    var activeTasks = items[i].childNodesWithTag("span")[0];
+    $(input).observe("click", clickEventWrapper(updateCalendarStatus));
+    $(activeTasks).innerHTML = "(" + activeTasks.innerText + ")";
+  }
+  
+  var links = $("calendarSelectorButtons").childNodesWithTag("a");
+  $(links[0]).observe("click", clickEventWrapper(onCalendarNew));
+  $(links[1]).observe("click", clickEventWrapper(onCalendarWebAdd));
+  $(links[2]).observe("click", clickEventWrapper(onCalendarAdd));
+  $(links[3]).observe("click", clickEventWrapper(onCalendarRemove));
 }
 
 function onCalendarSelectionChange(event) {