From ca51ace22d6f5097a8d0dbf9a62e7248cce1c4a3 Mon Sep 17 00:00:00 2001
From: RJevnikar <12701645+rjevnikar@users.noreply.github.com>
Date: Fri, 8 Jun 2018 20:42:16 +0000
Subject: Modify mini cards so that received date is shown if there is no start
 date, and due date is shown if there is no end date.

---
 client/components/cards/minicard.jade | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade
index aa0708dd..b44021a6 100644
--- a/client/components/cards/minicard.jade
+++ b/client/components/cards/minicard.jade
@@ -10,12 +10,22 @@ template(name="minicard")
       +viewer
         = title
     .dates
+      if receivedAt
+        unless startAt
+          unless dueAt
+            unless endAt
+              .date
+                +miniCardReceivedDate
       if startAt
         .date
           +minicardStartDate
       if dueAt
+        unless endAt
+          .date
+            +minicardDueDate
+      if endAt
         .date
-          +minicardDueDate
+          +minicardEndDate
       if spentTime
         .date
           +cardSpentTime
-- 
cgit v1.2.3-1-g7c22


From 45cf2843a63e96eefc5174dd55cf540c9b74c3a9 Mon Sep 17 00:00:00 2001
From: RJevnikar <12701645+rjevnikar@users.noreply.github.com>
Date: Fri, 8 Jun 2018 21:09:52 +0000
Subject: Adjust classes given to due date to take into account end date

---
 client/components/cards/cardDate.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index 52a48f47..e95c3a23 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -279,11 +279,14 @@ class CardDueDate extends CardDate {
 
   classes() {
     let classes = 'due-date' + ' ';
-    if (this.now.get().diff(this.date.get(), 'days') >= 2)
+    if ((this.now.get().diff(this.date.get(), 'days') >= 2) &&
+       (this.date.get().isBefore(this.data().endAt)))
       classes += 'long-overdue';
-    else if (this.now.get().diff(this.date.get(), 'minute') >= 0)
+    else if ((this.now.get().diff(this.date.get(), 'minute') >= 0) &&
+       (this.date.get().isBefore(this.data().endAt)))
       classes += 'due';
-    else if (this.now.get().diff(this.date.get(), 'days') >= -1)
+    else if ((this.now.get().diff(this.date.get(), 'days') >= -1) &&
+       (this.date.get().isBefore(this.data().endAt)))
       classes += 'almost-due';
     return classes;
   }
-- 
cgit v1.2.3-1-g7c22