From fc721969528078fe6c623cc998c11f94a66fdbb0 Mon Sep 17 00:00:00 2001
From: Michael Prager <michael@pragers.de>
Date: Sun, 11 Oct 2009 13:46:48 +0200
Subject: [PATCH] added support for daylight saving time (DST)

---
 comingNext/index.html  |  78 +++++++++
 comingNextB/index.html | 350 ++++++++++++++++++++++++++---------------
 2 files changed, 301 insertions(+), 127 deletions(-)

diff --git a/comingNext/index.html b/comingNext/index.html
index 35d1632..9ec9f99 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -42,6 +42,7 @@ var calendarApp = 0x10005901;	// UID of the calendar app to run when clicking th
 var eventsPerWidget = 4;	// number of events to show per widget. Default is 4
 var showNothingText = true;	// if set to "true", show a text if no events are in the list
 var nothingText = 'No further events within ' + monthRange + ' months';		// text to show when no events are in the list
+var enableDaylightSaving = true;// enable this if you are in a timezone that has daylight saving time (+1h)
 
 //-------------------------------------------------------
 // Nothing of interest from here on...
@@ -53,10 +54,77 @@ var months_translated = [];
 var orientation = '';
 var now = new Date();
 
+// vars for daylight saving time
+var daylightsavingWinter = 0;
+var daylightsavingSummer = 0;
+var summertime = false;
+
 window.onload = init;
 window.onresize = updateScreen;
 window.onshow = updateScreen;
 
+function isLeapYear( year ) {
+	if (( year % 4 == 0 && year % 100 != 0 ) || year % 400 == 0 )
+		return true;
+	else
+		return false;
+}
+	  
+function calcLeapYear(year, days)
+{
+	if (isLeapYear(year))
+		return ++days;
+	else
+		return days;
+}
+	  
+function subToSunday(myDate, year, days, prevMonthDays)
+{
+	for (i = myDate.getDay(); i > 0 ;i--)
+		days--;
+	days -= prevMonthDays;
+	days = isLeapYear(year) ? --days : days;
+	return days;
+}
+	
+function calcDaylightSaving()
+{
+	var thisYearS = new Date(now.getFullYear(),  3, 0, 0, 0, 0 );
+	var thisYearW = new Date(now.getFullYear(), 10, 0, 0, 0, 0 );
+	var nextYearS = new Date(now.getFullYear() + 1,  3, 0, 0, 0, 0 );
+	var nextYearW = new Date(now.getFullYear() + 1, 10, 0, 0, 0, 0 );
+	var summer = false;
+	var winter = false;
+	
+	thisYearSDays = nextYearSDays = 90;
+	thisYearWDays = nextYearWDays = 304;
+	
+	thisYearSDays = calcLeapYear(now.getFullYear(), thisYearSDays);
+	thisYearWDays = calcLeapYear(now.getFullYear(), thisYearWDays);
+	nextYearSDays = calcLeapYear(now.getFullYear() + 1, nextYearSDays);
+	nextYearWDays = calcLeapYear(now.getFullYear() + 1, nextYearWDays);
+	
+	thisYearSDays = subToSunday(thisYearS, now.getFullYear(), thisYearSDays, 59);
+	thisYearWDays = subToSunday(thisYearW, now.getFullYear(), thisYearWDays, 273);
+	nextYearSDays = subToSunday(nextYearS, now.getFullYear() + 1, nextYearSDays, 59);
+	nextYearWDays = subToSunday(nextYearW, now.getFullYear() + 1, nextYearWDays, 273);
+	
+	daylightsavingSummer = new Date (now.getFullYear(), 03-1, thisYearSDays, 2, 0, 0);
+	daylightsavingWinter = new Date (now.getFullYear(), 10-1, thisYearWDays, 2, 0, 0);
+	if (daylightsavingSummer < now) {
+		daylightsavingSummer = new Date (now.getFullYear()+1, 03-1, nextYearSDays, 2, 0, 0);
+		var summer = true;
+	}
+	if (daylightsavingWinter < now) {
+		daylightsavingWinter = new Date (now.getFullYear()+1, 10-1, nextYearWDays, 2, 0, 0);
+		var winter = true;
+	}
+	if (summer && !winter)
+		summertime = true;
+	else
+		summertime = false;
+}
+
 function error(message)
 {
 	console.info('Error: ' + message);
@@ -242,6 +310,15 @@ function parseDate(dateString)
 
 	console.info('year=' + year + ' month=' + month + ' day=' + day + ' hours=' + hours + ' minutes=' + minutes+ ' seconds=' + seconds);
 
+	// take care of daylight saving time
+	if (enableDaylightSaving) {
+		var date = new Date(year, month - 1, day, hours, minutes, seconds);
+		if (summertime && date > daylightsavingWinter && date < daylightsavingSummer)
+			hours -= 1;
+		else if (!summertime && date > daylightsavingSummer && date < daylightsavingWinter)
+			hours += 1;
+	}
+
 	return new Date(year, month - 1, day, hours, minutes, seconds);
 }
 
