Change the NSString with NSNumber and add some JavaScript
parent
43ac57b671
commit
de2ee2322a
|
@ -80,7 +80,7 @@ typedef enum {
|
||||||
|
|
||||||
- (NSArray *) calendarUIDs;
|
- (NSArray *) calendarUIDs;
|
||||||
|
|
||||||
- (NSString *) activeTasks;
|
- (NSNumber *) activeTasks;
|
||||||
|
|
||||||
/* vevent UID handling */
|
/* vevent UID handling */
|
||||||
|
|
||||||
|
|
|
@ -3269,11 +3269,11 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
|
||||||
return users;
|
return users;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSString *) activeTasks
|
- (NSNumber *) activeTasks
|
||||||
{
|
{
|
||||||
NSArray *tasksList;
|
NSArray *tasksList;
|
||||||
NSString *activeTasks;
|
|
||||||
NSMutableArray *fields;
|
NSMutableArray *fields;
|
||||||
|
NSNumber *activeTasks;
|
||||||
|
|
||||||
fields = [NSMutableArray arrayWithObjects: @"c_component", @"c_status", nil];
|
fields = [NSMutableArray arrayWithObjects: @"c_component", @"c_status", nil];
|
||||||
|
|
||||||
|
@ -3284,7 +3284,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
|
||||||
component: @"vtodo"
|
component: @"vtodo"
|
||||||
additionalFilters: @"c_status != 2 AND c_status != 3"];
|
additionalFilters: @"c_status != 2 AND c_status != 3"];
|
||||||
|
|
||||||
activeTasks = [NSString stringWithFormat:@"(%d)", [tasksList count]];
|
activeTasks = [NSNumber numberWithInt:[tasksList count]];
|
||||||
|
|
||||||
return activeTasks;
|
return activeTasks;
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,8 +92,8 @@ _intValueFromHex (NSString *hexString)
|
||||||
SOGoAppointmentFolder *folder;
|
SOGoAppointmentFolder *folder;
|
||||||
NSMutableDictionary *calendar;
|
NSMutableDictionary *calendar;
|
||||||
unsigned int count, max;
|
unsigned int count, max;
|
||||||
NSString *folderName, *fDisplayName, *fActiveTasks;
|
NSString *folderName, *fDisplayName;
|
||||||
NSNumber *isActive;
|
NSNumber *isActive, *fActiveTasks;
|
||||||
|
|
||||||
if (!calendars)
|
if (!calendars)
|
||||||
{
|
{
|
||||||
|
@ -122,7 +122,7 @@ _intValueFromHex (NSString *hexString)
|
||||||
forKey: @"owner"];
|
forKey: @"owner"];
|
||||||
fActiveTasks = [folder activeTasks];
|
fActiveTasks = [folder activeTasks];
|
||||||
if (fActiveTasks == nil)
|
if (fActiveTasks == nil)
|
||||||
fActiveTasks = @"";
|
fActiveTasks = 0;
|
||||||
[calendar setObject:fActiveTasks forKey:@"activeTasks" ];
|
[calendar setObject:fActiveTasks forKey:@"activeTasks" ];
|
||||||
[calendars addObject: calendar];
|
[calendars addObject: calendar];
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,10 +39,8 @@ div.colorBox.calendarFolder<var:string value="currentCalendar.folder" />
|
||||||
><li class="denied" var:id="currentCalendar.id" var:owner="currentCalendar.owner" >
|
><li class="denied" var:id="currentCalendar.id" var:owner="currentCalendar.owner" >
|
||||||
<input type="checkbox" class="checkBox" const:disabled="disabled" var:checked="currentCalendar.active" />
|
<input type="checkbox" class="checkBox" const:disabled="disabled" var:checked="currentCalendar.active" />
|
||||||
<div var:class="currentCalendarClass"><entity name="nbsp"/></div>
|
<div var:class="currentCalendarClass"><entity name="nbsp"/></div>
|
||||||
<span>
|
<var:string value="currentCalendar.displayName" />
|
||||||
<var:string value="currentCalendar.displayName" />
|
<span id="activeTasks"><var:string value="currentCalendar.activeTasks"/></span>
|
||||||
<var:string value="currentCalendar.activeTasks" />
|
|
||||||
</span>
|
|
||||||
</li>
|
</li>
|
||||||
</var:foreach>
|
</var:foreach>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -2900,27 +2900,29 @@ function configureDragHandles() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function initCalendarSelector() {
|
function initCalendarSelector() {
|
||||||
var selector = $("calendarSelector");
|
var selector = $("calendarSelector");
|
||||||
updateCalendarStatus(); // triggers the initial events refresh
|
updateCalendarStatus(); // triggers the initial events refresh
|
||||||
selector.changeNotification = updateCalendarsList;
|
selector.changeNotification = updateCalendarsList;
|
||||||
|
|
||||||
var list = $("calendarList");
|
var list = $("calendarList");
|
||||||
list.on("mousedown", onCalendarSelectionChange);
|
list.on("mousedown", onCalendarSelectionChange);
|
||||||
list.on("dblclick", onCalendarModify);
|
list.on("dblclick", onCalendarModify);
|
||||||
list.on("selectstart", listRowMouseDownHandler);
|
list.on("selectstart", listRowMouseDownHandler);
|
||||||
list.attachMenu("calendarsMenu");
|
list.attachMenu("calendarsMenu");
|
||||||
|
|
||||||
var items = list.childNodesWithTag("li");
|
var items = list.childNodesWithTag("li");
|
||||||
for (var i = 0; i < items.length; i++) {
|
for (var i = 0; i < items.length; i++) {
|
||||||
var input = items[i].childNodesWithTag("input")[0];
|
var input = items[i].childNodesWithTag("input")[0];
|
||||||
$(input).observe("click", clickEventWrapper(updateCalendarStatus));
|
var activeTasks = items[i].childNodesWithTag("span")[0];
|
||||||
}
|
$(input).observe("click", clickEventWrapper(updateCalendarStatus));
|
||||||
|
$(activeTasks).innerHTML = "(" + activeTasks.innerText + ")";
|
||||||
|
}
|
||||||
|
|
||||||
var links = $("calendarSelectorButtons").childNodesWithTag("a");
|
var links = $("calendarSelectorButtons").childNodesWithTag("a");
|
||||||
$(links[0]).observe("click", clickEventWrapper(onCalendarNew));
|
$(links[0]).observe("click", clickEventWrapper(onCalendarNew));
|
||||||
$(links[1]).observe("click", clickEventWrapper(onCalendarWebAdd));
|
$(links[1]).observe("click", clickEventWrapper(onCalendarWebAdd));
|
||||||
$(links[2]).observe("click", clickEventWrapper(onCalendarAdd));
|
$(links[2]).observe("click", clickEventWrapper(onCalendarAdd));
|
||||||
$(links[3]).observe("click", clickEventWrapper(onCalendarRemove));
|
$(links[3]).observe("click", clickEventWrapper(onCalendarRemove));
|
||||||
}
|
}
|
||||||
|
|
||||||
function onCalendarSelectionChange(event) {
|
function onCalendarSelectionChange(event) {
|
||||||
|
|
Loading…
Reference in New Issue