X-Git-Url: https://code.delx.au/comingnext/blobdiff_plain/2de56af5f6389b2bf02d40ff58cfd2f2be40188e..0203a8b67f670c8fb429075508c5445558126fd7:/comingNext/index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index d66fd29..0e80e7b 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -18,12 +18,18 @@
 .description { }
 .icon { }
 .overdue {}
+.calendar1 {}
+.calendar2 {}
+.calendar3 {}
+.calendar4 {}
+.calendar5 {}
+.calendar6 {}
 </style>
 
 <script type="text/javascript" src="localizedTextStrings.js" charset="utf-8" />
 
 <script>
-// valid types for the config object are 'Int', 'Bool', 'String', 'Enum', 'UID'
+// valid types for the config object are 'Int', 'Bool', 'String', 'Enum', 'UID', 'Array'
 var config = {
 	monthRange: { Type: 'Int', Default: 2, Value: 2,},
 	includeTodos: { Type: 'Bool', Default: true, Value: true,},
@@ -49,6 +55,8 @@ var config = {
 	enableDaylightSaving: { Type: 'Bool', Default: true, Value: true,},
 	daylightSavingOffset: { Type: 'Int', Default: 1, Value: 1,},
 	hideWidgetOnCalendarOpen: { Type: 'Bool', Default: false, Value: false,},
+	showCalendarIndicator: { Type: 'Bool', Default: true, Value: true,},
+	excludedCalendars: { Type: 'Array', Default: '', Value: '',},
 	cssStyle_background: { Type: 'String', Default: 'color:#ffffff; background-color:#000000', Value: 'color:#ffffff; background-color:#000000',},
 	cssStyle_backgroundFullscreen: { Type: 'String', Default: 'color:#ffffff; background-color:#000000', Value: 'color:#ffffff; background-color:#000000',},
 	cssStyle_weekDay: { Type: 'String', Default: '', Value: '',},
@@ -60,6 +68,12 @@ var config = {
 	cssStyle_description: { Type: 'String', Default: '', Value: '',},
 	cssStyle_icon: { Type: 'String', Default: 'width:15px; height:15px', Value: 'width:15px; height:15px',},
 	cssStyle_overdue: { Type: 'String', Default: 'color:#ffff00', Value: 'color:#ffff00',},
+	cssStyle_calendar1: { Type: 'String', Default: 'background-color:#0757cf', Value: 'background-color:#0757cf',},
+	cssStyle_calendar2: { Type: 'String', Default: 'background-color:#579f37', Value: 'background-color:#579f37',},
+	cssStyle_calendar3: { Type: 'String', Default: 'background-color:#ff9f07', Value: 'background-color:#ff9f07',},
+	cssStyle_calendar4: { Type: 'String', Default: 'background-color:#af8fef', Value: 'background-color:#af8fef',},
+	cssStyle_calendar5: { Type: 'String', Default: 'background-color:#57afbf', Value: 'background-color:#57afbf',},
+	cssStyle_calendar6: { Type: 'String', Default: 'background-color:#9fdf57', Value: 'background-color:#9fdf57',},
 }
 
 
@@ -68,7 +82,7 @@ var config = {
 // Nothing of interest from here on...
 //-------------------------------------------------------
 var panelNum = 0; // use 1 for second panel
-var version = "1.29";
+var version = "1.31";
 var versionURL = "http://comingnext.sourceforge.net/version.xml";
 var calendarService = null;
 var cacheEntriesHtml = [];
@@ -79,9 +93,11 @@ var mode = 0; // 0 = homescreen, 1 = fullscreen, 2 = settings, 3 = about, 4 = ch
 var reqV = null; 
 var settingsCalEntryId = null;
 var settingsCache = null;
-var notificationRequest1;
-var notificationRequest2;
+var notificationRequests = new Array();
 var calendarList = [];
+var calendarColors = [];
+var updateTimer = null;
+var screenRotationTimer = null;
 
 // vars for daylight saving time
 var summertime = false; // true, if current date is in summer, false if in winter
@@ -91,6 +107,7 @@ var daylightSavingDates = new Object(); // caches calculated DST winter and summ
 var entryFields = [
 	"id",
 	"Type",
+	"CalendarName",
 	"Summary",
 	"Location",
 	"Status",
@@ -298,13 +315,17 @@ function requestNotification()
 {
 	var criteria = new Object();
 	criteria.Type = "CalendarEntry";
-
-	try {
-		notificationRequest1 = calendarService.IDataSource.RequestNotification(criteria, callback);
-		if (notificationRequest1.ErrorCode)
-			error('requestNotification failed with error code ' + notificationRequest1.ErrorCode);
-	} catch (e) {
-		error("requestNotification: " + e + ', line ' + e.line);
+	criteria.Filter = new Object();
+	for(var i=0; i < calendarList.length; i++) {
+		criteria.Filter.CalendarName = calendarList[i];
+		try {
+			var notificationRequest = calendarService.IDataSource.RequestNotification(criteria, callback);
+			if (notificationRequest.ErrorCode)
+				error('requestNotification failed with error code ' + notificationRequest.ErrorCode);
+			notificationRequests.push(notificationRequest);
+		} catch (e) {
+			error("requestNotification: " + e + ', line ' + e.line);
+		}
 	}
 
 	var criteria2 = new Object();
@@ -312,16 +333,29 @@ function requestNotification()
 	criteria2.Filter = new Object();
 	criteria2.Filter.LocalIdList = new Array();
 	criteria2.Filter.LocalIdList[0] = settingsCalEntryId;
-
 	try {
-		notificationRequest2 = calendarService.IDataSource.RequestNotification(criteria2, settingsCallback);
-		if (notificationRequest2.ErrorCode)
-			error('requestNotification failed with error code ' + notificationRequest2.ErrorCode);
+		var notificationRequest = calendarService.IDataSource.RequestNotification(criteria2, settingsCallback);
+		if (notificationRequest.ErrorCode)
+			error('requestNotification failed with error code ' + notificationRequest.ErrorCode);
+		notificationRequests.push(notificationRequest);
 	} catch (e) {
 		error("requestNotification: " + e + ', line ' + e.line);
 	}
 }
 
+function cancelNotification()
+{
+	for(var i=0; i < notificationRequests.length; i++) {
+		try {
+			var result = calendarService.IDataSource.Cancel(notificationRequests[i]);
+			if (result.ErrorCode)
+				error('cancelNotification failed with error code ' + result.ErrorCode);
+		} catch (e) {
+			error("cancelNotification: " + e + ', line ' + e.line);
+		}
+	}
+}
+
 function callback(transId, eventCode, result)
 {
 	console.info("callback(): panelNum: %d  transId: %d  eventCode: %d result.ErrorCode: %d", panelNum, transId, eventCode, result.ErrorCode);
@@ -480,6 +514,16 @@ function formatTime(date)
 function updateData()
 {
 	console.info('updateData()');
+
+	// check if we got additional or less calendars since our last update
+	var newCalendarList = listCalendars();
+	if (newCalendarList.length != calendarList.length) {
+		calendarList = newCalendarList;
+		updateCalendarColors();
+		cancelNotification();
+		requestNotification();
+	}
+	
 	try {
 		// meetings have time
 		// note: anniveraries have a start time of 12:00am. So since we want to include them, we have to query the whole day and check if events have passed later
@@ -487,6 +531,9 @@ function updateData()
 		summertime = isSummertime(now); // cache summer time info for today
 		var meetingList = [];
 		for(var i=0; i < calendarList.length; i++) {
+			// ignore excluded calendars
+			if (config['excludedCalendars'].Value.indexOf(calendarList[i]) != -1)
+				continue;
 			var meetingListFiltering = {
 				Type:'CalendarEntry',
 				Filter:{
@@ -499,7 +546,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);
@@ -509,6 +556,9 @@ function updateData()
 		if (config['includeTodos'].Value) {
 			var todayTodoList = [];
 			for(var i=0; i < calendarList.length; i++) {
+				// ignore excluded calendars
+				if (config['excludedCalendars'].Value.indexOf(calendarList[i]) != -1)
+					continue;
 				var todayTodoListFiltering = {
 					Type:'CalendarEntry',
 					Filter:{
@@ -520,7 +570,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);
@@ -685,7 +735,11 @@ function updateData()
 				}
 
 				// generate html output
-				entriesHtml += '<tr><td><img class="icon" src="' + entry.Type + '.png" /></td>';
+				entriesHtml += '<tr>';
+				if (config['showCalendarIndicator'].Value && calendarList.length - config['excludedCalendars'].Value.length > 1) {
+					entriesHtml += '<td><span class="calendar' + calendarColors[entry.CalendarName] + '">&nbsp;</span></td>';
+				}
+				entriesHtml += '<td><img class="icon" src="' + entry.Type + '.png" /></td>';
 				if(date == null) {
 					// some languages have very strange locale date formats, can't parse all those. Also some todos don't have dates at all.
 					entriesHtml += '<td colspan="4"><span class="date">' + entryDate + '</span> ';
@@ -788,12 +842,12 @@ function init()
 
 	calendarList = listCalendars();
 	loadSettings();
+	updateCalendarColors();
 	collectLocales();
 	//updateData();
 	requestNotification();
-	window.setInterval('updateData()', 1000 * 60 * config['updateDataInterval'].Value);
 	document.getElementById("settingsTitle").innerHTML = getLocalizedText('menu.settings');
-
+	setUpdateTimer();
 	if (window.innerHeight > 91) {
 		mode = 0; // we're starting fullscreen, we set mode to homescreen in order to let updateScreen() do all the work for us
 	}
@@ -804,10 +858,26 @@ function init()
 	updateScreen();
 	if (config['useBackgroundImage'].Value)
 		// check for screen rotation every 1 secs
-		window.setInterval('updateScreen()', 1000 * 1);
+		screenRotationTimer = window.setInterval('updateScreen()', 1000 * 1);
 	console.info("init(): finished...");
 }
 
+function setUpdateTimer()
+{
+	updateTimer = window.setInterval('updateTimerCallback()', 1000 * 60 * config['updateDataInterval'].Value);
+}
+
+function clearUpdateTimer() 
+{
+	window.clearInterval(updateTimer);
+}
+
+function updateTimerCallback()
+{
+	console.info("updateTimerCallback()");
+	updateData();
+}
+
 function createMenu()
 {
 	window.menu.setLeftSoftkeyLabel("",null);
@@ -854,6 +924,16 @@ function showSettings()
 				if (config[key].ValidValues.indexOf(config[key].Value) == -1)
 					config[key].Value = config[key].Default;
 			}
+			else if (config[key].Type == 'Array') {
+				if (key == 'excludedCalendars') {
+					config[key].Value = new Array();
+					for(var i=0; i < calendarList.length; i++) {
+						var element = document.forms[0].elements["settings." + key + "." + calendarList[i]];
+						if (element != null && element.checked == false)
+							config[key].Value.push(calendarList[i]);
+					}
+				}
+			}
 		}
 				
 		updateCssClasses();
@@ -889,6 +969,18 @@ function showSettings()
 				settingsHtml += '<option value="' + config[key].ValidValues[i] + '"' + (config[key].Value == config[key].ValidValues[i] ? ' selected="selected"' : '') + '>' + getLocalizedText('settings.validValues.' + key + '.' + config[key].ValidValues[i]) + '</option>';
 			settingsHtml += '</select></div></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
 		}
+		else if (config[key].Type == 'Array') {
+			settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br />';
+			if (key == 'excludedCalendars') {
+				for(var i=0; i < calendarList.length; i++) {
+					var checked = 'checked="checked"';
+					if (config[key].Value.indexOf(calendarList[i]) != -1)
+						checked = '';
+					settingsHtml += '<input name="settings.' + key + '.' + calendarList[i] + '" type="checkbox" value="' + calendarList[i] + '" ' + checked + '/> ' + calendarList[i] + '<br />';
+				}
+			}
+			settingsHtml += '</td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
+		}
 	}
 	settingsHtml += '<input name="reset" type="button" value="' + getLocalizedText('settings.restoreDefaults') + '" onclick="javascript:restoreDefaultSettings();showSettings();" />';
 	settingsHtml += '</form>';
@@ -1005,6 +1097,8 @@ function loadSettings()
 					config[key].Value = value;
 				else if (config[key].Type == 'UID')
 					config[key].Value = Number(value);
+				else if (config[key].Type == 'Array')
+					config[key].Value = value.split("^");
 			}
 			settingsCache = entry.Summary;
 			updateCssClasses();
@@ -1038,6 +1132,8 @@ function saveSettings()
 			item.Summary += key + "=" + config[key].Value + "|";
 		else if (config[key].Type == 'UID')
 			item.Summary += key + "=" + config[key].Value.toString() + "|";
+		else if (config[key].Type == 'Array')
+			item.Summary += key + "=" + config[key].Value.join("^") + "|";
 	}
 	settingsCache = item.Summary;
 	
@@ -1053,6 +1149,9 @@ function saveSettings()
 	} catch (e) {
 		error("saveSettings: " + e + ', line ' + e.line);
 	}
+	
+	clearUpdateTimer();
+	setUpdateTimer();
 }
 
 function toggleVisibility(elementId)
@@ -1251,7 +1350,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;
@@ -1261,6 +1361,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 + ", ";
 	}
@@ -1334,6 +1438,18 @@ function sortCalendarEntries(a, b)
 	return 0;
 }
 
+function updateCalendarColors()
+{
+	var maxColors = 6;
+	calendarColors = [];
+	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 % maxColors) + 1;
+	}
+}
+
 </script>
 
 <style type="text/css">
@@ -1345,7 +1461,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; }
@@ -1380,8 +1496,10 @@ hr { color:#ffffff; background-color:#ffffff; height:1px; text-align:left; borde
 		<p class="credits">Christophe Milsent (translation support & french translation)</p>
 		<p class="credits">Flavio Nathan (portuguese-brazilian translation)</p>
 		<p class="credits">Tokeda (russian translation)</p>
+		<p class="credits">Marcella Ferrari (italian translation)</p>
+		<p class="credits">Venos (italian translation)</p>
 	<p>This software is open source and licensed under the GPLv3.</p>
-	<p>Visit sourceforge.net/projects/comingnext for free updates.</p>
+	<p>Visit <a href="http://sourceforge.net/projects/comingnext">sourceforge.net/projects/comingnext</a> for free updates.</p>
 	<hr />
 </div>
 <div id="updateView" style="display:none">