.now { }\r
.description { }\r
.icon { }\r
+.overdue {}\r
</style>\r
\r
<script type="text/javascript" src="localizedTextStrings.js" charset="utf-8" />\r
tomorrowText: { Type: 'String', Default: getLocalizedText('settings.default.tomorrowText'), Value: getLocalizedText('settings.default.tomorrowText'),},\r
showNowAsText: { Type: 'Bool', Default: true, Value: true,},\r
nowText: { Type: 'String', Default: getLocalizedText('settings.default.nowText'), Value: getLocalizedText('settings.default.nowText'),},\r
+ markOverdueTodos: { Type: 'Bool', Default: true, Value: true,},\r
+ overdueText: {Type: 'String', Default: getLocalizedText('settings.default.overdueText'), Value: getLocalizedText('settings.default.overdueText'),},\r
dateSeparator: { Type: 'String', Default: getLocalizedText('settings.default.dateSeparator'), Value: getLocalizedText('settings.default.dateSeparator'),},\r
dateFormat: { Type: 'Enum', Default: 'auto', Value: 'auto', ValidValues: ['auto', 'DDMM', 'MMDD'],},\r
weekDayLength: { Type: 'Int', Default: 2, Value: 2,},\r
cssStyle_now: { Type: 'String', Default: 'color:#ff00ff', Value: 'color:#ff00ff',},\r
cssStyle_description: { Type: 'String', Default: '', Value: '',},\r
cssStyle_icon: { Type: 'String', Default: 'width:15px; height:15px', Value: 'width:15px; height:15px',},\r
+ cssStyle_overdue: { Type: 'String', Default: 'color:#ffff00', Value: 'color:#ffff00',},\r
}\r
\r
\r
// Nothing of interest from here on...\r
//-------------------------------------------------------\r
var panelNum = 0; // use 1 for second panel\r
-var version = "1.26";\r
+var version = "1.29";\r
var versionURL = "http://comingnext.sourceforge.net/version.xml";\r
var calendarService = null;\r
var cacheEntriesHtml = [];\r
var now = new Date();\r
var mode = 0; // 0 = homescreen, 1 = fullscreen, 2 = settings, 3 = about, 4 = check for update\r
var reqV = null; \r
+var settingsCalEntryId = null;\r
+var settingsCache = null;\r
+var notificationRequest1;\r
+var notificationRequest2;\r
+var calendarList = [];\r
\r
// vars for daylight saving time\r
var daylightsavingWinter = 0;\r
var daylightsavingSummer = 0;\r
var summertime = false;\r
\r
+// this is a list of data fields a calendar event can have\r
+var entryFields = [\r
+ "id",\r
+ "Type",\r
+ "Summary",\r
+ "Location",\r
+ "Status",\r
+ "StartTime",\r
+ "EndTime",\r
+ "InstanceStartTime",\r
+ "InstanceEndTime"\r
+];\r
+\r
window.onload = init;\r
window.onresize = updateScreen;\r
window.onshow = updateScreen;\r
\r
function collectLocales()\r
{\r
- var tmpyear = ((panelNum == 0) ? 2000 : 2001);\r
+ var tmpyear = 2000 + panelNum;\r
var month = 0;\r
\r
if (months_translated.length > 0)\r
criteria.Type = "CalendarEntry";\r
\r
try {\r
- var result = calendarService.IDataSource.RequestNotification(criteria, callback);\r
- if (result.ErrorCode)\r
- error('loading Calendar items list');\r
+ notificationRequest1 = calendarService.IDataSource.RequestNotification(criteria, callback);\r
+ if (notificationRequest1.ErrorCode)\r
+ error('requestNotification failed with error code ' + notificationRequest1.ErrorCode);\r
+ } catch (e) {\r
+ error("requestNotification: " + e + ', line ' + e.line);\r
+ }\r
+\r
+ var criteria2 = new Object();\r
+ criteria2.Type = "CalendarEntry";\r
+ criteria2.Filter = new Object();\r
+ criteria2.Filter.LocalIdList = new Array();\r
+ criteria2.Filter.LocalIdList[0] = settingsCalEntryId;\r
+\r
+ try {\r
+ notificationRequest2 = calendarService.IDataSource.RequestNotification(criteria2, settingsCallback);\r
+ if (notificationRequest2.ErrorCode)\r
+ error('requestNotification failed with error code ' + notificationRequest2.ErrorCode);\r
} catch (e) {\r
error("requestNotification: " + e + ', line ' + e.line);\r
}\r
\r
function callback(transId, eventCode, result)\r
{\r
+ console.info("callback(): panelNum: %d transId: %d eventCode: %d result.ErrorCode: %d", panelNum, transId, eventCode, result.ErrorCode);\r
updateData();\r
}\r
\r
+function settingsCallback(transId, eventCode, result)\r
+{\r
+ console.info("settingsCallback(): panelNum: %d transId: %d eventCode: %d result.ErrorCode: %d", panelNum, transId, eventCode, result.ErrorCode);\r
+ loadSettings();\r
+}\r
+\r
function parseDate(dateString)\r
{\r
/*\r
// meetings have time\r
// 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\r
now = new Date();\r
- var meetingListFiltering = {\r
- Type:'CalendarEntry',\r
- Filter:{\r
- StartRange: (new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0)),\r
- EndRange: (new Date(now.getFullYear(), now.getMonth() + config['monthRange'].Value, now.getDate(), 0, 0, 0))\r
+ var meetingList = [];\r
+ for(var i=0; i < calendarList.length; i++) {\r
+ var meetingListFiltering = {\r
+ Type:'CalendarEntry',\r
+ Filter:{\r
+ CalendarName: calendarList[i],\r
+ StartRange: (new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0)),\r
+ EndRange: (new Date(now.getFullYear(), now.getMonth() + config['monthRange'].Value, now.getDate(), 0, 0, 0))\r
+ }\r
}\r
+ var meetingResult = calendarService.IDataSource.GetList(meetingListFiltering);\r
+ if (meetingResult.ErrorCode != 0)\r
+ throw("Error fetching calendar data: " + meetingResult.ErrorCode + ': ' + meetingResult.ErrorMessage);\r
+ var list = meetingResult.ReturnValue;\r
+ meetingList = meetingList.concat(listToArray(list));\r
}\r
- var meetingResult = calendarService.IDataSource.GetList(meetingListFiltering);\r
- if (meetingResult.ErrorCode != 0)\r
- throw("Error fetching calendar data: " + meetingResult.ErrorCode + ': ' + meetingResult.ErrorMessage);\r
- var meetingList = meetingResult.ReturnValue;\r
+ console.info("updateData(): meetingList.sort()");\r
+ meetingList.sort(sortCalendarEntries);\r
\r
// todos don't, they start on 00:00 hrs., but should be visible anyway\r
// this will generate a list of passed todos. We have to check if they have been marked as "done" yet\r
if (config['includeTodos'].Value) {\r
- var todayTodoListFiltering = {\r
- Type:'CalendarEntry',\r
- Filter:{\r
- Type: 'ToDo',\r
- StartRange: (new Date(now.getFullYear() - 1, now.getMonth(), now.getDate(), 0, 0, 0)),\r
- EndRange: (new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 1))\r
+ var todayTodoList = [];\r
+ for(var i=0; i < calendarList.length; i++) {\r
+ var todayTodoListFiltering = {\r
+ Type:'CalendarEntry',\r
+ Filter:{\r
+ CalendarName: calendarList[i],\r
+ Type: 'ToDo',\r
+ StartRange: (new Date(now.getFullYear() - 1, now.getMonth(), now.getDate(), 0, 0, 0)),\r
+ EndRange: (new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 1))\r
+ }\r
}\r
+ var todayTodoResult = calendarService.IDataSource.GetList(todayTodoListFiltering);\r
+ var list = todayTodoResult.ReturnValue;\r
+ todayTodoList = todayTodoList.concat(listToArray(list));\r
}\r
- var todayTodoResult = calendarService.IDataSource.GetList(todayTodoListFiltering);\r
- var todayTodoList = todayTodoResult.ReturnValue;\r
+ console.info("updateData(): todayTodoList.sort()");\r
+ todayTodoList.sort(sortCalendarEntries);\r
var entryLists = [todayTodoList, meetingList];\r
} else {\r
var entryLists = [meetingList];\r
var counter = 0;\r
var entryDate = '';\r
var dateArr = [];\r
- var entriesHtml = '<table>';\r
+ var fontsize = 'normal';\r
+ if (mode == 0) {\r
+ if (config['eventsPerWidget'].Value == 3) {\r
+ fontsize = '17pt';\r
+ changeCssClass('.icon', 'width:20px; height:20px');\r
+ }\r
+ else if (config['eventsPerWidget'].Value == 5) {\r
+ fontsize = '10pt';\r
+ changeCssClass('.icon', 'width:10px; height:10px');\r
+ }\r
+ else if (config['eventsPerWidget'].Value == 6) {\r
+ fontsize = '8pt';\r
+ changeCssClass('.icon', 'width:8px; height:8px');\r
+ }\r
+ }\r
+ else\r
+ changeCssClass('.icon', config['cssStyle_icon'].Value);\r
+ var entriesHtml = '<table style="font-size:' + fontsize + ';">';\r
var eventIds = [];\r
var max;\r
if (mode == 0)\r
- max = ((panelNum == 0) ? config['eventsPerWidget'].Value : 2 * config['eventsPerWidget'].Value);\r
+ max = (panelNum + 1) * config['eventsPerWidget'].Value;\r
else\r
max = 30; // we can display a lot more events in fullscreen mode\r
\r
+ var listinfo = "";\r
+ for (var i=0; i < entryLists.length; i++) {\r
+ listinfo = listinfo + " " + entryLists[i].length;\r
+ var entrieslist = "";\r
+ for (var j=0; j < entryLists[i].length; j++) {\r
+ entrieslist += entryLists[i][j].Summary + ", ";\r
+ }\r
+ console.info("updateData(): entrieslist: " + entrieslist);\r
+ }\r
+ console.info("updateData(): inner loop, " + entryLists.length + " lists, [" + listinfo + "] entries");\r
+ \r
// the first outer loop iteration is for passed ToDos, the second loop is for all upcomming events (may also include ToDos)\r
for (var i=0; counter < max && i < entryLists.length; i++) {\r
- while (counter < max && (entry = entryLists[i].getNext()) != undefined) {\r
+ for (var j=0; (counter < max) && (j < entryLists[i].length); j++) {\r
+ entry = entryLists[i][j];\r
counter++;\r
\r
// output event info for debugging\r
- console.info(\r
- 'event: Id=' + entry.id + \r
- ',Type=' + entry.Type + \r
- ',Summary=' + entry.Summary + \r
- ',Location=' + entry.Location + \r
- ',Status=' + entry.Status + \r
- ',StartTime=' + entry.StartTime +\r
- ',EndTime=' + entry.EndTime +\r
- ',InstanceStartTime=' + entry.InstanceStartTime +\r
- ',InstanceEndTime=' + entry.InstanceEndTime\r
- );\r
+ var entryInfo = "event: ";\r
+ for(var k=0; k < entryFields.length; ++k) {\r
+ if (entry[entryFields[k]] != undefined) {\r
+ entryInfo += entryFields[k] + "=" + entry[entryFields[k]] + ",";\r
+ }\r
+ }\r
+ console.info(entryInfo);\r
\r
// we don't want ToDos when includeTodos == false or when they are completed\r
if (entry.Type == 'ToDo' && (entry.Status == "TodoCompleted" || !config['includeTodos'].Value)) {\r
}\r
\r
// skip events for the first panel in case this is the second one and we're not in fullscreen mode\r
- if (mode == 0 && panelNum == 1 && counter < config['eventsPerWidget'].Value + 1) {\r
+ if (mode == 0 && panelNum > 0 && counter < panelNum * config['eventsPerWidget'].Value + 1) {\r
console.info('skipping (already in first widget) ' + entry.id);\r
continue;\r
}\r
+ \r
+ // mark overdue todos\r
+ var overdue = false;\r
+ if (entry.Type == 'ToDo' && date != null) {\r
+ var tmp1 = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0,0,0);\r
+ var tmp2 = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0,0,0);\r
+ if (tmp1.getTime() < tmp2.getTime()) {\r
+ overdue = true;\r
+ }\r
+ }\r
\r
// generate html output\r
entriesHtml += '<tr><td><img class="icon" src="' + entry.Type + '.png" /></td>';\r
var weekDay = date.toLocaleDateString().substr(0,config['weekDayLength'].Value);\r
var time = formatTime(date);\r
var dateStr = formatDate(date, entryDate);\r
- if (entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder') {\r
+ if (entry.Type == 'ToDo' && overdue && config['markOverdueTodos'].Value) {\r
+ dateStr = '<span class="overdue">' + config['overdueText'].Value + '</span>';\r
+ entriesHtml += '<td colspan="4" width="1px"><span class="date">' + dateStr + '</span> ';\r
+ } else if (entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder') {\r
if ((isToday(date) || isTomorrow(date)) && config['showTodayAsText'].Value) // show weekday if the date string is not text. looks odd otherwise\r
entriesHtml += '<td colspan="4" width="1px"><span class="date">' + dateStr + '</span> ';\r
else\r
return;\r
}\r
\r
+ calendarList = listCalendars();\r
loadSettings();\r
- updateCssClasses();\r
collectLocales();\r
//updateData();\r
requestNotification();\r
window.setInterval('updateData()', 1000 * 60 * config['updateDataInterval'].Value);\r
+ document.getElementById("settingsTitle").innerHTML = getLocalizedText('menu.settings');\r
\r
- mode = 0;\r
- showHomescreen();\r
+ if (window.innerHeight > 91) {\r
+ mode = 0; // we're starting fullscreen, we set mode to homescreen in order to let updateScreen() do all the work for us\r
+ }\r
+ else {\r
+ mode = 1;\r
+ }\r
+ console.info("init(): updateScreen()");\r
updateScreen();\r
if (config['useBackgroundImage'].Value)\r
// check for screen rotation every 1 secs\r
window.setInterval('updateScreen()', 1000 * 1);\r
+ console.info("init(): finished...");\r
}\r
\r
function createMenu()\r
\r
var settingsHtml = '<form>';\r
for (var key in config) {\r
- if (config[key].Type == 'String')\r
- settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br /><input class="textInput" name="settings.' + key + '" type="text" value="' + config[key].Value + '" /></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';\r
+ if (config[key].Type == 'String') {\r
+ var prefix = "";\r
+ if (key.substring(0,9) == "cssStyle_")\r
+ prefix = getLocalizedText('settings.cssStyle_prefix');\r
+ settingsHtml += '<table><tr><td>' + prefix + getLocalizedText('settings.name.' + key) + '<br /><input class="textInput" name="settings.' + key + '" type="text" value="' + config[key].Value + '" /></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';\r
+ }\r
else if (config[key].Type == 'Int')\r
settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br /><input class="textInput" name="settings.' + key + '" type="text" value="' + config[key].Value + '" /></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';\r
else if (config[key].Type == 'Bool')\r
}\r
}\r
\r
+function getSettingsCalEntryId()\r
+{\r
+ if (settingsCalEntryId == null) {\r
+ // check if entry already exists\r
+ var listFiltering = {\r
+ Type:'CalendarEntry', \r
+ Filter:{\r
+ StartRange: new Date(2000, 0, 1),\r
+ EndRange: new Date(2000, 0, 1),\r
+ SearchText: 'ComingNext Settings|',\r
+ Type: 'DayEvent'\r
+ }\r
+ }\r
+ var result = calendarService.IDataSource.GetList(listFiltering);\r
+ if (result.ErrorCode) {\r
+ error(result.ErrorMessage);\r
+ return;\r
+ }\r
+ var list = result.ReturnValue;\r
+ var entry = list.getNext();\r
+ if (entry != undefined) {\r
+ settingsCalEntryId = entry.LocalId;\r
+ console.info("settingsCalEntryId=" + settingsCalEntryId);\r
+ }\r
+ else { // create settings item\r
+ var item = new Object();\r
+ item.Type = "DayEvent";\r
+ item.StartTime = new Date(2000, 0, 1);\r
+ item.Summary = "ComingNext Settings|";\r
+ \r
+ var criteria = new Object();\r
+ criteria.Type = "CalendarEntry";\r
+ criteria.Item = item;\r
+\r
+ try {\r
+ var result = calendarService.IDataSource.Add(criteria);\r
+ if (result.ErrorCode)\r
+ error(result.ErrorMessage);\r
+ } catch (e) {\r
+ error("getSettingsCalEntryId: " + e + ', line ' + e.line);\r
+ }\r
+\r
+ getSettingsCalEntryId();\r
+ }\r
+ }\r
+}\r
+\r
function restoreDefaultSettings()\r
{\r
for (var key in config)\r
\r
function loadSettings()\r
{\r
- for (var key in config) {\r
- if (widget.preferenceForKey(key)) {\r
- if (config[key].Type == 'Int')\r
- config[key].Value = Number(widget.preferenceForKey(key));\r
- else if (config[key].Type == 'String')\r
- config[key].Value = widget.preferenceForKey(key);\r
- else if (config[key].Type == 'Bool')\r
- config[key].Value = (widget.preferenceForKey(key) == 'true')\r
- else if (config[key].Type == 'Enum')\r
- config[key].Value = widget.preferenceForKey(key);\r
- else if (config[key].Type == 'UID')\r
- config[key].Value = Number(widget.preferenceForKey(key));\r
+ getSettingsCalEntryId();\r
+ var listFiltering = {\r
+ Type:'CalendarEntry', \r
+ Filter:{\r
+ LocalId: settingsCalEntryId\r
}\r
- else\r
- config[key].Value = config[key].Default;\r
- console.info('Settings: ' + key + '=\'' + config[key].Value + '\'');\r
+ }\r
+ var result = calendarService.IDataSource.GetList(listFiltering);\r
+ if (result.ErrorCode) {\r
+ error(result.ErrorMessage);\r
+ return;\r
+ }\r
+ var entry = result.ReturnValue.getNext();\r
+ if (entry != undefined) {\r
+ console.info("Loading Settings...");\r
+ // only reload settings if they chanced since the last reload\r
+ if (settingsCache != entry.Summary)\r
+ {\r
+ restoreDefaultSettings();\r
+ var stringlist = entry.Summary.split("|");\r
+ // skip the first two entries, those contain header and version info\r
+ for(var i = 2; i < stringlist.length - 1; i++) {\r
+ var pair = stringlist[i].split('=');\r
+ var key = pair[0];\r
+ var value = pair[1];\r
+ console.info('stringlist: ' + key + '=\'' + value + '\'');\r
+ if (config[key].Type == 'Int')\r
+ config[key].Value = Number(value);\r
+ else if (config[key].Type == 'String')\r
+ config[key].Value = value;\r
+ else if (config[key].Type == 'Bool')\r
+ config[key].Value = (value == 'true')\r
+ else if (config[key].Type == 'Enum')\r
+ config[key].Value = value;\r
+ else if (config[key].Type == 'UID')\r
+ config[key].Value = Number(value);\r
+ }\r
+ settingsCache = entry.Summary;\r
+ updateCssClasses();\r
+ }\r
+ else {\r
+ console.info("Settings already cached and did not change");\r
+ }\r
+ }\r
+ else {\r
+ error("Failed to load settings, calendar entry could not be found");\r
}\r
}\r
\r
function saveSettings()\r
{\r
+ getSettingsCalEntryId();\r
+ var item = new Object();\r
+ item.Type = "DayEvent";\r
+ item.StartTime = new Date(2000, 0, 1);\r
+ item.LocalId = settingsCalEntryId;\r
+ item.Summary = "ComingNext Settings|" + version + "|";\r
+\r
for (var key in config) {\r
if (config[key].Type == 'Int')\r
- widget.setPreferenceForKey(config[key].Value.toString(), key);\r
+ item.Summary += key + "=" + config[key].Value.toString() + "|";\r
else if (config[key].Type == 'String')\r
- widget.setPreferenceForKey(config[key].Value, key);\r
+ item.Summary += key + "=" + config[key].Value + "|";\r
else if (config[key].Type == 'Bool')\r
- widget.setPreferenceForKey(config[key].Value ? 'true' : 'false', key);\r
+ item.Summary += key + "=" + (config[key].Value ? 'true' : 'false') + "|";\r
else if (config[key].Type == 'Enum')\r
- widget.setPreferenceForKey(config[key].Value, key);\r
+ item.Summary += key + "=" + config[key].Value + "|";\r
else if (config[key].Type == 'UID')\r
- widget.setPreferenceForKey(config[key].Value.toString(), key);\r
+ item.Summary += key + "=" + config[key].Value.toString() + "|";\r
+ }\r
+ settingsCache = item.Summary;\r
+ \r
+ var criteria = new Object();\r
+ criteria.Type = "CalendarEntry";\r
+ criteria.Item = item;\r
+\r
+ console.info("Saving settings to calendar entry: " + item.Summary);\r
+ try {\r
+ var result = calendarService.IDataSource.Add(criteria);\r
+ if (result.ErrorCode)\r
+ error(result.ErrorMessage);\r
+ } catch (e) {\r
+ error("saveSettings: " + e + ', line ' + e.line);\r
}\r
}\r
\r
\r
function showFullscreen()\r
{\r
+ console.info("showFullscreen()");\r
hideViews();\r
document.getElementById("fullscreenView").style.display = "block";\r
document.getElementById('body').className = "backgroundFullscreen";\r
\r
function showHomescreen()\r
{\r
+ console.info("showHomescreen()");\r
hideViews();\r
document.getElementById("homescreenView").style.display = "block";\r
document.getElementById('body').className = "background";\r
document.getElementById("settingsView").style.display = "none";\r
document.getElementById("updateView").style.display = "none";\r
}\r
+\r
+function listCalendars()\r
+{\r
+ try {\r
+ var criteria = {\r
+ Type:'Calendar', \r
+ Filter:{\r
+ DefaultCalendar: false\r
+ }\r
+ }\r
+ \r
+ var calendarsResult = calendarService.IDataSource.GetList(criteria);\r
+ if (calendarsResult.ErrorCode != 0)\r
+ throw("Error fetching list of calendars: " + calendarsResult.ErrorCode + ': ' + calendarsResult.ErrorMessage);\r
+ var calendarListIterator = calendarsResult.ReturnValue;\r
+ \r
+ var calendars = [];\r
+ var count = 0;\r
+ var item;\r
+ while (( item = calendarListIterator.getNext()) != undefined ) {\r
+ calendars[count++] = item;\r
+ }\r
+ console.info("Available Calendars: " + calendars.join(", "));\r
+ return calendars;\r
+ } catch(e) {\r
+ error('listing calendars:' + e + ', line ' + e.line);\r
+ return null;\r
+ }\r
+}\r
+\r
+// Copies all objects and their properties to an array. Data is copied so nothing gets lost when the reference is removed\r
+function listToArray(list)\r
+{\r
+ var array = new Array();\r
+ var item;\r
+ var txt = "";\r
+ while (( item = list.getNext()) != undefined ) {\r
+ var itemCopy = new Object();\r
+ for(var i=0; i < entryFields.length; i++) {\r
+ itemCopy[entryFields[i]] = item[entryFields[i]];\r
+ }\r
+ array.push(itemCopy);\r
+ txt += array[array.length - 1].Summary + ", ";\r
+ }\r
+ console.info("listToArray(): " + txt);\r
+ return array;\r
+}\r
+\r
+function sortCalendarEntries(a, b)\r
+{\r
+ var atime, btime;\r
+ console.info("sortCalendarEntries(" + a.Summary + "," + b.Summary + ")");\r
+ \r
+ if (a.InstanceStartTime != null) {\r
+ atime = a.InstanceStartTime;\r
+ }\r
+ else if (a.StartTime != null) {\r
+ atime = a.StartTime;\r
+ }\r
+ else if (a.InstanceEndTime != null) {\r
+ atime = a.InstanceEndTime;\r
+ }\r
+ else if (a.EndTime != null) {\r
+ atime = a.EndTime;\r
+ }\r
+ \r
+ if (b.InstanceStartTime != null) {\r
+ btime = b.InstanceStartTime;\r
+ }\r
+ else if (b.StartTime != null) {\r
+ btime = b.StartTime;\r
+ }\r
+ else if (b.InstanceEndTime != null) {\r
+ btime = b.InstanceEndTime;\r
+ }\r
+ else if (b.EndTime != null) {\r
+ btime = b.EndTime;\r
+ }\r
+ \r
+ if (atime && btime) {\r
+ \r
+ atime = parseDate(atime);\r
+ btime = parseDate(btime);\r
+ \r
+ // sort by date & time\r
+ if (atime < btime) {\r
+ return -1;\r
+ }\r
+ else if (atime > btime) {\r
+ return 1;\r
+ }\r
+ // sort by type\r
+ else if (a.Type != b.Type) {\r
+ if (a.Type < b.Type) {\r
+ return -1;\r
+ }\r
+ else if (a.Type > b.Type) {\r
+ return 1;\r
+ }\r
+ }\r
+ // sort by description\r
+ else if (a.Summary && b.Summary && a.Summary != b.Summary) {\r
+ if (a.Summary < b.Summary) {\r
+ return -1;\r
+ }\r
+ else if (a.Summary > b.Summary) {\r
+ return 1;\r
+ }\r
+ }\r
+ }\r
+\r
+ return 0;\r
+}\r
+\r
</script>\r
\r
<style type="text/css">\r
</div>\r
<div id="settingsView" style="display:none">\r
<img src="Icon.png" id="smallappicon">\r
- <h1 class="title">Settings</h1>\r
+ <h1 id="settingsTitle" class="title">Settings</h1>\r
<hr />\r
<div id="settingsList"></div>\r
</div>\r
<p>Contributions:</p>\r
<p class="credits">Paul Moore (bug fixes, new features and code cleanup)</p>\r
<p class="credits">Manfred Hanselmann (DST support)</p>\r
- <p class="credits">Christophe Milsent (translation support & french translation</p>\r
- <p class="credits">Flavio Nathan (portuguese-brazilian translation</p>\r
+ <p class="credits">Christophe Milsent (translation support & french translation)</p>\r
+ <p class="credits">Flavio Nathan (portuguese-brazilian translation)</p>\r
+ <p class="credits">Tokeda (russian translation)</p>\r
<p>This software is open source and licensed under the GPLv3.</p>\r
<p>Visit sourceforge.net/projects/comingnext for free updates.</p>\r
<hr />\r