Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-03 15:11:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix data colour changes on cards.

Browse source 
Addressing both #1685 and #1693
This commit is contained in:
RJevnikar 2018-06-13 22:18:00 +00:00
parent 848d8ac95d
commit 67454d0491
44 changed files with 12 additions and 20562 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client/components/cards/cardDate.js
View file

@ -279,14 +279,18 @@ class CardDueDate extends CardDate {
classes() {
let classes = 'due-date' + ' ';
if ((this.now.get().diff(this.date.get(), 'days') >= 2) &&
// if endAt exists & is < dueAt, dueAt doesn't need to be flagged
if ((this.data().endAt != 0) &&
(this.data().endAt != null) &&
(this.data().endAt != '') &&
(this.data().endAt != undefined) &&
(this.date.get().isBefore(this.data().endAt)))
classes += 'current';
else if (this.now.get().diff(this.date.get(), 'days') >= 2)
classes += 'long-overdue';
else if ((this.now.get().diff(this.date.get(), 'minute') >= 0) &&
(this.date.get().isBefore(this.data().endAt)))
else if (this.now.get().diff(this.date.get(), 'minute') >= 0)
classes += 'due';
else if ((this.now.get().diff(this.date.get(), 'days') >= -1) &&
(this.date.get().isBefore(this.data().endAt)))
else if (this.now.get().diff(this.date.get(), 'days') >= -1)
classes += 'almost-due';
return classes;
}
@ -316,10 +320,10 @@ class CardEndDate extends CardDate {
let classes = 'end-date' + ' ';
if (this.data.dueAt.diff(this.date.get(), 'days') >= 2)
classes += 'long-overdue';
else if (this.data.dueAt.diff(this.date.get(), 'days') >= 0)
else if (this.data.dueAt.diff(this.date.get(), 'days') > 0)
classes += 'due';
else if (this.data.dueAt.diff(this.date.get(), 'days') >= -2)
classes += 'almost-due';
else if (this.data.dueAt.diff(this.date.get(), 'days') <= 0)
classes += 'current';
return classes;
}