From 0992643999c9d616134cf4f28a3f4eb142b07df2 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Fri, 19 Apr 2019 02:06:28 +0000 Subject: [server/eventhelper] bugfix --- server/lib/eventhelper.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'server/lib/eventhelper.js') diff --git a/server/lib/eventhelper.js b/server/lib/eventhelper.js index 26fe1fc..005f551 100644 --- a/server/lib/eventhelper.js +++ b/server/lib/eventhelper.js @@ -12,6 +12,8 @@ function _pad (x) { // #################################################################################### // #################################################################################### +const rruleWeekdays = [RRule.MO, RRule.TU, RRule.WE, RRule.TH, RRule.FR, RRule.SA, RRule.SU] + class Schedule { constructor (event) { const splitStart = event.start.split(' ') @@ -23,9 +25,14 @@ class Schedule { byhour: splitStartTime[0], byminute: splitStartTime[1] } + + rule.byweekday = event.dayMap.reduce((arr, v, i) => { if (v) arr.push(rruleWeekdays[i]); return arr }, []) + rule.bymonth = event.monthMap.reduce((arr, v, i) => { if (v) arr.push(i + 1); return arr }, []) + if (event.intervalType === 'month') rule.freq = RRule.MONTHLY - else if (event.intervalType === 'month') rule.freq = RRule.WEEKLY + else if (event.intervalType === 'week') rule.freq = RRule.WEEKLY else rule.freq = RRule.DAILY + this.rrule = new RRule(rule) this.endTime = event.end.split(' ')[1] } -- cgit v1.2.3-55-g7522