X-Git-Url: https://code.delx.au/comingnext/blobdiff_plain/4bf0ee17df2c95a982630d6f80bf5d8e6136cf44..a9a526f3ccbfa637b9794a17eb26f16023a15414:/comingNext/index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index 47decb7..965702f 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -19,7 +19,7 @@
 .icon { }
 </style>
 
-<script type="text/javascript" src="localizedTextStrings.js" />
+<script type="text/javascript" src="localizedTextStrings.js" charset="utf-8" />
 
 <script>
 // valid types for the config object are 'Int', 'Bool', 'String', 'Enum', 'UID'
@@ -61,7 +61,7 @@ var config = {
 // Nothing of interest from here on...
 //-------------------------------------------------------
 var panelNum = 0; // use 1 for second panel
-var version = "1.24";
+var version = "1.25";
 var calendarService = null;
 var cacheEntriesHtml = [];
 var months_translated = [];
@@ -416,6 +416,7 @@ function formatTime(date)
 
 function updateData()
 {
+	console.info('updateData()');
 	calcDaylightSaving();
 	try {
 		// meetings have time
@@ -429,6 +430,8 @@ function updateData()
 			}
 		}
 		var meetingResult = calendarService.IDataSource.GetList(meetingListFiltering);
+		if (meetingResult.ErrorCode != 0)
+			throw("Error fetching calendar data: " + meetingResult.ErrorCode + ': ' + meetingResult.ErrorMessage);
 		var meetingList = meetingResult.ReturnValue;
 
 		// todos don't, they start on 00:00 hrs., but should be visible anyway
@@ -492,7 +495,7 @@ function updateData()
 				}
 
 				// make sure that we don't include an event twice (useful for ToDos that might come up twice)
-				if (eventIds[entry.id] == 1) {
+				if (eventIds[entry.id] == 1 && entry.Type == 'ToDo') {
 					console.info('skipped (already included) ' + entry.id);
 					counter--;
 					continue;
@@ -655,11 +658,16 @@ function launchCalendar()
 
 function init()
 {
+	console.info('New widget instance starting up...');
+	
 	try {
 		// call calendar service
-		calendarService = device.getServiceObject("Service.Calendar", "IDataSource");
+		if (device != "undefined")
+			calendarService = device.getServiceObject("Service.Calendar", "IDataSource");
+		else
+			throw('device object does not exist');
 	} catch(e) {
-		error('loading Calendar service');
+		error('loading Calendar service: ' + e + ', line ' + e.line);
 		return;
 	}
 
@@ -802,7 +810,7 @@ function loadSettings()
 		}
 		else
 			config[key].Value = config[key].Default;
-		
+		console.info('Settings: ' + key + '=\'' + config[key].Value + '\'');
 	}
 }