diff --git a/frontend/app/scripts/controllers/case/CaseListCtrl.js b/frontend/app/scripts/controllers/case/CaseListCtrl.js index 4d44f9e5fe..f56248e4b9 100644 --- a/frontend/app/scripts/controllers/case/CaseListCtrl.js +++ b/frontend/app/scripts/controllers/case/CaseListCtrl.js @@ -238,12 +238,36 @@ }); }; + this.filterByResolutionStatus = function(status) { + this.filtering.clearFilters() + .then(function() { + self.filtering.addFilterValue('resolutionStatus', status); + self.addFilterValue('status', 'Resolved'); + }); + }; + this.sortBy = function(sort) { this.list.sort = sort; this.list.update(); this.filtering.setSort(sort); }; + this.sortByField = function(field) { + var context = this.filtering.context; + var currentSort = Array.isArray(context.sort) ? _.without(context.sort, '-flag', '+flag')[0] : context.sort; + var sort = null; + + if(currentSort.substr(1) !== field) { + sort = ['-flag', '+' + field]; + } else { + sort = ['-flag', (currentSort === '+' + field) ? '-'+field : '+'+field]; + } + + self.list.sort = sort; + self.list.update(); + self.filtering.setSort(sort); + }; + this.bulkEdit = function() { var modal = $uibModal.open({ animation: 'true', diff --git a/frontend/app/styles/case.css b/frontend/app/styles/case.css index 839531f7eb..3a71aae0e0 100644 --- a/frontend/app/styles/case.css +++ b/frontend/app/styles/case.css @@ -95,3 +95,7 @@ pre.error-trace { white-space: pre-wrap; background-color: #f9f1f1; } + +td.case-status { + text-align: center; +} diff --git a/frontend/app/views/directives/task-progress.html b/frontend/app/views/directives/task-progress.html index b95c5fbb5c..454c1c2811 100644 --- a/frontend/app/views/directives/task-progress.html +++ b/frontend/app/views/directives/task-progress.html @@ -1,4 +1,4 @@ -