浏览代码

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
Benjamin Andresen 5 年之前
父节点
当前提交
7a5401d5f0
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      client/components/cards/cardDate.js

+ 3 - 3
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;
   }