summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Andresen <bandresen@gmail.com>2019-11-04 08:10:11 +0100
committerBenjamin Andresen <bandresen@gmail.com>2019-11-04 08:10:11 +0100
commit7a5401d5f09fc888c02defb189a6a70f9b2725ab (patch)
tree0a6188a3e7f54558580306c5e0b8182eafad7537
parentd3ca8167626005c33602b600811bc56f8d47ae6a (diff)
downloadwekan-7a5401d5f09fc888c02defb189a6a70f9b2725ab.tar.gz
wekan-7a5401d5f09fc888c02defb189a6a70f9b2725ab.tar.bz2
wekan-7a5401d5f09fc888c02defb189a6a70f9b2725ab.zip
cardDate: endDate coloring change
if no due-date timestamp is set => Gray if end-date timestamp is younger than due-date timestamp => Green if end-date timestamp is older than due-date timestamp => Red resolves #2741
-rw-r--r--client/components/cards/cardDate.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index 77b39078..a298fbab 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -344,9 +344,9 @@ class CardEndDate extends CardDate {
let classes = 'end-date' + ' ';
const dueAt = this.data().getDue();
const theDate = this.date.get();
- if (theDate.diff(dueAt, 'days') >= 2) classes += 'long-overdue';
- else if (theDate.diff(dueAt, 'days') >= 0) classes += 'due';
- else if (theDate.diff(dueAt, 'days') >= -2) classes += 'almost-due';
+ if (!dueAt) classes += ''
+ else if (theDate.isBefore(dueAt)) classes += 'current'
+ else if (theDate.isAfter(dueAt)) classes += 'due'
return classes;
}