Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-18 00:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #2779 from bandresen/cardDate_receivedAtfix_and_endDatechange

Browse source 
Card date received-date fix and end-date coloring change (simplify)
This commit is contained in:
Lauri Ojansivu 2019-11-04 09:52:31 +02:00 • committed by GitHub
commit 9a468dfce5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/components/cards/cardDate.js
View file

@ -237,7 +237,7 @@ class CardReceivedDate extends CardDate {
const theDate = this.date.get(); const theDate = this.date.get();
// if dueAt, endAt and startAt exist & are > receivedAt, receivedAt doesn't need to be flagged // if dueAt, endAt and startAt exist & are > receivedAt, receivedAt doesn't need to be flagged
if ( if (
(startAt && theDate.isAfter(dueAt)) || (startAt && theDate.isAfter(startAt)) ||
(endAt && theDate.isAfter(endAt)) || (endAt && theDate.isAfter(endAt)) ||
(dueAt && theDate.isAfter(dueAt)) (dueAt && theDate.isAfter(dueAt))
) )
@ -344,9 +344,9 @@ class CardEndDate extends CardDate {
let classes = 'end-date' + ' '; let classes = 'end-date' + ' ';
const dueAt = this.data().getDue(); const dueAt = this.data().getDue();
const theDate = this.date.get(); const theDate = this.date.get();
if (theDate.diff(dueAt, 'days') >= 2) classes += 'long-overdue'; if (!dueAt) classes += ''
else if (theDate.diff(dueAt, 'days') >= 0) classes += 'due'; else if (theDate.isBefore(dueAt)) classes += 'current'
else if (theDate.diff(dueAt, 'days') >= -2) classes += 'almost-due'; else if (theDate.isAfter(dueAt)) classes += 'due'
return classes; return classes;
} }