4 events.\r
\r
For more info or to report bugs, please refere to \r
+http://sourceforge.net/projects/comingnext\r
+ and\r
http://www.symbian-freak.com/forum/viewtopic.php?t=38045\r
\r
You can change the appearance (background color, font color, font size etc.) \r
in the list. This behaviour and the text can be changed in the settings\r
1.19 (2009-09-04) by Oxidative\r
- refixed problems that 1.18 should have solved (todos not showing, entries \r
- showing twice)
\ No newline at end of file
+ showing twice)\r
+1.20 (2009-09-05) by Oxidative\r
+ - fixed memos to show although they have already passed
\ No newline at end of file
@echo off\r
\r
-set VERSION=1.19\r
+set VERSION=1.20\r
\r
del *.wgz\r
del *.zip\r
<!DOCTYPE plist PUBLIC "-//Nokia//DTD PLIST 1.0//EN" "http://www.nokia.com/NOKIA_COM_1/DTDs/plist-1.0.dtd">\r
<plist version="1.0">\r
<dict>\r
- <key>DisplayName</key> <string>Coming Next 1.19</string>\r
+ <key>DisplayName</key> <string>Coming Next 1.20</string>\r
<key>Identifier</key> <string>ar.com.cochambre.symbian.wrt.comingnext</string>\r
- <key>Version</key> <string>1.19</string>\r
+ <key>Version</key> <string>1.20</string>\r
<key>MainHTML</key> <string>index.html</string>\r
<key>AllowNetworkAccess</key> <false />\r
<key>MiniViewEnabled</key> <true/> \r
eventIds[entry.id] = 1;\r
} \r
\r
+ // skip events for the first panel in case this is the second one\r
if (panelNum == 1 && counter < eventsPerWidget + 1)\r
continue;\r
\r
\r
// Convert date/time string to Date object\r
var date = parseDate(entryDate);\r
- console.info(date);\r
+ console.info('date: ' + date);\r
+ var endDate = ((entryEndTime == null) ? null : parseDate(entryEndTime));\r
+ console.info('endDate: ' + endDate);\r
\r
- // check if event has already passed\r
- if (entry.Type == 'Meeting' || entry.Type == 'Reminder'){\r
- if (entryEndTime == null){\r
- if (now.getTime() > date.getTime()){\r
- counter--;\r
- continue;\r
- }\r
- }else if (entryEndTime != null){\r
- var endDate = parseDate(entryEndTime);\r
- if (now.getTime() > endDate.getTime()){\r
- counter--;\r
- continue;\r
- }\r
+ // check if meeting event has already passed\r
+ if (entry.Type == 'Meeting'){\r
+ var compareTime = ((endDate == null) ? date.getTime() : endDate.getTime());\r
+ if (now.getTime() > compareTime){\r
+ console.info('skipped (already passed) ' + entry.id);\r
+ counter--;\r
+ continue;\r
}\r
}\r
\r
+ // fix DayEvents end time. A bug in WRT causes end times to be off by +12 hours. It's possible that the event has already passed\r
+ if (entry.Type == 'DayEvent' && endDate != null){\r
+ endDate.setHours(endDate.getHours() - 12);\r
+ endDate.setMinutes(endDate.getMinutes() - 1);\r
+ console.info('fixing DayEvent endDate: ' + endDate);\r
+ if (now.getTime() > endDate.getTime()){\r
+ console.info('event already passed');\r
+ counter--;\r
+ continue; \r
+ }\r
+ }\r
+\r
// check if the event is currently taking place\r
- if (entryStartTime != null && entryEndTime != null && date != null)\r
+ if (entryStartTime != null && entryEndTime != null && date != null && endDate != null)\r
{\r
// check if we are between start and endtime\r
- var endDate = parseDate(entryEndTime);\r
- if (endDate != null && (date.getTime() < now.getTime()) && (now.getTime() < endDate.getTime()))\r
+ if ((date.getTime() < now.getTime()) && (now.getTime() < endDate.getTime())) {\r
date = now; // change appointment date/time to now\r
+ console.info('event is currently taking place: ' + date);\r
+ }\r
}\r
\r
// generate html output\r
<!DOCTYPE plist PUBLIC "-//Nokia//DTD PLIST 1.0//EN" "http://www.nokia.com/NOKIA_COM_1/DTDs/plist-1.0.dtd">\r
<plist version="1.0">\r
<dict>\r
- <key>DisplayName</key> <string>Coming Next B 1.19</string>\r
+ <key>DisplayName</key> <string>Coming Next B 1.20</string>\r
<key>Identifier</key> <string>ar.com.cochambre.symbian.wrt.comingnextb</string>\r
- <key>Version</key> <string>1.19</string>\r
+ <key>Version</key> <string>1.20</string>\r
<key>MainHTML</key> <string>index.html</string>\r
<key>AllowNetworkAccess</key> <false />\r
<key>MiniViewEnabled</key> <true/> \r
eventIds[entry.id] = 1;\r
} \r
\r
+ // skip events for the first panel in case this is the second one\r
if (panelNum == 1 && counter < eventsPerWidget + 1)\r
continue;\r
\r
\r
// Convert date/time string to Date object\r
var date = parseDate(entryDate);\r
- console.info(date);\r
+ console.info('date: ' + date);\r
+ var endDate = ((entryEndTime == null) ? null : parseDate(entryEndTime));\r
+ console.info('endDate: ' + endDate);\r
\r
- // check if event has already passed\r
- if (entry.Type == 'Meeting' || entry.Type == 'Reminder'){\r
- if (entryEndTime == null){\r
- if (now.getTime() > date.getTime()){\r
- counter--;\r
- continue;\r
- }\r
- }else if (entryEndTime != null){\r
- var endDate = parseDate(entryEndTime);\r
- if (now.getTime() > endDate.getTime()){\r
- counter--;\r
- continue;\r
- }\r
+ // check if meeting event has already passed\r
+ if (entry.Type == 'Meeting'){\r
+ var compareTime = ((endDate == null) ? date.getTime() : endDate.getTime());\r
+ if (now.getTime() > compareTime){\r
+ console.info('skipped (already passed) ' + entry.id);\r
+ counter--;\r
+ continue;\r
}\r
}\r
\r
+ // fix DayEvents end time. A bug in WRT causes end times to be off by +12 hours. It's possible that the event has already passed\r
+ if (entry.Type == 'DayEvent' && endDate != null){\r
+ endDate.setHours(endDate.getHours() - 12);\r
+ endDate.setMinutes(endDate.getMinutes() - 1);\r
+ console.info('fixing DayEvent endDate: ' + endDate);\r
+ if (now.getTime() > endDate.getTime()){\r
+ console.info('event already passed');\r
+ counter--;\r
+ continue; \r
+ }\r
+ }\r
+\r
// check if the event is currently taking place\r
- if (entryStartTime != null && entryEndTime != null && date != null)\r
+ if (entryStartTime != null && entryEndTime != null && date != null && endDate != null)\r
{\r
// check if we are between start and endtime\r
- var endDate = parseDate(entryEndTime);\r
- if (endDate != null && (date.getTime() < now.getTime()) && (now.getTime() < endDate.getTime()))\r
+ if ((date.getTime() < now.getTime()) && (now.getTime() < endDate.getTime())) {\r
date = now; // change appointment date/time to now\r
+ console.info('event is currently taking place: ' + date);\r
+ }\r
}\r
\r
// generate html output\r