sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-11 23:06:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12420 from HabitRPG/bigsee-12271

Browse source 
fix(task list): update todo due date on every save
This commit is contained in:
Matteo Pagliazzi 2020-07-31 11:48:10 +02:00 committed by GitHub
commit 9089b64af3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
website/client/src/components/tasks/task.vue
View file

@ -223,14 +223,14 @@
<div
v-if="task.type === 'todo' && task.date"
class="d-flex align-items-center"
:class="{'due-overdue': isDueOverdue}"
:class="{'due-overdue': checkIfOverdue() }"
>
<div
v-b-tooltip.hover.bottom="$t('dueDate')"
class="svg-icon calendar"
v-html="icons.calendar"
></div>
<span>{{ dueIn }}</span>
<span>{{ formatDueDate() }}</span>
</div>
<div class="icons-right d-flex justify-content-end">
<div
@ -934,24 +934,6 @@ export default {
if (this.task.type === 'habit' && (this.task.up || this.task.down)) return true;
return false;
},
timeTillDue () {
// this.task && is necessary to make sure the computed property updates correctly
const endOfToday = moment().endOf('day');
const endOfDueDate = moment(this.task && this.task.date).endOf('day');
return moment.duration(endOfDueDate.diff(endOfToday));
},
isDueOverdue () {
return this.timeTillDue.asDays() <= 0;
},
dueIn () {
const dueIn = this.timeTillDue.asDays() === 0
? this.$t('today')
: this.timeTillDue.humanize(true);
// this.task && is necessary to make sure the computed property updates correctly
return this.task && this.task.date && this.$t('dueIn', { dueIn });
},
hasTags () {
return this.task.tags && this.task.tags.length > 0;
},
@ -1001,6 +983,22 @@ export default {
item.completed = !item.completed; // @TODO this should go into the action?
this.scoreChecklistItem({ taskId: this.task._id, itemId: item.id });
},
calculateTimeTillDue () {
const endOfToday = moment().endOf('day');
const endOfDueDate = moment(this.task.date).endOf('day');
return moment.duration(endOfDueDate.diff(endOfToday));
},
checkIfOverdue () {
return this.calculateTimeTillDue().asDays() <= 0;
},
formatDueDate () {
const dueIn = this.calculateTimeTillDue().asDays() === 0
? this.$t('today')
: this.calculateTimeTillDue().humanize(true);
return this.task.date && this.$t('dueIn', { dueIn });
},
edit (e, task) {
if (this.isRunningYesterdailies || !this.showEdit) return;