resolved all member management issues, including the critical member creation bug.
Some checks failed
Build And Push Image / docker (push) Failing after 2m36s
Some checks failed
Build And Push Image / docker (push) Failing after 2m36s
This commit is contained in:
@@ -40,7 +40,7 @@
|
||||
<v-col cols="12" md="2">
|
||||
<v-select
|
||||
v-model="statusFilter"
|
||||
:items="statusOptions"
|
||||
:items="membershipLevelOptions"
|
||||
label="Membership Level"
|
||||
variant="outlined"
|
||||
clearable
|
||||
@@ -299,11 +299,12 @@ const activeFilterOptions = [
|
||||
{ title: 'Inactive Members', value: 'inactive' }
|
||||
];
|
||||
|
||||
const statusOptions = [
|
||||
{ title: 'Active', value: 'Active' },
|
||||
{ title: 'Inactive', value: 'Inactive' },
|
||||
{ title: 'Pending', value: 'Pending' },
|
||||
{ title: 'Expired', value: 'Expired' }
|
||||
const membershipLevelOptions = [
|
||||
{ title: 'Regular Member', value: 'regular' },
|
||||
{ title: 'Board Member', value: 'board' },
|
||||
{ title: 'Honorary Member', value: 'honorary' },
|
||||
{ title: 'New Member', value: 'new' },
|
||||
{ title: 'Delinquent Member', value: 'delinquent' }
|
||||
];
|
||||
|
||||
const duesFilterOptions = [
|
||||
@@ -342,11 +343,24 @@ const filteredMembers = computed(() => {
|
||||
}
|
||||
}
|
||||
|
||||
// Status filter (specific membership levels)
|
||||
// Membership level filter (based on status and dues)
|
||||
if (statusFilter.value) {
|
||||
filtered = filtered.filter(member =>
|
||||
member.membership_status === statusFilter.value
|
||||
);
|
||||
filtered = filtered.filter(member => {
|
||||
switch (statusFilter.value) {
|
||||
case 'regular':
|
||||
return member.membership_status === 'Active' && member.current_year_dues_paid === 'true';
|
||||
case 'board':
|
||||
return member.membership_status === 'Active' && member.current_year_dues_paid === 'true';
|
||||
case 'honorary':
|
||||
return member.membership_status === 'Active';
|
||||
case 'new':
|
||||
return member.membership_status === 'Pending' || member.membership_status === 'Active';
|
||||
case 'delinquent':
|
||||
return member.membership_status === 'Active' && member.current_year_dues_paid !== 'true';
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Dues filter
|
||||
|
||||
Reference in New Issue
Block a user