FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

sched/calendar interface: fix null timezone

pull/3125/head
Erik Andresen 2023-12-10 19:49:37 +01:00
parent e513b90bf4
commit c815168bda
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/calendar/interface.html
View File

@ -32,12 +32,14 @@ function readFile(input) {
const jCalData = ICAL.parse(icalText); const jCalData = ICAL.parse(icalText);
const comp = new ICAL.Component(jCalData); const comp = new ICAL.Component(jCalData);
const vtz = comp.getFirstSubcomponent('vtimezone'); const vtz = comp.getFirstSubcomponent('vtimezone');
const tz = new ICAL.Timezone(vtz); const tz = vtz != null ? new ICAL.Timezone(vtz) : null;
// Fetch the VEVENT part // Fetch the VEVENT part
comp.getAllSubcomponents('vevent').forEach(vevent => { comp.getAllSubcomponents('vevent').forEach(vevent => {
const event = new ICAL.Event(vevent); const event = new ICAL.Event(vevent);
event.startDate.zone = tz; if (tz != null) {
event.startDate.zone = tz;
}
holidays = holidays.filter(holiday => !sameDay(new Date(holiday.date), event.startDate.toJSDate())); // remove if already exists holidays = holidays.filter(holiday => !sameDay(new Date(holiday.date), event.startDate.toJSDate())); // remove if already exists
const holiday = eventToHoliday(event); const holiday = eventToHoliday(event);

6
apps/sched/interface.html
View File

@ -20,7 +20,7 @@ function readFile(input) {
const jCalData = ICAL.parse(icalText); const jCalData = ICAL.parse(icalText);
const comp = new ICAL.Component(jCalData); const comp = new ICAL.Component(jCalData);
const vtz = comp.getFirstSubcomponent('vtimezone'); const vtz = comp.getFirstSubcomponent('vtimezone');
const tz = new ICAL.Timezone(vtz); const tz = vtz != null ? new ICAL.Timezone(vtz) : null;
// Fetch the VEVENT part // Fetch the VEVENT part
comp.getAllSubcomponents('vevent').forEach(vevent => { comp.getAllSubcomponents('vevent').forEach(vevent => {
@ -73,7 +73,9 @@ function getAlarmDefaults() {
} }
function eventToAlarm(event, tz, offsetMs) { function eventToAlarm(event, tz, offsetMs) {
event.startDate.zone = tz; if (tz != null) {
event.startDate.zone = tz;
}
const dateOrig = event.startDate.toJSDate(); const dateOrig = event.startDate.toJSDate();
const date = offsetMs ? new Date(dateOrig - offsetMs) : dateOrig; const date = offsetMs ? new Date(dateOrig - offsetMs) : dateOrig;