krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Filter dailies by due/not due in group plan and challenge page (#10582)

Browse Source 
* sort by isDue works but only on refresh

* update isDue for new tasks

* apply correct filter to challenge page
This commit is contained in:
Isabelle Lavandero
2018-08-17 05:58:43 -04:00
committed by Matteo Pagliazzi
parent b977d42402
commit cce9b33844
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/client/components/tasks/column.vue
View File

@@ -362,7 +362,7 @@ export default {
type: this.type,
filterType: this.activeFilter.label,
}) :
this.filterByCompleted(this.taskListOverride, this.activeFilter.label);
this.filterByLabel(this.taskListOverride, this.activeFilter.label);
let taggedList = this.filterByTagList(filteredTaskList, this.selectedTags);
let searchedList = this.filterBySearchText(taggedList, this.searchText);
@@ -598,10 +598,12 @@ export default {
}
});
},
filterByCompleted (taskList, filter) {
filterByLabel (taskList, filter) {
if (!taskList) return [];
return taskList.filter(task => {
if (filter === 'complete2') return task.completed;
if (filter === 'due') return task.isDue;
if (filter === 'notDue') return !task.isDue;
return !task.completed;
});
},

7
website/client/components/tasks/taskModal.vue
View File

@@ -923,17 +923,18 @@ export default {
if (this.purpose === 'create') {
if (this.challengeId) {
this.$store.dispatch('tasks:createChallengeTasks', {
const response = await this.$store.dispatch('tasks:createChallengeTasks', {
challengeId: this.challengeId,
tasks: [this.task],
});
Object.assign(this.task, response);
this.$emit('taskCreated', this.task);
} else if (this.groupId) {
await this.$store.dispatch('tasks:createGroupTasks', {
const response = await this.$store.dispatch('tasks:createGroupTasks', {
groupId: this.groupId,
tasks: [this.task],
});
Object.assign(this.task, response);
let promises = this.assignedMembers.map(memberId => {
return this.$store.dispatch('tasks:assignTask', {
taskId: this.task._id,