From d3ca8167626005c33602b600811bc56f8d47ae6a Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Mon, 4 Nov 2019 08:08:51 +0100 Subject: [PATCH 1/2] cardDate: fix ReceivedDate startAt coloring --- client/components/cards/cardDate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js index 6634ee1b4..77b390785 100644 --- a/client/components/cards/cardDate.js +++ b/client/components/cards/cardDate.js @@ -237,7 +237,7 @@ class CardReceivedDate extends CardDate { const theDate = this.date.get(); // if dueAt, endAt and startAt exist & are > receivedAt, receivedAt doesn't need to be flagged if ( - (startAt && theDate.isAfter(dueAt)) || + (startAt && theDate.isAfter(startAt)) || (endAt && theDate.isAfter(endAt)) || (dueAt && theDate.isAfter(dueAt)) ) From 7a5401d5f09fc888c02defb189a6a70f9b2725ab Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Mon, 4 Nov 2019 08:10:11 +0100 Subject: [PATCH 2/2] 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 --- client/components/cards/cardDate.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js index 77b390785..a298fbab3 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; }