From 6a8ec3c64141e71b73af3da30a7e780cceb12c01 Mon Sep 17 00:00:00 2001 From: Michael Prager Date: Wed, 13 Oct 2010 02:37:42 +0200 Subject: [PATCH] added more debug output to help fixing future sorting problems also added some minor code cleanups --- comingNext/index.html | 86 ++++++++++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 34 deletions(-) diff --git a/comingNext/index.html b/comingNext/index.html index ce12153..9b4b815 100644 --- a/comingNext/index.html +++ b/comingNext/index.html @@ -488,6 +488,7 @@ function updateData() var list = meetingResult.ReturnValue; meetingList = meetingList.concat(listToArray(list)); } + console.info("updateData(): meetingList.sort()"); meetingList.sort(sortCalendarEntries); // todos don't, they start on 00:00 hrs., but should be visible anyway @@ -508,6 +509,7 @@ function updateData() var list = todayTodoResult.ReturnValue; todayTodoList = todayTodoList.concat(listToArray(list)); } + console.info("updateData(): todayTodoList.sort()"); todayTodoList.sort(sortCalendarEntries); var entryLists = [todayTodoList, meetingList]; } else { @@ -548,6 +550,17 @@ function updateData() else max = 30; // we can display a lot more events in fullscreen mode + var listinfo = ""; + for (var i=0; i < entryLists.length; i++) { + listinfo = listinfo + " " + entryLists[i].length; + var entrieslist = ""; + for (var j=0; j < entryLists[i].length; j++) { + entrieslist += entryLists[i][j].Summary + ", "; + } + console.info("updateData(): entrieslist: " + entrieslist); + } + console.info("updateData(): inner loop, " + entryLists.length + " lists, [" + listinfo + "] entries"); + // the first outer loop iteration is for passed ToDos, the second loop is for all upcomming events (may also include ToDos) for (var i=0; counter < max && i < entryLists.length; i++) { for (var j=0; (counter < max) && (j < entryLists[i].length); j++) { @@ -555,17 +568,13 @@ function updateData() counter++; // output event info for debugging - console.info( - 'event: Id=' + entry.id + - ',Type=' + entry.Type + - ',Summary=' + entry.Summary + - ',Location=' + entry.Location + - ',Status=' + entry.Status + - ',StartTime=' + entry.StartTime + - ',EndTime=' + entry.EndTime + - ',InstanceStartTime=' + entry.InstanceStartTime + - ',InstanceEndTime=' + entry.InstanceEndTime - ); + var entryInfo = "event: "; + for(var k=0; k < entryFields.length; ++k) { + if (entry[entryFields[k]] != undefined) { + entryInfo += entryFields[k] + "=" + entry[entryFields[k]] + ","; + } + } + console.info(entryInfo); // we don't want ToDos when includeTodos == false or when they are completed if (entry.Type == 'ToDo' && (entry.Status == "TodoCompleted" || !config['includeTodos'].Value)) { @@ -778,10 +787,12 @@ function init() else { mode = 1; } + console.info("init(): updateScreen()"); updateScreen(); if (config['useBackgroundImage'].Value) // check for screen rotation every 1 secs window.setInterval('updateScreen()', 1000 * 1); + console.info("init(): finished..."); } function createMenu() @@ -959,6 +970,7 @@ function loadSettings() } var entry = result.ReturnValue.getNext(); if (entry != undefined) { + console.info("Loading Settings..."); // only reload settings if they chanced since the last reload if (settingsCache != entry.Summary) { @@ -984,6 +996,9 @@ function loadSettings() settingsCache = entry.Summary; updateCssClasses(); } + else { + console.info("Settings already cached and did not change"); + } } else { error("Failed to load settings, calendar entry could not be found"); @@ -1067,6 +1082,7 @@ function updateFullscreen() function showFullscreen() { + console.info("showFullscreen()"); hideViews(); document.getElementById("fullscreenView").style.display = "block"; document.getElementById('body').className = "backgroundFullscreen"; @@ -1111,6 +1127,7 @@ function updateHomescreen() function showHomescreen() { + console.info("showHomescreen()"); hideViews(); document.getElementById("homescreenView").style.display = "block"; document.getElementById('body').className = "background"; @@ -1241,31 +1258,32 @@ function listToArray(list) function sortCalendarEntries(a, b) { var atime, btime; + console.info("sortCalendarEntries(" + a.Summary + "," + b.Summary + ")"); - if (a['InstanceStartTime'] != null) { - atime = a['InstanceStartTime']; + if (a.InstanceStartTime != null) { + atime = a.InstanceStartTime; } - else if (a['StartTime'] != null) { - atime = a['StartTime']; + else if (a.StartTime != null) { + atime = a.StartTime; } - else if (a['InstanceEndTime'] != null) { - atime = a['InstanceEndTime']; + else if (a.InstanceEndTime != null) { + atime = a.InstanceEndTime; } - else if (a['EndTime'] != null) { - atime = a['EndTime']; + else if (a.EndTime != null) { + atime = a.EndTime; } - if (b['InstanceStartTime'] != null) { - btime = b['InstanceStartTime']; + if (b.InstanceStartTime != null) { + btime = b.InstanceStartTime; } - else if (b['StartTime'] != null) { - btime = b['StartTime']; + else if (b.StartTime != null) { + btime = b.StartTime; } - else if (b['InstanceEndTime'] != null) { - btime = b['InstanceEndTime']; + else if (b.InstanceEndTime != null) { + btime = b.InstanceEndTime; } - else if (b['EndTime'] != null) { - btime = b['EndTime']; + else if (b.EndTime != null) { + btime = b.EndTime; } if (atime && btime) { @@ -1281,23 +1299,23 @@ function sortCalendarEntries(a, b) return 1; } // sort by type - else if (a['Type'] != b['Type']) { - if (a['Type'] < b['Type']) { + else if (a.Type != b.Type) { + if (a.Type < b.Type) { return -1; } - else if (a['Type'] > b['Type']) { + else if (a.Type > b.Type) { return 1; } } // sort by description - else if (a['Summary'] && b['Summary'] && a['Summary'] != b['Summary']) { - if (a['Summary'] < b['Summary']) { + else if (a.Summary && b.Summary && a.Summary != b.Summary) { + if (a.Summary < b.Summary) { return -1; } - else if (a['Summary'] > b['Summary']) { + else if (a.Summary > b.Summary) { return 1; } - } + } } return 0; -- 2.39.2