From a4ebd86a2b3692b1a164f65851c361adc143ea79 Mon Sep 17 00:00:00 2001 From: ajdj100 Date: Sun, 26 May 2024 11:53:39 -0400 Subject: [PATCH] Fixed the filtering system --- 17th Website/src/views/users.vue | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/17th Website/src/views/users.vue b/17th Website/src/views/users.vue index e21d5ef..5b902bd 100644 --- a/17th Website/src/views/users.vue +++ b/17th Website/src/views/users.vue @@ -11,8 +11,8 @@ export default { statusFilters: [ { id: 1, name: 'All Groups', filter: 'none', disabled: false }, - { id: 2, name: 'Alpha', filter: 'Alpha Company', disabled: false }, - { id: 3, name: 'Echo', filter: 'Echo Company', disabled: false }, + { id: 2, name: 'Alpha', filter: 'Alpha', disabled: false }, + { id: 3, name: 'Echo', filter: 'Echo', disabled: false }, { id: 4, name: 'HHC', filter: 'HHC', disabled: false }, { id: 5, name: 'Recruit', filter: 'Recruit', disabled: false }, ], @@ -38,14 +38,18 @@ export default { }, filterByName(item) { if (this.search != '') - return item.member_name.toLowerCase().includes(this.search.toLowerCase()); + return item.name.toLowerCase().includes(this.search.toLowerCase()); else return true; }, filterByUnit(item) { + // console.log(item, this.statusFilters[this.currentStatusFilterIndex]); + if (this.statusFilters[this.currentStatusFilterIndex].filter != 'none') - return item.status == this.unitFilter.filter; + //do the filter + return item.company.toLowerCase() == this.statusFilters[this.currentStatusFilterIndex].filter.toLowerCase(); else + //no filter applied return true; }, filterByRole(item) { //THIS IS NOT IMPLEMENTED YET @@ -74,8 +78,8 @@ export default { computed: { filteredTable() { var newTable = this.items; - // newTable = newTable.filter(this.filterByUnit); - // newTable = newTable.filter(this.filterByName); + newTable = newTable.filter(this.filterByUnit); + newTable = newTable.filter(this.filterByName); return newTable; }, }