diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-09-28 14:56:51 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-09-28 14:56:51 +0300 |
commit | 5d6c68a9cfe1e83b884e3884e17d5ed82d6f5b98 (patch) | |
tree | 9f2a26c68e81419d469d33693217aa492ec26081 /client/components | |
parent | 75dc5f226cb3261337c9be9614856efc0b40e377 (diff) | |
parent | ed4c49090abfb35ebadc77b40eee4af05ae15ac1 (diff) | |
download | wekan-5d6c68a9cfe1e83b884e3884e17d5ed82d6f5b98.tar.gz wekan-5d6c68a9cfe1e83b884e3884e17d5ed82d6f5b98.tar.bz2 wekan-5d6c68a9cfe1e83b884e3884e17d5ed82d6f5b98.zip |
Merge branch 'master' of github.com:wekan/wekan
Diffstat (limited to 'client/components')
-rw-r--r-- | client/components/boards/boardBody.js | 52 |
1 files changed, 36 insertions, 16 deletions
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 713b6cbc..47042ae7 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -309,26 +309,46 @@ BlazeComponent.extendComponent({ events(start, end, timezone, callback) { const currentBoard = Boards.findOne(Session.get('currentBoard')); const events = []; + const pushEvent = function(card, title, start, end, extraCls) { + start = start || card.startAt; + end = end || card.endAt; + title = title || card.title; + const className = + (extraCls ? `${extraCls} ` : '') + + (card.color ? `calendar-event-${card.color}` : ''); + events.push({ + id: card._id, + title, + start, + end: end || card.endAt, + allDay: + Math.abs(end.getTime() - start.getTime()) / 1000 === 24 * 3600, + url: FlowRouter.url('card', { + boardId: currentBoard._id, + slug: currentBoard.slug, + cardId: card._id, + }), + className, + }); + }; currentBoard .cardsInInterval(start.toDate(), end.toDate()) .forEach(function(card) { - events.push({ - id: card._id, - title: card.title, - start: card.startAt, - end: card.endAt, - allDay: - Math.abs(card.endAt.getTime() - card.startAt.getTime()) / - 1000 === - 24 * 3600, - url: FlowRouter.url('card', { - boardId: currentBoard._id, - slug: currentBoard.slug, - cardId: card._id, - }), - className: card.color ? `calendar-event-${card.color}` : null, - }); + pushEvent(card); + }); + currentBoard + .cardsDueInBetween(start.toDate(), end.toDate()) + .forEach(function(card) { + pushEvent( + card, + `${card.title} ${TAPi18n.__('card-due')}`, + card.dueAt, + new Date(card.dueAt.getTime() + 36e5), + ); }); + events.sort(function(first, second) { + return first.id > second.id ? 1 : -1; + }); callback(events); }, eventResize(event, delta, revertFunc) { |