Color highlight start and due dates with correct timezone handling.

3 files changed, 39 insertions, 16 deletions

diff --git a/client/components/cards/cardDate.jade b/client/components/cards/cardDate.jade
index ca074879..a2a28bbd 100644
--- a/client/components/cards/cardDate.jade
+++ b/client/components/cards/cardDate.jade
@@ -15,6 +15,6 @@ template(name="editCardDate")
       button.js-delete-date.negate.wide.right.js-delete-date {{_ 'delete'}}
 
 template(name="dateBadge")
-  a.js-edit-date.card-date(title="{{showTitle}}")
+  a.js-edit-date.card-date(title="{{showTitle}}" class="{{classes}}")
     time(datetime="{{showISODate}}")
       | {{showDate}}
diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index 4152d618..6bdfaa1b 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -16,8 +16,7 @@ const EditCardDate = BlazeComponent.extendComponent({
       todayBtn: 'linked',
       language: TAPi18n.getLanguage()
     }).on('changeDate', function(e) {
-      const localDate = moment(e.date).format('L');
-      date.value = localDate;
+      date.value = moment(e.date).format('L');
       this.error.set('');
       time.focus();
     }.bind(this));
@@ -66,7 +65,7 @@ const EditCardDate = BlazeComponent.extendComponent({
         var time = evt.target.time.value || moment(new Date().setHours(12,0,0)).format('LT');
         
         const dateString = evt.target.date.value + ' ' + time;
-        const newDate = moment.utc(dateString, 'L LT', true);
+        const newDate = moment(dateString, 'L LT', true);
         if (newDate.isValid()) {
           this._storeDate(newDate.toDate());
           Popup.close();
@@ -89,9 +88,7 @@ const EditCardDate = BlazeComponent.extendComponent({
 (class extends EditCardDate {
   onCreated() {
     super();
-    if (this.data().startAt) {
-      this.date.set(moment.utc(this.data().startAt));
-    }
+    this.data().startAt && this.date.set(moment(this.data().startAt));
   }
 
   _storeDate(date) {
@@ -107,9 +104,7 @@ const EditCardDate = BlazeComponent.extendComponent({
 (class extends EditCardDate {
   onCreated() {
     super();
-    if (this.data().dueAt !== undefined) {
-      this.date.set(moment.utc(this.data().dueAt));
-    }
+    this.data().dueAt && this.date.set(moment(this.data().dueAt));
   }
 
   onRendered() {
@@ -129,7 +124,6 @@ const EditCardDate = BlazeComponent.extendComponent({
 }).register('editCardDueDatePopup');
 
 
-
 // Display start & due dates
 const CardDate = BlazeComponent.extendComponent({
   template() {
@@ -137,7 +131,12 @@ const CardDate = BlazeComponent.extendComponent({
   },
 
   onCreated() {
-    this.date = ReactiveVar();
+    let self = this;
+    self.date = ReactiveVar();
+    self.now = ReactiveVar(moment());
+    Meteor.setInterval(() => {
+      self.now.set(moment());
+    }, 60000);
   },
 
   showDate() {
@@ -163,10 +162,17 @@ class CardStartDate extends CardDate {
     super();
     let self = this;
     this.autorun(() => {
-      self.date.set(moment.utc(this.data().startAt));
+      self.date.set(moment(this.data().startAt));
     });
   }
 
+  classes() {
+    if (this.date.get().isBefore(this.now.get(), 'minute') &&
+        this.now.get().isBefore(this.data().dueAt)) {
+      return 'current';
+    }
+  }
+
   events() {
     return super.events().concat({
       'click .js-edit-date': Popup.open('editCardStartDate'),
@@ -180,10 +186,19 @@ class CardDueDate extends CardDate {
     super();
     let self = this;
     this.autorun(() => {
-      self.date.set(moment.utc(this.data().dueAt));
+      self.date.set(moment(this.data().dueAt));
     });
   }
 
+  classes() {
+    if (this.now.get().diff(this.date.get(), 'days') >= 2)
+      return 'long-overdue';
+    else if (this.now.get().diff(this.date.get(), 'minute') >= 0)
+      return 'due';
+    else if (this.now.get().diff(this.date.get(), 'days') >= -1)
+      return 'almost-due';
+  }
+
   events() {
     return super.events().concat({
       'click .js-edit-date': Popup.open('editCardDueDate'),
diff --git a/client/components/cards/cardDate.styl b/client/components/cards/cardDate.styl
index e9d56f79..ab182207 100644
--- a/client/components/cards/cardDate.styl
+++ b/client/components/cards/cardDate.styl
@@ -26,20 +26,28 @@
   &:hover, &.is-active
     background-color: #b3b3b3
   
+  &.current, &.almost-due, &.due, &.long-overdue
+    color: #fff
+
   &.current
     background-color: #42ca00
     &:hover, &.is-active
       background-color: darken(#42ca00, 15)
   
   &.almost-due
-    background-color: #fad900
+    background-color: #edc909
     &:hover, &.is-active
-      background-color: darken(#fad900, 15)
+      background-color: darken(#edc909, 10)
   
   &.due
     background-color: #fa3f00
     &:hover, &.is-active
       background-color: darken(#fa3f00, 15)
+  
+  &.long-overdue
+    background-color: #fd5d47
+    &:hover, &.is-active
+      background-color: darken(#fd5d47, 7)
 
   time
     &::before