@@ -313,6 +390,7 @@ function formatTime(date)
 
 function updateData()
 {
+	calcDaylightSaving();
 	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
diff --git a/comingNextB/index.html b/comingNextB/index.html
index 5a53715..b5631d3 100644
--- a/comingNextB/index.html
+++ b/comingNextB/index.html
@@ -2,7 +2,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+
 <title>Coming Next</title>
+
 <style type="text/css">
 /* -----------------------------------------------------------------------
 here you can customize background color, font color, font size etc...
@@ -17,7 +19,9 @@ here you can customize background color, font color, font size etc...
 .description { }			/* Defines the appearance of all event descriptions */
 .icon { width:15px; height:15px; }	/* Defines size and appearance of icons */
 </style>
+
 <script>
+
 //---------------------------------------------------------------
 // The following section contains settings you may want to tweak
 //---------------------------------------------------------------
@@ -37,7 +41,8 @@ var updateDataInterval = 5;	// how many minutes to wait before updating the disp
 var calendarApp = 0x10005901;	// UID of the calendar app to run when clicking the widget. 0x10005901 = buildin calendar, 0x20004ec1 = Epocware Handy Calendar
 var eventsPerWidget = 4;	// number of events to show per widget. Default is 4
 var showNothingText = true;	// if set to "true", show a text if no events are in the list
-var nothingText = 'No further events within '+monthRange+' months';		// text to show when no events are in the list
+var nothingText = 'No further events within ' + monthRange + ' months';		// text to show when no events are in the list
+var enableDaylightSaving = true;// enable this if you are in a timezone that has daylight saving time (+1h)
 
 //-------------------------------------------------------
 // Nothing of interest from here on...
@@ -49,23 +54,100 @@ var months_translated = [];
 var orientation = '';
 var now = new Date();
 
+// vars for daylight saving time
+var daylightsavingWinter = 0;
+var daylightsavingSummer = 0;
+var summertime = false;
+
 window.onload = init;
 window.onresize = updateScreen;
 window.onshow = updateScreen;
 
-function error(message){
+function isLeapYear( year ) {
+	if (( year % 4 == 0 && year % 100 != 0 ) || year % 400 == 0 )
+		return true;
+	else
+		return false;
+}
+	  
+function calcLeapYear(year, days)
+{
+	if (isLeapYear(year))
+		return ++days;
+	else
+		return days;
+}
+	  
+function subToSunday(myDate, year, days, prevMonthDays)
+{
+	for (i = myDate.getDay(); i > 0 ;i--)
+		days--;
+	days -= prevMonthDays;
+	days = isLeapYear(year) ? --days : days;
+	return days;
+}
+	
+function calcDaylightSaving()
+{
+	var thisYearS = new Date(now.getFullYear(),  3, 0, 0, 0, 0 );
+	var thisYearW = new Date(now.getFullYear(), 10, 0, 0, 0, 0 );
+	var nextYearS = new Date(now.getFullYear() + 1,  3, 0, 0, 0, 0 );
+	var nextYearW = new Date(now.getFullYear() + 1, 10, 0, 0, 0, 0 );
+	var summer = false;
+	var winter = false;
+	
+	thisYearSDays = nextYearSDays = 90;
+	thisYearWDays = nextYearWDays = 304;
+	
+	thisYearSDays = calcLeapYear(now.getFullYear(), thisYearSDays);
+	thisYearWDays = calcLeapYear(now.getFullYear(), thisYearWDays);
+	nextYearSDays = calcLeapYear(now.getFullYear() + 1, nextYearSDays);
+	nextYearWDays = calcLeapYear(now.getFullYear() + 1, nextYearWDays);
+	
+	thisYearSDays = subToSunday(thisYearS, now.getFullYear(), thisYearSDays, 59);
+	thisYearWDays = subToSunday(thisYearW, now.getFullYear(), thisYearWDays, 273);
+	nextYearSDays = subToSunday(nextYearS, now.getFullYear() + 1, nextYearSDays, 59);
+	nextYearWDays = subToSunday(nextYearW, now.getFullYear() + 1, nextYearWDays, 273);
+	
+	daylightsavingSummer = new Date (now.getFullYear(), 03-1, thisYearSDays, 2, 0, 0);
+	daylightsavingWinter = new Date (now.getFullYear(), 10-1, thisYearWDays, 2, 0, 0);
+	if (daylightsavingSummer < now) {
+		daylightsavingSummer = new Date (now.getFullYear()+1, 03-1, nextYearSDays, 2, 0, 0);
+		var summer = true;
+	}
+	if (daylightsavingWinter < now) {
+		daylightsavingWinter = new Date (now.getFullYear()+1, 10-1, nextYearWDays, 2, 0, 0);
+		var winter = true;
+	}
+	if (summer && !winter)
+		summertime = true;
+	else
+		summertime = false;
+}
+
+function error(message)
+{
 	console.info('Error: ' + message);
 	document.getElementById("calendarList").innerHTML = 'Error: ' + message;
 }
 
-function collectLocales(){
-	if (months_translated.length > 0){
-		return;
-	}
+function isToday(date)
+{
+	if (date.getDate() == now.getDate() && date.getMonth() == now.getMonth())
+		return true;
+	return false;
+}
+
+function collectLocales()
+{
 	var tmpyear = ((panelNum == 0) ? 2000 : 2001);
 	var month = 0;
-	for(month = 0; month < 12; month++){
+
+	if (months_translated.length > 0)
+		return;
+	for (month = 0; month < 12; month++) {
 		var startDate = new Date(tmpyear, month, 15);
+
 		var item = new Object();
 		item.Type = "DayEvent";
 		item.StartTime = startDate;
@@ -77,15 +159,13 @@ function collectLocales(){
 
 		try {
 			var result = calendarService.IDataSource.Add(criteria);
-			if (result.ErrorCode){
+			if (result.ErrorCode)
 				error(result.ErrorMessage);
-			}
-		}
-		catch (e) {
+		} catch (e) {
 			error("collectLocales: " + e + ', line ' + e.line);
 		}
 	}
-	try{
+	try {
 		var startTime = new Date(tmpyear,0,1);
 		var endTime = new Date(tmpyear,11,31);
 		var listFiltering = {
@@ -98,75 +178,80 @@ function collectLocales(){
 			}
 		}
 		var result = calendarService.IDataSource.GetList(listFiltering);
-		if (result.ErrorCode){
+		if (result.ErrorCode) {
 			error(result.ErrorMessage);
 			return;
 		}
 		var list = result.ReturnValue;
-	}catch(e){ 
+	} catch(e) {
 		error(e + ', line ' + e.line);
 		return;
 	}
 	var ids = new Array();
-	try{
+	try {
 		var entry;
 		var counter = 0;
 		var dateArr = [];
-		while( list && (entry = list.getNext()) != undefined ){
+
+		while (list && (entry = list.getNext()) != undefined) {
 			dateArr = entry.StartTime.replace(/,/g,'').replace(/\./g,':').replace(/  /g,' ').split(' ');
 			var day = dateArr[1];
 			var month = dateArr[2];
 			var year = dateArr[3];
+
 			// make sure month is set properly
-			if (isNaN(parseInt(day))){
+			if (isNaN(parseInt(day))) {
 				var tmp = day;
 				day = month;
 				month = tmp;
-			}
-			else if (isNaN(parseInt(year))){
+			} else if (isNaN(parseInt(year))) {
 				var tmp = year;
 				year = month;
 				month = tmp;
 			}
+
 			console.info(entry.StartTime + ' -> ' + month + ' ' + counter);
 			ids[counter] = entry.id;
 			months_translated[month] = counter + 1;
 			counter++;
 		}
-	}catch(e){
+	} catch(e) {
 		error(e + ', line ' + e.line);
 		return;
 	}
 	console.info(ids);
-	try{
+	try {
 		var criteria = new Object();
 		criteria.Type = "CalendarEntry";
 		criteria.Data = {
 			IdList: ids
 		}
+
 		var result = calendarService.IDataSource.Delete(criteria);
 		if (result.ErrorCode)
 			error(result.ErrorMessage);
-	}catch(e){
+	} catch(e) {
 		error('deleting temp calendar entries:' + e + ', line ' + e.line);
 		return;
 	}
 }
 
-function requestNotification(){
+function requestNotification()
+{
 	var criteria = new Object();
 	criteria.Type = "CalendarEntry";
+
 	try {
 		var result = calendarService.IDataSource.RequestNotification(criteria, callback);
 		if (result.ErrorCode)
 			error('loading Calendar items list');
-	}
-	catch (e) {
+	} catch (e) {
 		error("requestNotification: " + e + ', line ' + e.line);
 	}
 }
 
-function callback(transId, eventCode, result){
+function callback(transId, eventCode, result)
+{
 	updateData();
 }
 
@@ -181,33 +266,30 @@ function parseDate(dateString)
 	Wednesday,  2009 August, 28 8.00.00 pm
 	Wednesday,  2009 August, 28 08:00:00 PM
 	*/
+
 	if (dateString == "" || dateString == null)
 		return null;
-	
 	var dateArr = dateString.replace(/,/g,'').replace(/\./g,':').replace(/  /g,' ').split(' ');
-	
 	if (dateArr.length != 5 && dateArr.length != 6)
 		return null;
-	
+
 	// parse date
 	var weekDay = dateArr[0];
 	var day = dateArr[1];
 	var month = dateArr[2];
 	var year = dateArr[3];
 	// make sure month is set properly
-	if (isNaN(parseInt(day))){
+	if (isNaN(parseInt(day))) {
 		var tmp = day;
 		day = month;
 		month = tmp;
-	}
-	else if (isNaN(parseInt(year))){
+	} else if (isNaN(parseInt(year))) {
 		var tmp = year;
 		year = month;
 		month = tmp;
 	}
 	// make sure day and year are set properly
-	if (Number(day) > Number(year))
-	{
+	if (Number(day) > Number(year)) {
 		var tmp = year;
 		year = day;
 		day = tmp;
@@ -225,9 +307,18 @@ function parseDate(dateString)
 		hours += 12;
 	if (dateArr.length == 6 && dateArr[5].toLowerCase() == 'am' && hours == 12)
 		hours = 0;
-	
+
 	console.info('year=' + year + ' month=' + month + ' day=' + day + ' hours=' + hours + ' minutes=' + minutes+ ' seconds=' + seconds);
-	
+
+	// take care of daylight saving time
+	if (enableDaylightSaving) {
+		var date = new Date(year, month - 1, day, hours, minutes, seconds);
+		if (summertime && date > daylightsavingWinter && date < daylightsavingSummer)
+			hours -= 1;
+		else if (!summertime && date > daylightsavingSummer && date < daylightsavingWinter)
+			hours += 1;
+	}
+
 	return new Date(year, month - 1, day, hours, minutes, seconds);
 }
 
@@ -239,37 +330,36 @@ function formatDate(date, format)
 	while (day.length < 2) { day = '0' + day; }
 	while (month.length < 2) { month = '0' + month; }
 
-	if (showTodayAsText && now.getDate() == date.getDate() && now.getMonth() == date.getMonth())
+	if (showTodayAsText && isToday(date))
 		return '<span class="today">' + todayText + '</span>';
-	
+
 	var dateArr = format.replace(/,/g,'').replace(/\./g,':').replace(/  /g,' ').split(' ');
-	
-	if (dateArr.length != 5 && dateArr.length != 6){
+	if (dateArr.length != 5 && dateArr.length != 6) {
 		// we don't know how to format this
 		if (dateFormat == 'auto' || dateFormat == 'DDMM')
 			return day + dateSeparator + month;
-		else 
+		else
 			return month + dateSeparator + day;
 	}
-	
+
 	var dayFirst = true;
 	if (dateFormat == 'MMDD')
 		dayFirst = false;
 	else if (dateFormat == 'DDMM')
 		dayFirst = true;
-	else { // dateFormat == 'auto', try to detect system setting
+	else {
+		// dateFormat == 'auto', try to detect system setting
 		// parse date
 		var day_ = dateArr[1];
 		var month_ = dateArr[2];
 		var year_ = dateArr[3];
 		// make sure month is set properly
-		if (isNaN(parseInt(day_))){
+		if (isNaN(parseInt(day_))) {
 			var tmp = day_;
 			day_ = month_;
 			month_ = tmp;
 			dayFirst = false;
-		}
-		else if (isNaN(parseInt(year_))){
+		} else if (isNaN(parseInt(year_))) {
 			var tmp = year_;
 			year_ = month_;
 			month_ = tmp;
@@ -279,7 +369,7 @@ function formatDate(date, format)
 		if (Number(day_) > Number(year_))
 			dayFirst = false;
 	}
-	
+
 	if (dayFirst)
 		return day + dateSeparator + month;
 	else
@@ -298,25 +388,28 @@ function formatTime(date)
 	return time;
 }
 
-function updateData(){
-	try{
+function updateData()
+{
+	calcDaylightSaving();
+	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
 		now = new Date();
 		var meetingListFiltering = {
-			Type:'CalendarEntry', 
+			Type:'CalendarEntry',
 			Filter:{
-				StartRange: (new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0)), 
+				StartRange: (new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0)),
 				EndRange: (new Date(now.getFullYear(), now.getMonth() + monthRange, now.getDate(), 0, 0, 0))
 			}
 		}
 		var meetingResult = calendarService.IDataSource.GetList(meetingListFiltering);
 		var meetingList = meetingResult.ReturnValue;
+
 		// todos don't, they start on 00:00 hrs., but should be visible anyway
 		// this will generate a list of passed todos. We have to check if they have been marked as "done" yet
-		if (includeTodos){
+		if (includeTodos) {
 			var todayTodoListFiltering = {
-				Type:'CalendarEntry', 
+				Type:'CalendarEntry',
 				Filter:{
 					Type: 'ToDo',
 					StartRange: (new Date(now.getFullYear() - 1, now.getMonth(), now.getDate(), 0, 0, 0)),
@@ -329,12 +422,12 @@ function updateData(){
 		} else {
 			var entryLists = [meetingList];
 		}
-	}catch(e){ 
+	} catch(e) {
 		error('loading Calendar items list:' + e + ', line ' + e.line);
 		return;
 	}
-	
-	try{
+
+	try {
 		var entry;
 		var counter = 0;
 		var entryDate = '';
@@ -342,11 +435,12 @@ function updateData(){
 		var entriesHtml = '<table>';
 		var eventIds = [];
 		var max = ((panelNum == 0) ? eventsPerWidget : 2 * eventsPerWidget);
+
 		// 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++){
-			while( counter < max && (entry = entryLists[i].getNext()) != undefined ){
+		for (var i=0; counter < max && i < entryLists.length; i++) {
+			while (counter < max && (entry = entryLists[i].getNext()) != undefined) {
 				counter++;
-				
+
 				// output event info for debugging
 				console.info(
 					'event: Id=' + entry.id + 
@@ -359,16 +453,16 @@ function updateData(){
 					',InstanceStartTime=' + entry.InstanceStartTime +
 					',InstanceEndTime=' + entry.InstanceEndTime
 				);
-				
+
 				// we don't want ToDos when includeTodos == false or when they are completed
-				if (entry.Type == 'ToDo' && (entry.Status == "TodoCompleted" || !includeTodos)){
+				if (entry.Type == 'ToDo' && (entry.Status == "TodoCompleted" || !includeTodos)) {
 					console.info('skipping ' + entry.id );
 					counter--;
 					continue;
 				}
 
 				// 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) {
 					console.info('skipped (already included) ' + entry.id);
 					counter--;
 					continue;
@@ -377,53 +471,52 @@ function updateData(){
 
 				// summary can be undefined!
 				var Summary = ((entry.Summary == null) ? '' : entry.Summary);
-				if (entry.Type == 'Meeting' && entry.Location != '' && showLocation){
+				if (entry.Type == 'Meeting' && entry.Location != '' && showLocation)
 					Summary += ', ' + entry.Location;
-				}
 				
 				// fix by yves: determine start and end dates/times
 				entryStartTime = ((entry.InstanceStartTime == null) ? entry.StartTime : entry.InstanceStartTime);
 				entryEndTime = ((entry.InstanceEndTime == null) ? entry.EndTime : entry.InstanceEndTime);
-				
+
 				// there can be ToDos that have no date at all!
 				if (entry.Type == 'ToDo' && entry.EndTime == null)
 					entryDate = ""; // this will cause parseDate(entryDate) to return null;
 				else
 					entryDate = ((entry.Type == 'ToDo') ? entryEndTime : entryStartTime); // ToDo's use their EndTime, the rest use StartTime
-				
+
 				// Convert date/time string to Date object
 				var date = parseDate(entryDate);
 				console.info('date: ' + date);
 				var endDate = ((entryEndTime == null) ? null : parseDate(entryEndTime));
 				console.info('endDate: ' + endDate);
-				
+
 				// check if meeting event has already passed
-				if (entry.Type == 'Meeting'){
+				if (entry.Type == 'Meeting') {
 					var compareTime = ((endDate == null) ? date.getTime() : endDate.getTime());
-					if (now.getTime() > compareTime){
+					if (now.getTime() > compareTime) {
 						console.info('skipping Meeting (already passed) ' + entry.id);
 						counter--;
 						eventIds[entry.id] = 0;
 						continue;
 					}
 				}
-				
+
 				// check if anniversary passed (not sure why they are in the list, the query was only for today - nokia?)
-				if (entry.Type == 'Anniversary'){
+				if (entry.Type == 'Anniversary') {
 					var tmp = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0,0,0);
-					if ( date.getTime() < tmp.getTime() ){
+					if (date.getTime() < tmp.getTime()) {
 						console.info('skipping Anniversary (already passed) ' + entry.id);
 						counter--;
 						eventIds[entry.id] = 0;
 						continue;
 					}
 				}
-				
+
 				// fix DayEvents end time. End times are off by 1 Second. It's possible that the event has already passed
-				if (entry.Type == 'DayEvent' && endDate != null){
+				if (entry.Type == 'DayEvent' && endDate != null) {
 					endDate.setMinutes(endDate.getMinutes() - 1);
 					console.info('fixing DayEvent endDate: ' + endDate);
-					if (now.getTime() > endDate.getTime()){
+					if (now.getTime() > endDate.getTime()) {
 						console.info('event already passed ' + entry.id);
 						counter--;
 						eventIds[entry.id] = 0;
@@ -432,86 +525,79 @@ function updateData(){
 				}
 
 				// check if the event is currently taking place
-				if (entryStartTime != null && entryEndTime != null && date != null && endDate != null)
-				{
+				if (entryStartTime != null && entryEndTime != null && date != null && endDate != null) {
 					// check if we are between start and endtime
 					if ((date.getTime() < now.getTime()) && (now.getTime() < endDate.getTime())) {
 						date = now; // change appointment date/time to now
 						console.info('event is currently taking place: ' + date);
 					}
 				}
-				
+
 				// skip events for the first panel in case this is the second one
-				if (panelNum == 1 && counter < eventsPerWidget + 1){
+				if (panelNum == 1 && counter < eventsPerWidget + 1) {
 					console.info('skipping (already in first widget) ' + entry.id);
 					continue;
 				}
-				
+
 				// generate html output
 				entriesHtml += '<tr><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.
+				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> ';
-				}else{
+				} else {
 					var weekDay = date.toLocaleDateString().substr(0,weekDayLength);
 					var time = formatTime(date);
 					var dateStr = formatDate(date, entryDate);
-					if( entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder' ){
-						// decide if we want to leave off the weekday
-						if (dateStr.search(/Today/) != -1)
-							entriesHtml += '<td colspan="4"><span class="date">'+ dateStr +'</span> ';
+					if (entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder') {
+						if (isToday(date) && showTodayAsText) // show weekday if the date string is not text. looks odd otherwise
+							entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> ';
 						else
-							entriesHtml += '<td><span class="weekDay">' + weekDay +'</span></td><td><span class="date">'+ dateStr +'</span></td><td colspan="2">';
-					}else if( entry.Type == 'Meeting' ){
+							entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td colspan="2">';
+					} else if (entry.Type == 'Meeting') {
 						if (showCombinedDateTime) {
-							if (now.getDate() == date.getDate() && now.getMonth() == date.getMonth())
-								entriesHtml += '<td colspan="4"><span class="today">'+ time +'</span> ';
-							else {
-								// decide if we want to leave off the weekday
-								if (dateStr.search(/Today/) != -1)
-									entriesHtml += '<td colspan="4"><span class="date">'+ dateStr +'</span> ';
-								else
-									entriesHtml += '<td><span class="weekDay">' + weekDay +'</span></td><td><span class="date">'+ dateStr +'</span></td><td colspan="2">';
-							}
+							if (isToday(date))
+								entriesHtml += '<td colspan="4"><span class="today">' + time + '</span> ';
+							else
+								entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td colspan="2">';
 						} else {
-							// decide if we want to leave off the weekday
-							if (dateStr.search(/Today/) != -1)
-								entriesHtml += '<td colspan="4"><span class="date">'+ dateStr +'</span> <span class="time">'+ time +'</span> ';
+							if (isToday(date) && showTodayAsText)
+								entriesHtml += '<td colspan="4"><span class="today">' + dateStr + '</span> <span class="time">' + time + '</span> ';
 							else
-								entriesHtml += '<td><span class="weekDay">' + weekDay +'</span></td><td><span class="date">'+ dateStr +'</span></td><td width="1px"><span class="time">'+ time +'</span></td><td>';
+								entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td width="1px" class="time">' + time + '</td><td>';
 						}
 					}
 				}
-				entriesHtml += '<span class="description">' + Summary +'</span></td></tr>';
+				entriesHtml += '<span class="description">' + Summary + '</span></td></tr>';
 			}
 		}
 		entriesHtml += '</table>';
 		if (showNothingText && entriesHtml == '<table></table>')
 			entriesHtml = '<div style="width:295px; height:75px; text-align:center; line-height:75px; overflow:visible;">' + nothingText + '</div>';
-		if( cacheEntriesHtml != entriesHtml ){
+		if (cacheEntriesHtml != entriesHtml) {
 			document.getElementById('calendarList').innerHTML = entriesHtml;
 			cacheEntriesHtml = entriesHtml;
 		}
-	}catch(e){
+	} catch(e) {
 		error('displaying list:' + e + ', line ' + e.line);
 		return;
 	}
 }
 
-function updateScreen(){
-	// Check if opening fullscreen
-	if( window.innerHeight > 91){
+function updateScreen()
+{
+	// check if opening fullscreen
+	if( window.innerHeight > 91)
 		launchCalendar();
-	}
-	
-	if (useBackgroundImage){
+
+	if (useBackgroundImage) {
 		// check for screen rotation
-		if (orientation != 'portrait' && screen.width == 360 && screen.height == 640){
+		if (orientation != 'portrait' && screen.width == 360 && screen.height == 640) {
 			window.widget.prepareForTransition("fade");
 			orientation = 'portrait';
 			document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';
 			document.getElementById('body').style.backgroundColor = 'none';
 			window.widget.performTransition();
-		}else if (orientation != 'landscape' && screen.width == 640 && screen.height == 360){
+		} else if (orientation != 'landscape' && screen.width == 640 && screen.height == 360) {
 			window.widget.prepareForTransition("fade");
 			orientation = 'landscape';
 			document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';
@@ -521,43 +607,53 @@ function updateScreen(){
 	}
 }
 
-function launchCalendar(){
-   try{
+function launchCalendar()
+{
+	try {
 		widget.openApplication(calendarApp, "");
 		window.close();
-   }catch(e){
+	} catch(e) {
 		error('starting Calendar App');
 		return;
-   }
+	}
 }
 
-function init(){
-	try{
-		calendarService = device.getServiceObject("Service.Calendar", "IDataSource"); // call calendar service
-	}catch(e){
+function init()
+{
+	try {
+		// call calendar service
+		calendarService = device.getServiceObject("Service.Calendar", "IDataSource");
+	} catch(e) {
 		error('loading Calendar service');
 		return;
 	}
+
 	collectLocales();
 	updateData();
 	requestNotification();
-	window.setInterval('updateData()', 1000 * 60 * updateDataInterval); // start update interval every 5 minutes
+	window.setInterval('updateData()', 1000 * 60 * updateDataInterval);
 
 	updateScreen();
 	if (useBackgroundImage)
-		window.setInterval('updateScreen()', 1000 * 3); // check for screen rotation every 3 secs
+		// check for screen rotation every 3 secs
+		window.setInterval('updateScreen()', 1000 * 3);
 }
+
 </script>
+
 <style type="text/css">
-table{ margin:0px; padding:0px; border-spacing:0px; }
-td{ padding:0px 5px 0px 0px; white-space:nowrap; overflow:hidden; }
-#homescreenView{ width: 315px; height:91px; overflow:hidden; }
-#calendarList{ position:absolute; left:10px; top:4px; width:295px; height:75px; overflow:hidden; }
+table { margin:0px; padding:0px; border-spacing:0px; }
+td { padding:0px 5px 0px 0px; white-space:nowrap; overflow:hidden; }
+#homescreenView { width: 315px; height:91px; overflow:hidden; }
+#calendarList { position:absolute; left:10px; top:4px; width:295px; height:75px; overflow:hidden; }
 </style>
+
 </head>
+
 <body id="body" class="background">
 <div id="homescreenView">
 	<div id="calendarList"></div>
 </div>
 </body>
-</html>
\ No newline at end of file
+
+</html>
-- 
2.39.2