martin/silvrgit
martin/silvrgit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated calendar to weekly recurring items

Browse Source
This commit is contained in:
Martin Donnelly 2016-05-09 11:14:19 +01:00
parent 2de941d389
commit ec604e2b39
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/today/calHandler.js
View File

@ -41,9 +41,11 @@ function processICAL(ical) {
var _workBlock = workBlock; var _workBlock = workBlock;
// logger.debug('Processing recurrence...'); // logger.debug('Processing recurrence...');
// logger.debug('Processing recurrence...'); // logger.debug('Processing recurrence...');
var weekBits = {'SU':0,'MO':1,'TU':2,'WE':3,'TH':4,'FR':5,'SA':6};
var blocks=[]; var blocks=[];
var now = new Date(); var now = new Date();
var day = now.getDate(); var day = now.getDate();
var dayNum = now.getDay();
var month = now.getMonth(); var month = now.getMonth();
var year = now.getFullYear(); var year = now.getFullYear();
@ -118,6 +120,18 @@ function processICAL(ical) {
} }
} }
if (recurSettings.freq === 'WEEKLY' && recurSettings.interval === null) {
var byDayBit = recurSettings.byday.split(',')[0];
var byDayNumber = weekBits[byDayBit];
if (byDayNumber >= dayNum) {
var daysAdded = byDayNumber - dayNum;
newStart = Date.create().set({year:year, month: month , day: day, hour:_h, minutes:_min, seconds:_secs}).addDays(daysAdded);
newEnd = Date.create(newStart).addMilliseconds(distance);
_workBlock.dtstart = newStart;
_workBlock.dtend = newEnd;
}
}
} }
// if we get here we've skipped everything just return the _workblock // if we get here we've skipped everything just return the _workblock
@ -143,6 +157,7 @@ function processICAL(ical) {
blockStep = block[step]; blockStep = block[step];
if (blockStep.indexOf(segments.recur) >= 0) { if (blockStep.indexOf(segments.recur) >= 0) {
workBlock.recur = STRING(block[step].split(segments.recur)[1]).collapseWhitespace().s; workBlock.recur = STRING(block[step].split(segments.recur)[1]).collapseWhitespace().s;
//logger.debug(workBlock.recur);
} }
if (blockStep.indexOf(segments.summaryID) >= 0) { if (blockStep.indexOf(segments.summaryID) >= 0) {