summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-03-29 15:03:59 +0300
committerLauri Ojansivu <x@xet7.org>2018-03-29 15:03:59 +0300
commit5e88cb24cb6a3c4a0028bde7a7bff7fa5239f3f4 (patch)
treef1cacaa545908cc14d7858252bd36fedc8ff8cf0
parentcaca2e34fc7a73da922a549b92b354ed8bf3287c (diff)
parent023b41b2056d5eedc710ea86f5e289b59071a589 (diff)
downloadwekan-5e88cb24cb6a3c4a0028bde7a7bff7fa5239f3f4.tar.gz
wekan-5e88cb24cb6a3c4a0028bde7a7bff7fa5239f3f4.tar.bz2
wekan-5e88cb24cb6a3c4a0028bde7a7bff7fa5239f3f4.zip
Merge branch 'rjevnikar-additionalDates' into devel
-rw-r--r--CHANGELOG.md5
-rw-r--r--client/components/cards/cardDate.js126
-rw-r--r--client/components/cards/cardDate.styl10
-rw-r--r--client/components/cards/cardDetails.jade45
-rw-r--r--client/components/cards/cardDetails.js6
-rw-r--r--client/components/cards/cardDetails.styl4
-rw-r--r--client/components/cards/checklists.jade2
-rw-r--r--i18n/ar.i18n.json8
-rw-r--r--i18n/bg.i18n.json8
-rw-r--r--i18n/br.i18n.json8
-rw-r--r--i18n/ca.i18n.json8
-rw-r--r--i18n/cs.i18n.json8
-rw-r--r--i18n/de.i18n.json8
-rw-r--r--i18n/el.i18n.json8
-rw-r--r--i18n/en-GB.i18n.json8
-rw-r--r--i18n/en.i18n.json8
-rw-r--r--i18n/eo.i18n.json8
-rw-r--r--i18n/es-AR.i18n.json8
-rw-r--r--i18n/es.i18n.json8
-rw-r--r--i18n/eu.i18n.json8
-rw-r--r--i18n/fa.i18n.json8
-rw-r--r--i18n/fi.i18n.json8
-rw-r--r--i18n/fr.i18n.json8
-rw-r--r--i18n/gl.i18n.json8
-rw-r--r--i18n/he.i18n.json8
-rw-r--r--i18n/hu.i18n.json8
-rw-r--r--i18n/hy.i18n.json8
-rw-r--r--i18n/id.i18n.json8
-rw-r--r--i18n/ig.i18n.json8
-rw-r--r--i18n/it.i18n.json8
-rw-r--r--i18n/ja.i18n.json8
-rw-r--r--i18n/lv.i18n.json8
-rw-r--r--i18n/mn.i18n.json8
-rw-r--r--i18n/nb.i18n.json8
-rw-r--r--i18n/nl.i18n.json8
-rw-r--r--i18n/pl.i18n.json8
-rw-r--r--i18n/pt-BR.i18n.json8
-rw-r--r--i18n/pt.i18n.json8
-rw-r--r--i18n/ro.i18n.json8
-rw-r--r--i18n/ru.i18n.json8
-rw-r--r--i18n/sr.i18n.json8
-rw-r--r--i18n/sv.i18n.json8
-rw-r--r--i18n/ta.i18n.json8
-rw-r--r--i18n/th.i18n.json8
-rw-r--r--i18n/tr.i18n.json8
-rw-r--r--i18n/uk.i18n.json8
-rw-r--r--i18n/vi.i18n.json8
-rw-r--r--i18n/zh-CN.i18n.json8
-rw-r--r--i18n/zh-TW.i18n.json8
-rw-r--r--models/cards.js24
-rw-r--r--models/checklists.js1
51 files changed, 499 insertions, 60 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bd18015..5cb97d4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,10 @@
This release adds the following new features:
-- [Checklist items sort fix, and checklist sort capability](https://github.com/wekan/wekan/pull/1543).
+- [Checklist items sort fix, and checklist sort capability](https://github.com/wekan/wekan/pull/1543);
+- [Add Received Date and End Date. Between them is already existing Start and Due Date](https://github.com/wekan/wekan/pull/1550).
-Thanks to GitHub user andresmanelli for contributions.
+Thanks to GitHub users andresmanelli and rjevnikar for their contributions.
# v0.78 2018-03-17 Wekan release
diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index abf6a42b..7c0ad6ab 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -1,4 +1,4 @@
-// Edit start & due dates
+// Edit received, start, due & end dates
const EditCardDate = BlazeComponent.extendComponent({
template() {
return 'editCardDate';
@@ -92,6 +92,23 @@ Template.dateBadge.helpers({
},
});
+// editCardReceivedDatePopup
+(class extends EditCardDate {
+ onCreated() {
+ super.onCreated();
+ this.data().receivedAt && this.date.set(moment(this.data().receivedAt));
+ }
+
+ _storeDate(date) {
+ this.card.setReceived(date);
+ }
+
+ _deleteDate() {
+ this.card.unsetReceived();
+ }
+}).register('editCardReceivedDatePopup');
+
+
// editCardStartDatePopup
(class extends EditCardDate {
onCreated() {
@@ -99,6 +116,13 @@ Template.dateBadge.helpers({
this.data().startAt && this.date.set(moment(this.data().startAt));
}
+ onRendered() {
+ super.onRendered();
+ if (moment.isDate(this.card.receivedAt)) {
+ this.$('.js-datepicker').datepicker('setStartDate', this.card.receivedAt);
+ }
+ }
+
_storeDate(date) {
this.card.setStart(date);
}
@@ -131,8 +155,31 @@ Template.dateBadge.helpers({
}
}).register('editCardDueDatePopup');
+// editCardEndDatePopup
+(class extends EditCardDate {
+ onCreated() {
+ super.onCreated();
+ this.data().endAt && this.date.set(moment(this.data().endAt));
+ }
+
+ onRendered() {
+ super.onRendered();
+ if (moment.isDate(this.card.startAt)) {
+ this.$('.js-datepicker').datepicker('setStartDate', this.card.startAt);
+ }
+ }
+
+ _storeDate(date) {
+ this.card.setEnd(date);
+ }
+
+ _deleteDate() {
+ this.card.unsetEnd();
+ }
+}).register('editCardEndDatePopup');
+
-// Display start & due dates
+// Display received, start, due & end dates
const CardDate = BlazeComponent.extendComponent({
template() {
return 'dateBadge';
@@ -161,6 +208,36 @@ const CardDate = BlazeComponent.extendComponent({
},
});
+class CardReceivedDate extends CardDate {
+ onCreated() {
+ super.onCreated();
+ const self = this;
+ self.autorun(() => {
+ self.date.set(moment(self.data().receivedAt));
+ });
+ }
+
+ classes() {
+ let classes = 'received-date' + ' ';
+ if (this.date.get().isBefore(this.now.get(), 'minute') &&
+ this.now.get().isBefore(this.data().dueAt)) {
+ classes += 'current';
+ }
+ return classes;
+ }
+
+ showTitle() {
+ return `${TAPi18n.__('card-received-on')} ${this.date.get().format('LLLL')}`;
+ }
+
+ events() {
+ return super.events().concat({
+ 'click .js-edit-date': Popup.open('editCardReceivedDate'),
+ });
+ }
+}
+CardReceivedDate.register('cardReceivedDate');
+
class CardStartDate extends CardDate {
onCreated() {
super.onCreated();
@@ -223,6 +300,44 @@ class CardDueDate extends CardDate {
}
CardDueDate.register('cardDueDate');
+class CardEndDate extends CardDate {
+ onCreated() {
+ super.onCreated();
+ const self = this;
+ self.autorun(() => {
+ self.date.set(moment(self.data().endAt));
+ });
+ }
+
+ classes() {
+ let classes = 'end-date' + ' ';
+ if (this.data.dueAt.diff(this.date.get(), 'days') >= 2)
+ classes += 'long-overdue';
+ else if (this.data.dueAt.diff(this.date.get(), 'days') >= 0)
+ classes += 'due';
+ else if (this.data.dueAt.diff(this.date.get(), 'days') >= -2)
+ classes += 'almost-due';
+ return classes;
+ }
+
+ showTitle() {
+ return `${TAPi18n.__('card-end-on')} ${this.date.get().format('LLLL')}`;
+ }
+
+ events() {
+ return super.events().concat({
+ 'click .js-edit-date': Popup.open('editCardEndDate'),
+ });
+ }
+}
+CardEndDate.register('cardEndDate');
+
+(class extends CardReceivedDate {
+ showDate() {
+ return this.date.get().format('l');
+ }
+}).register('minicardReceivedDate');
+
(class extends CardStartDate {
showDate() {
return this.date.get().format('l');
@@ -234,3 +349,10 @@ CardDueDate.register('cardDueDate');
return this.date.get().format('l');
}
}).register('minicardDueDate');
+
+(class extends CardEndDate {
+ showDate() {
+ return this.date.get().format('l');
+ }
+}).register('minicardEndDate');
+
diff --git a/client/components/cards/cardDate.styl b/client/components/cards/cardDate.styl
index e0c3fc9e..1ad3adb3 100644
--- a/client/components/cards/cardDate.styl
+++ b/client/components/cards/cardDate.styl
@@ -49,6 +49,11 @@
&:hover, &.is-active
background-color: darken(#fd5d47, 7)
+ &.end-date
+ time
+ &::before
+ content: "\f253" // symbol: fa-hourglass-end
+
&.due-date
time
&::before
@@ -59,6 +64,11 @@
&::before
content: "\f08b" // symbol: fa-sign-out
+ &.received-date
+ time
+ &::before
+ content: "\f251" // symbol: fa-hourglass-start
+
time
&::before
font: normal normal normal 14px/1 FontAwesome
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index cc95ca38..3e73071a 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -18,6 +18,35 @@ template(name="cardDetails")
p.warning {{_ 'card-archived'}}
.card-details-items
+ .card-details-item.card-details-item-received
+ h3.card-details-item-title {{_ 'card-received'}}
+ if receivedAt
+ +cardReceivedDate
+ else
+ a.js-received-date {{_ 'add'}}
+
+ .card-details-item.card-details-item-start
+ h3.card-details-item-title {{_ 'card-start'}}
+ if startAt
+ +cardStartDate
+ else
+ a.js-start-date {{_ 'add'}}
+
+ .card-details-item.card-details-item-due
+ h3.card-details-item-title {{_ 'card-due'}}
+ if dueAt
+ +cardDueDate
+ else
+ a.js-due-date {{_ 'add'}}
+
+ .card-details-item.card-details-item-end
+ h3.card-details-item-title {{_ 'card-end'}}
+ if endAt
+ +cardEndDate
+ else
+ a.js-end-date {{_ 'add'}}
+
+ .card-details-items
.card-details-item.card-details-item-members
h3.card-details-item-title {{_ 'members'}}
each members
@@ -36,16 +65,6 @@ template(name="cardDetails")
a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
i.fa.fa-plus
- if startAt
- .card-details-item.card-details-item-start
- h3.card-details-item-title {{_ 'card-start'}}
- +cardStartDate
-
- if dueAt
- .card-details-item.card-details-item-due
- h3.card-details-item-title {{_ 'card-due'}}
- +cardDueDate
-
.card-details-items
if spentTime
.card-details-item.card-details-item-spent
@@ -86,7 +105,7 @@ template(name="cardDetails")
+checklists(cardId = _id)
hr
- h2
+ h3
i.fa.fa-paperclip
| {{_ 'attachments'}}
@@ -94,7 +113,7 @@ template(name="cardDetails")
hr
.activity-title
- h2 {{ _ 'activity'}}
+ h3 {{ _ 'activity'}}
if currentUser.isBoardMember
.material-toggle-switch
span.toggle-switch-title {{_ 'hide-system-messages'}}
@@ -124,8 +143,10 @@ template(name="cardDetailsActionsPopup")
li: a.js-members {{_ 'card-edit-members'}}
li: a.js-labels {{_ 'card-edit-labels'}}
li: a.js-attachments {{_ 'card-edit-attachments'}}
+ li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
+ li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}}
hr
ul.pop-over-list
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index 77593a74..421cef53 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -149,6 +149,10 @@ BlazeComponent.extendComponent({
'click .js-member': Popup.open('cardMember'),
'click .js-add-members': Popup.open('cardMembers'),
'click .js-add-labels': Popup.open('cardLabels'),
+ 'click .js-received-date': Popup.open('editCardReceivedDate'),
+ 'click .js-start-date': Popup.open('editCardStartDate'),
+ 'click .js-due-date': Popup.open('editCardDueDate'),
+ 'click .js-end-date': Popup.open('editCardEndDate'),
'mouseenter .js-card-details' () {
this.parentComponent().parentComponent().showOverlay.set(true);
this.parentComponent().parentComponent().mouseHasEnterCardDetails = true;
@@ -211,8 +215,10 @@ Template.cardDetailsActionsPopup.events({
'click .js-members': Popup.open('cardMembers'),
'click .js-labels': Popup.open('cardLabels'),
'click .js-attachments': Popup.open('cardAttachments'),
+ 'click .js-received-date': Popup.open('editCardReceivedDate'),
'click .js-start-date': Popup.open('editCardStartDate'),
'click .js-due-date': Popup.open('editCardDueDate'),
+ 'click .js-end-date': Popup.open('editCardEndDate'),
'click .js-spent-time': Popup.open('editCardSpentTime'),
'click .js-move-card': Popup.open('moveCard'),
'click .js-copy-card': Popup.open('copyCard'),
diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl
index c67522d1..a1e0f5c3 100644
--- a/client/components/cards/cardDetails.styl
+++ b/client/components/cards/cardDetails.styl
@@ -77,8 +77,10 @@
margin-right: 0
&.card-details-item-labels,
&.card-details-item-members,
+ &.card-details-item-received,
&.card-details-item-start,
- &.card-details-item-due
+ &.card-details-item-due,
+ &.card-details-item-end
width: 50%
flex-shrink: 1
diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade
index c79eb5aa..5a7c7473 100644
--- a/client/components/cards/checklists.jade
+++ b/client/components/cards/checklists.jade
@@ -1,5 +1,5 @@
template(name="checklists")
- h2 {{_ 'checklists'}}
+ h3 {{_ 'checklists'}}
if toggleDeleteDialog.get
.board-overlay#card-details-overlay
+checklistDeleteDialog(checklist = checklistToDelete)
diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json
index 738743fe..a9c0af06 100644
--- a/i18n/ar.i18n.json
+++ b/i18n/ar.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "السماح بتغيير البريد الإلكتروني",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json
index 568bd458..8899510d 100644
--- a/i18n/bg.i18n.json
+++ b/i18n/bg.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Разреши промяна на имейла",
"createdAt": "Създаден на",
"verified": "Потвърден",
- "active": "Активен"
+ "active": "Активен",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json
index 824f2a5b..bf4a8ac5 100644
--- a/i18n/br.i18n.json
+++ b/i18n/br.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json
index bf3f7a03..44edf12d 100644
--- a/i18n/ca.i18n.json
+++ b/i18n/ca.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Permet modificar correu electrònic",
"createdAt": "Creat ",
"verified": "Verificat",
- "active": "Actiu"
+ "active": "Actiu",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json
index 26df3797..eac9ff4e 100644
--- a/i18n/cs.i18n.json
+++ b/i18n/cs.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Povolit změnu Emailu",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json
index d275e4be..3ced5f15 100644
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Ändern der E-Mailadresse zulassen",
"createdAt": "Erstellt am",
"verified": "Geprüft",
- "active": "Aktiv"
+ "active": "Aktiv",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json
index 85e0df22..91419ae3 100644
--- a/i18n/el.i18n.json
+++ b/i18n/el.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json
index 5e64ae5e..ee5a57bf 100644
--- a/i18n/en-GB.i18n.json
+++ b/i18n/en-GB.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index de07b943..02bd4c28 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
}
diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json
index f180ec4c..4f7fcbd1 100644
--- a/i18n/eo.i18n.json
+++ b/i18n/eo.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json
index d131c253..04f91ae8 100644
--- a/i18n/es-AR.i18n.json
+++ b/i18n/es-AR.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Permitir Cambio de Email",
"createdAt": "Creado en",
"verified": "Verificado",
- "active": "Activo"
+ "active": "Activo",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json
index 30762488..116dfb7a 100644
--- a/i18n/es.i18n.json
+++ b/i18n/es.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Permitir cambiar el correo electrónico",
"createdAt": "Creado en",
"verified": "Verificado",
- "active": "Activo"
+ "active": "Activo",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json
index c147c51c..f997533a 100644
--- a/i18n/eu.i18n.json
+++ b/i18n/eu.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Baimendu e-mail aldaketa",
"createdAt": "Noiz sortua",
"verified": "Egiaztatuta",
- "active": "Gaituta"
+ "active": "Gaituta",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json
index 74d8f1f6..169559b0 100644
--- a/i18n/fa.i18n.json
+++ b/i18n/fa.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "اجازه تغییر رایانامه",
"createdAt": "ساخته شده در",
"verified": "معتبر",
- "active": "فعال"
+ "active": "فعال",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json
index fafe2dd5..fad0327a 100644
--- a/i18n/fi.i18n.json
+++ b/i18n/fi.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Salli sähköpostiosoitteen muuttaminen",
"createdAt": "Luotu",
"verified": "Varmistettu",
- "active": "Aktiivinen"
+ "active": "Aktiivinen",
+ "card-received": "Vastaanotettu",
+ "card-received-on": "Vastaanotettu",
+ "card-end": "Loppuu",
+ "card-end-on": "Loppuu",
+ "editCardReceivedDatePopup-title": "Vaihda vastaanottamispäivää",
+ "editCardEndDatePopup-title": "Vaihda loppumispäivää"
} \ No newline at end of file
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index 265ce05e..091e589a 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Autoriser le changement d'adresse mail",
"createdAt": "Créé à",
"verified": "Vérifié",
- "active": "Actif"
+ "active": "Actif",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json
index ac5d9c0a..cc6bee40 100644
--- a/i18n/gl.i18n.json
+++ b/i18n/gl.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json
index adbd5f43..9261ba0c 100644
--- a/i18n/he.i18n.json
+++ b/i18n/he.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "אפשר שינוי דוא\"ל",
"createdAt": "נוצר ב",
"verified": "עבר אימות",
- "active": "פעיל"
+ "active": "פעיל",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json
index 4428fe58..c4bd24b8 100644
--- a/i18n/hu.i18n.json
+++ b/i18n/hu.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "E-mail megváltoztatásának engedélyezése",
"createdAt": "Létrehozva",
"verified": "Ellenőrizve",
- "active": "Aktív"
+ "active": "Aktív",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json
index 2b23b1b4..f24a1e9a 100644
--- a/i18n/hy.i18n.json
+++ b/i18n/hy.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json
index 1f5aa45b..c32dcedf 100644
--- a/i18n/id.i18n.json
+++ b/i18n/id.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json
index 326528f0..80942393 100644
--- a/i18n/ig.i18n.json
+++ b/i18n/ig.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Ekere na",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json
index 58579442..61becc94 100644
--- a/i18n/it.i18n.json
+++ b/i18n/it.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Permetti modifica dell'email",
"createdAt": "creato alle",
"verified": "Verificato",
- "active": "Attivo"
+ "active": "Attivo",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json
index d0c606f0..e3c47226 100644
--- a/i18n/ja.i18n.json
+++ b/i18n/ja.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "メールアドレスの変更を許可",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json
index 896ae201..b54c7533 100644
--- a/i18n/lv.i18n.json
+++ b/i18n/lv.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json
index 43418301..b06306db 100644
--- a/i18n/mn.i18n.json
+++ b/i18n/mn.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json
index d3fd2676..3905d577 100644
--- a/i18n/nb.i18n.json
+++ b/i18n/nb.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json
index 130e9b63..3bc86342 100644
--- a/i18n/nl.i18n.json
+++ b/i18n/nl.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Sta E-mailadres wijzigingen toe",
"createdAt": "Gemaakt op",
"verified": "Geverifieerd",
- "active": "Actief"
+ "active": "Actief",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json
index 26404fdd..5d1a3391 100644
--- a/i18n/pl.i18n.json
+++ b/i18n/pl.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Zezwól na zmianę adresu email",
"createdAt": "Stworzono o",
"verified": "Zweryfikowane",
- "active": "Aktywny"
+ "active": "Aktywny",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json
index 966c5769..32820a9d 100644
--- a/i18n/pt-BR.i18n.json
+++ b/i18n/pt-BR.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Permitir Mudança de Email",
"createdAt": "Criado em",
"verified": "Verificado",
- "active": "Ativo"
+ "active": "Ativo",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json
index b81455bb..038a2c85 100644
--- a/i18n/pt.i18n.json
+++ b/i18n/pt.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verificado",
- "active": "Ativo"
+ "active": "Ativo",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json
index 75fc9e95..b2290528 100644
--- a/i18n/ro.i18n.json
+++ b/i18n/ro.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json
index 68be9d9a..388c2156 100644
--- a/i18n/ru.i18n.json
+++ b/i18n/ru.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Разрешить изменение электронной почты",
"createdAt": "Создано на",
"verified": "Проверено",
- "active": "Действующий"
+ "active": "Действующий",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json
index 67effbdc..334bc9a0 100644
--- a/i18n/sr.i18n.json
+++ b/i18n/sr.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json
index cb864379..3244a084 100644
--- a/i18n/sv.i18n.json
+++ b/i18n/sv.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Tillåt e-poständring",
"createdAt": "Skapad vid",
"verified": "Verifierad",
- "active": "Aktiv"
+ "active": "Aktiv",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json
index 4f60c04e..d1a7ccbf 100644
--- a/i18n/ta.i18n.json
+++ b/i18n/ta.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json
index 8543372a..96542721 100644
--- a/i18n/th.i18n.json
+++ b/i18n/th.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json
index 642a4bd9..81bb2008 100644
--- a/i18n/tr.i18n.json
+++ b/i18n/tr.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "E-posta Değiştirmeye İzin Ver",
"createdAt": "Oluşturulma tarihi",
"verified": "Doğrulanmış",
- "active": "Aktif"
+ "active": "Aktif",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json
index 38bef7df..47bfeea7 100644
--- a/i18n/uk.i18n.json
+++ b/i18n/uk.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json
index 7a7ab781..2581d859 100644
--- a/i18n/vi.i18n.json
+++ b/i18n/vi.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "Allow Email Change",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json
index 37bbeb92..6df88c9d 100644
--- a/i18n/zh-CN.i18n.json
+++ b/i18n/zh-CN.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "允许邮箱变更",
"createdAt": "创建于",
"verified": "已验证",
- "active": "活跃"
+ "active": "活跃",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json
index cff408ac..7a6068c2 100644
--- a/i18n/zh-TW.i18n.json
+++ b/i18n/zh-TW.i18n.json
@@ -435,5 +435,11 @@
"accounts-allowEmailChange": "准許變更電子信箱",
"createdAt": "Created at",
"verified": "Verified",
- "active": "Active"
+ "active": "Active",
+ "card-received": "Received",
+ "card-received-on": "Received on",
+ "card-end": "End",
+ "card-end-on": "Ends on",
+ "editCardReceivedDatePopup-title": "Change received date",
+ "editCardEndDatePopup-title": "Change end date"
} \ No newline at end of file
diff --git a/models/cards.js b/models/cards.js
index 8fd15488..4a662953 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -59,6 +59,10 @@ Cards.attachSchema(new SimpleSchema({
type: [String],
optional: true,
},
+ receivedAt: {
+ type: Date,
+ optional: true,
+ },
startAt: {
type: Date,
optional: true,
@@ -67,6 +71,10 @@ Cards.attachSchema(new SimpleSchema({
type: Date,
optional: true,
},
+ endAt: {
+ type: Date,
+ optional: true,
+ },
spentTime: {
type: Number,
decimal: true,
@@ -271,6 +279,14 @@ Cards.mutations({
return {$unset: {coverId: ''}};
},
+ setReceived(receivedAt) {
+ return {$set: {receivedAt}};
+ },
+
+ unsetReceived() {
+ return {$unset: {receivedAt: ''}};
+ },
+
setStart(startAt) {
return {$set: {startAt}};
},
@@ -287,6 +303,14 @@ Cards.mutations({
return {$unset: {dueAt: ''}};
},
+ setEnd(endAt) {
+ return {$set: {endAt}};
+ },
+
+ unsetEnd() {
+ return {$unset: {endAt: ''}};
+ },
+
setOvertime(isOvertime) {
return {$set: {isOvertime}};
},
diff --git a/models/checklists.js b/models/checklists.js
index 637e280c..9946f98e 100644
--- a/models/checklists.js
+++ b/models/checklists.js
@@ -6,6 +6,7 @@ Checklists.attachSchema(new SimpleSchema({
},
title: {
type: String,
+ defaultValue: 'Checklist',
},
finishedAt: {
type: Date,