Merge pull request #2779 from bandresen/cardDate_receivedAtfix_and_endDatechange

Card date received-date fix and end-date coloring change (simplify)

1 files changed, 4 insertions, 4 deletions

diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index 6634ee1b..a298fbab 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))
     )
@@ -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;
   }