overhauled client member management system
This commit is contained in:
@@ -179,7 +179,9 @@ function blurAfter() {
|
||||
<div>
|
||||
<DropdownMenu v-if="userStore.isLoggedIn">
|
||||
<DropdownMenuTrigger class="cursor-pointer">
|
||||
<p>{{ userStore.user.name }}</p>
|
||||
<Button variant="ghost" class="px-4">
|
||||
{{ userStore.displayName }}
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent>
|
||||
<DropdownMenuItem @click="$router.push('/profile')">My Profile</DropdownMenuItem>
|
||||
|
||||
@@ -105,7 +105,11 @@ onMounted(async () => {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
members.value = await getMembers();
|
||||
if (props.adminMode) {
|
||||
members.value = await getMembers();
|
||||
} else {
|
||||
members.value.push(props.member);
|
||||
}
|
||||
loaTypes.value = await getLoaTypes();
|
||||
resetForm({ values: { member_id: currentMember.value?.member_id } });
|
||||
});
|
||||
@@ -153,7 +157,7 @@ const maxEndDate = computed(() => {
|
||||
<ComboboxInput placeholder="Search members..." class="w-full pl-3"
|
||||
:display-value="(id) => {
|
||||
const m = members.find(mem => mem.member_id === id)
|
||||
return m ? m.member_name : ''
|
||||
return m ? m.displayName || m.member_name : ''
|
||||
}" />
|
||||
</ComboboxAnchor>
|
||||
<ComboboxList class="*:w-64">
|
||||
@@ -162,7 +166,7 @@ const maxEndDate = computed(() => {
|
||||
<template v-for="member in members" :key="member.member_id">
|
||||
<ComboboxItem :value="member.member_id"
|
||||
class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
|
||||
{{ member.member_name }}
|
||||
{{ member.displayName || member.member_name }}
|
||||
<ComboboxItemIndicator
|
||||
class="absolute left-2 inline-flex items-center">
|
||||
<Check class="h-4 w-4" />
|
||||
|
||||
Reference in New Issue
Block a user