From 063bcdf56e9aa2fdf3d0e57c83bc315d09e8ff6f Mon Sep 17 00:00:00 2001 From: forough-jalili Date: Mon, 10 Jun 2019 12:35:06 +0430 Subject: [PATCH] Updated filterin g and sorting items in inprogress items tab, #513 --- src/components/InProgressItems.vue | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/components/InProgressItems.vue b/src/components/InProgressItems.vue index 92badb26..45043355 100644 --- a/src/components/InProgressItems.vue +++ b/src/components/InProgressItems.vue @@ -192,26 +192,26 @@ export default { { label: 'Name', className: 'name', - isSortingActive: this.inProgressNuggetsSortCriteria.field === 'title', + isSortingActive: this.inProgressNuggetsSortCriteria.field === 'issueTitle', isFilteringActive: null, - field: 'title', + field: 'issueTitle', filteringItems: null }, { label: 'Tempo', className: 'tempo', - isSortingActive: this.inProgressNuggetsSortCriteria.field === 'boarding', + isSortingActive: this.inProgressNuggetsSortCriteria.field === 'issueBoarding', isFilteringActive: null, - field: 'boarding', - filteringItems: this.itemBoardings + field: 'issueBoarding', + filteringItems: this.issueBoarding }, { label: 'Type', className: 'type', - isSortingActive: this.inProgressNuggetsSortCriteria.field === 'kind', + isSortingActive: this.inProgressNuggetsSortCriteria.field === 'issueKind', isFilteringActive: null, - field: 'kind', - filteringItems: this.itemKinds + field: 'issueKind', + filteringItems: this.issueKind }, { label: 'Time Card', @@ -248,9 +248,9 @@ export default { { label: 'Project', className: 'project', - isSortingActive: this.inProgressNuggetsSortCriteria.field === 'project', + isSortingActive: this.inProgressNuggetsSortCriteria.field === 'projectTitle', isFilteringActive: null, - field: 'project', + field: 'projectTitle', filteringItems: null }, { @@ -259,7 +259,7 @@ export default { isSortingActive: this.inProgressNuggetsSortCriteria.field === 'priority', isFilteringActive: null, field: 'priority', - filteringItems: this.itemPriorities + filteringItems: null }, { label: 'Phase', @@ -278,9 +278,8 @@ export default { 'phases', 'inProgressNuggetsSortCriteria', 'inProgressNuggetsFilters', - 'itemBoardings', - 'itemKinds', - 'itemPriorities' + 'issueBoarding', + 'issueKind' ]) }, watch: {