17th-Ranger-Battalion-ORG/17th-Site-Front-End-V2
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

members-api-integration #3

Merged
Ajdj100 merged 5 commits from members-api-integration into master 2024-05-26 10:53:57 -05:00
Conversation 0 Commits 5 Files Changed 2 +10 -6
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a4ebd86a2b - Show all commits

16
17th Website/src/views/users.vue
View File

@@ -11,8 +11,8 @@ export default {
statusFilters: [ statusFilters: [
{ id: 1, name: 'All Groups', filter: 'none', disabled: false }, { id: 1, name: 'All Groups', filter: 'none', disabled: false },
{ id: 2, name: 'Alpha', filter: 'Alpha Company', disabled: false }, { id: 2, name: 'Alpha', filter: 'Alpha', disabled: false },
{ id: 3, name: 'Echo', filter: 'Echo Company', disabled: false }, { id: 3, name: 'Echo', filter: 'Echo', disabled: false },
{ id: 4, name: 'HHC', filter: 'HHC', disabled: false }, { id: 4, name: 'HHC', filter: 'HHC', disabled: false },
{ id: 5, name: 'Recruit', filter: 'Recruit', disabled: false }, { id: 5, name: 'Recruit', filter: 'Recruit', disabled: false },
], ],
@@ -38,14 +38,18 @@ export default {
}, },
filterByName(item) { filterByName(item) {
if (this.search != '') if (this.search != '')
return item.member_name.toLowerCase().includes(this.search.toLowerCase()); return item.name.toLowerCase().includes(this.search.toLowerCase());
else else
return true; return true;
}, },
filterByUnit(item) { filterByUnit(item) {
// console.log(item, this.statusFilters[this.currentStatusFilterIndex]);
if (this.statusFilters[this.currentStatusFilterIndex].filter != 'none') 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 else
//no filter applied
return true; return true;
}, },
filterByRole(item) { //THIS IS NOT IMPLEMENTED YET filterByRole(item) { //THIS IS NOT IMPLEMENTED YET
@@ -74,8 +78,8 @@ export default {
computed: { computed: {
filteredTable() { filteredTable() {
var newTable = this.items; var newTable = this.items;
// newTable = newTable.filter(this.filterByUnit); newTable = newTable.filter(this.filterByUnit);
// newTable = newTable.filter(this.filterByName); newTable = newTable.filter(this.filterByName);
return newTable; return newTable;
}, },
} }