Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-06 01:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Add two way binding of card/board times

Browse source
This commit is contained in:
Andrés Manelli 2018-04-17 23:17:44 -03:00
parent 0a62089df0
commit 724d26379c
7 changed files with 250 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,7 +96,7 @@ Template.dateBadge.helpers({
(class extends DatePicker {
onCreated() {
super.onCreated();
this.data().receivedAt && this.date.set(moment(this.data().receivedAt));
this.data().getReceived() && this.date.set(moment(this.data().getReceived()));
}
_storeDate(date) {
@ -104,7 +104,7 @@ Template.dateBadge.helpers({
}
_deleteDate() {
this.card.unsetReceived();
this.card.setReceived(null);
}
}).register('editCardReceivedDatePopup');
@ -113,13 +113,13 @@ Template.dateBadge.helpers({
(class extends DatePicker {
onCreated() {
super.onCreated();
this.data().startAt && this.date.set(moment(this.data().startAt));
this.data().getStart() && this.date.set(moment(this.data().getStart()));
}
onRendered() {
super.onRendered();
if (moment.isDate(this.card.receivedAt)) {
this.$('.js-datepicker').datepicker('setStartDate', this.card.receivedAt);
if (moment.isDate(this.card.getReceived())) {
this.$('.js-datepicker').datepicker('setStartDate', this.card.getReceived());
}
}
@ -128,7 +128,7 @@ Template.dateBadge.helpers({
}
_deleteDate() {
this.card.unsetStart();
this.card.setStart(null);
}
}).register('editCardStartDatePopup');
@ -136,13 +136,13 @@ Template.dateBadge.helpers({
(class extends DatePicker {
onCreated() {
super.onCreated();
this.data().dueAt && this.date.set(moment(this.data().dueAt));
this.data().getDue() && this.date.set(moment(this.data().getDue()));
}
onRendered() {
super.onRendered();
if (moment.isDate(this.card.startAt)) {
this.$('.js-datepicker').datepicker('setStartDate', this.card.startAt);
if (moment.isDate(this.card.getStart())) {
this.$('.js-datepicker').datepicker('setStartDate', this.card.getStart());
}
}
@ -151,7 +151,7 @@ Template.dateBadge.helpers({
}
_deleteDate() {
this.card.unsetDue();
this.card.setDue(null);
}
}).register('editCardDueDatePopup');
@ -159,13 +159,13 @@ Template.dateBadge.helpers({
(class extends DatePicker {
onCreated() {
super.onCreated();
this.data().endAt && this.date.set(moment(this.data().endAt));
this.data().getEnd() && this.date.set(moment(this.data().getEnd()));
}
onRendered() {
super.onRendered();
if (moment.isDate(this.card.startAt)) {
this.$('.js-datepicker').datepicker('setStartDate', this.card.startAt);
if (moment.isDate(this.card.getStart())) {
this.$('.js-datepicker').datepicker('setStartDate', this.card.getStart());
}
}
@ -174,7 +174,7 @@ Template.dateBadge.helpers({
}
_deleteDate() {
this.card.unsetEnd();
this.card.setEnd(null);
}
}).register('editCardEndDatePopup');
@ -213,15 +213,15 @@ class CardReceivedDate extends CardDate {
super.onCreated();
const self = this;
self.autorun(() => {
self.date.set(moment(self.data().receivedAt));
self.date.set(moment(self.data().getReceived()));
});
}
classes() {
let classes = 'received-date ';
const dueAt = this.data().dueAt;
const endAt = this.data().endAt;
const startAt = this.data().startAt;
const dueAt = this.data().getDue();
const endAt = this.data().getEnd();
const startAt = this.data().getStart();
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))) ||
@ -250,12 +250,13 @@ class CardStartDate extends CardDate {
super.onCreated();
const self = this;
self.autorun(() => {
self.date.set(moment(self.data().startAt));
self.date.set(moment(self.data().getStart()));
});
}
classes() {
let classes = 'start-date' + ' ';
<<<<<<< HEAD
const dueAt = this.data().dueAt;
const endAt = this.data().endAt;
const theDate = this.date.get();
@ -267,6 +268,10 @@ class CardStartDate extends CardDate {
else if (theDate.isBefore(now, 'minute'))
classes += 'almost-due';
else
=======
if (this.date.get().isBefore(this.now.get(), 'minute') &&
this.now.get().isBefore(this.data().getDue())) {
>>>>>>> Add two way binding of card/board times
classes += 'current';
return classes;
}
@ -288,7 +293,7 @@ class CardDueDate extends CardDate {
super.onCreated();
const self = this;
self.autorun(() => {
self.date.set(moment(self.data().dueAt));
self.date.set(moment(self.data().getDue()));
});
}
@ -330,12 +335,13 @@ class CardEndDate extends CardDate {
super.onCreated();
const self = this;
self.autorun(() => {
self.date.set(moment(self.data().endAt));
self.date.set(moment(self.data().getEnd()));
});
}
classes() {
let classes = 'end-date' + ' ';
<<<<<<< HEAD
const dueAt = this.data.dueAt;
const theDate = this.date.get();
// if dueAt exists & is after endAt, endAt doesn't need to be flagged
@ -343,6 +349,14 @@ class CardEndDate extends CardDate {
classes += 'long-overdue';
else
classes += 'current';
=======
if (this.date.get().diff(this.data().getDue(), 'days') >= 2)
classes += 'long-overdue';
else if (this.date.get().diff(this.data().getDue(), 'days') >= 0)
classes += 'due';
else if (this.date.get().diff(this.data().getDue(), 'days') >= -2)
classes += 'almost-due';
>>>>>>> Add two way binding of card/board times
return classes;
}