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

Merge branch 'devel' of https://github.com/wekan/wekan into feature-custom-fields

Browse source
This commit is contained in:
IgnatzHome 2018-06-14 20:38:10 +02:00
commit b5e6e6ee10
8 changed files with 159 additions and 134 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;
}

2
client/components/cards/minicard.jade
View file

@ -15,7 +15,7 @@ template(name="minicard")
unless dueAt
unless endAt
.date
+miniCardReceivedDate
+minicardReceivedDate
if startAt
.date
+minicardStartDate