From a6ba5ff9d97fdf65411dd18ddd21539db9c309d5 Mon Sep 17 00:00:00 2001
From: Michael Prager <michael@pragers.de>
Date: Mon, 15 Nov 2010 13:25:19 +0100
Subject: [PATCH] fixed CalendarName property not being passed to calendar
 events properly. Also fixed and improved layout for color indicator bars.

---
 comingNext/index.html | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/comingNext/index.html b/comingNext/index.html
index 383f8e1..1a87aca 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -18,6 +18,12 @@
 .description { }
 .icon { }
 .overdue {}
+.calendar1 {}
+.calendar2 {}
+.calendar3 {}
+.calendar4 {}
+.calendar5 {}
+.calendar6 {}
 </style>
 
 <script type="text/javascript" src="localizedTextStrings.js" charset="utf-8" />
@@ -534,7 +540,7 @@ function updateData()
 			if (meetingResult.ErrorCode != 0)
 				throw("Error fetching calendar data: " + meetingResult.ErrorCode + ': ' + meetingResult.ErrorMessage);
 			var list = meetingResult.ReturnValue;
-			meetingList = meetingList.concat(listToArray(list));
+			meetingList = meetingList.concat(listToArray(list, calendarList[i]));
 		}
 		console.info("updateData(): meetingList.sort()");
 		meetingList.sort(sortCalendarEntries);
@@ -555,7 +561,7 @@ function updateData()
 				}
 				var todayTodoResult = calendarService.IDataSource.GetList(todayTodoListFiltering);
 				var list = todayTodoResult.ReturnValue;
-				todayTodoList = todayTodoList.concat(listToArray(list));
+				todayTodoList = todayTodoList.concat(listToArray(list, calendarList[i]));
 			}
 			console.info("updateData(): todayTodoList.sort()");
 			todayTodoList.sort(sortCalendarEntries);
@@ -722,7 +728,7 @@ function updateData()
 				// generate html output
 				entriesHtml += '<tr>';
 				if (config['showCalendarIndicator'].Value && calendarList.length > 1) {
-					entriesHtml += '<td class="calendar' + calendarColors[entry.CalendarName] + '">&nbsp;</td>';
+					entriesHtml += '<td><span class="calendar' + calendarColors[entry.CalendarName] + '">&nbsp;</span></td>';
 				}
 				entriesHtml += '<td><img class="icon" src="' + entry.Type + '.png" /></td>';
 				if(date == null) {
@@ -1291,7 +1297,8 @@ function listCalendars()
 }
 
 // Copies all objects and their properties to an array. Data is copied so nothing gets lost when the reference is removed
-function listToArray(list)
+// Note: this will also set the "CalendarName" property of every entry to the name specified by the calendarName parameter if it has not been defined already
+function listToArray(list, calendarName)
 {
 	var array = new Array();
 	var item;
@@ -1301,6 +1308,10 @@ function listToArray(list)
 		for(var i=0; i < entryFields.length; i++) {
 			itemCopy[entryFields[i]] = item[entryFields[i]];
 		}
+		// for some reason, the CalendarName property is never correctly queried, so we assign it manually here
+		if (!itemCopy['CalendarName']) {
+			itemCopy['CalendarName'] = calendarName;
+		}
 		array.push(itemCopy);
 		txt += array[array.length - 1].Summary + ", ";
 	}
@@ -1376,12 +1387,13 @@ function sortCalendarEntries(a, b)
 
 function updateCalendarColors()
 {
+	var maxColors = 6;
 	calendarColors = [];
-	if (calendarList.length > 6) {
+	if (calendarList.length > maxColors) {
 		console.info("updateCalendarColors(): Warning: more calendars than available indicator colors");
 	}
 	for(var i=0; i < calendarList.length; i++) {
-		calendarColors[calendarList[i]] = (i % 6) + 1;
+		calendarColors[calendarList[i]] = (i % maxColors) + 1;
 	}
 }
 
@@ -1396,7 +1408,7 @@ hr { color:#ffffff; background-color:#ffffff; height:1px; text-align:left; borde
 .textInput { width:90%; }
 .credits { margin-left:40px; text-indent: -20px; margin-bottom:0px; }
 #homescreenView { width: 315px; height:91px; overflow:hidden; }
-#calendarList { position:absolute; left:10px; top:4px; width:295px; height:75px; overflow:hidden; }
+#calendarList { position:absolute; left:5px; top:4px; width:295px; height:75px; overflow:hidden; }
 #name { text-align:center; }
 #appicon { display: block; margin-left: auto; margin-right: auto; margin-top: 10px; }
 #smallappicon { width:22px; height:22px; margin-right:10px; float:left; }
-- 
2.39.2