17th-Ranger-Battalion-ORG/milsim-site-v4
8
1
Fork 0
Code Issues 21 Pull Requests Actions 3 Packages Projects Releases 8 Wiki Activity

Merge branch 'main' into homepage/welcome

Browse Source
This commit is contained in:
ajdj100
2025-12-16 23:44:50 -05:00
parent 0cfc5ce12b 0a2c6785c6
commit 2f7eb37771
7 changed files with 73 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ui/src/components/loa/loaForm.vue
View File

@@ -134,6 +134,22 @@ const maxEndDate = computed(() => {
return null;
}
})
const memberFilter = ref('');
const filteredMembers = computed(() => {
const q = memberFilter?.value?.toLowerCase() ?? ""
const results: Member[] = []
for (const m of members.value ?? []) {
if (!q || (m.displayName || m.member_name).toLowerCase().includes(q)) {
results.push(m)
if (results.length >= 50) break
}
}
return results
})
</script>
<template>
@@ -157,22 +173,24 @@ 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.displayName || m.member_name : ''
}" />
return m ? m.displayName || m.member_name : ''
}" @input="memberFilter = $event.target.value" />
</ComboboxAnchor>
<ComboboxList class="*:w-64">
<ComboboxEmpty class="text-muted-foreground w-full">No results</ComboboxEmpty>
<ComboboxGroup>
<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.displayName || member.member_name }}
<ComboboxItemIndicator
class="absolute left-2 inline-flex items-center">
<Check class="h-4 w-4" />
</ComboboxItemIndicator>
</ComboboxItem>
</template>
<div class="max-h-80 overflow-y-scroll scrollbar-themed min-w-3xs">
<template v-for="member in filteredMembers" :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.displayName || member.member_name }}
<ComboboxItemIndicator
class="absolute left-2 inline-flex items-center">
<Check class="h-4 w-4" />
</ComboboxItemIndicator>
</ComboboxItem>
</template>
</div>
</ComboboxGroup>
</ComboboxList>
</Combobox>
@@ -286,8 +304,10 @@ const maxEndDate = computed(() => {
</h2>
<p class="max-w-md text-muted-foreground">
Your Leave of Absence request has been submitted successfully.
It will take effect on your selected start date.
{{ adminMode ? 'You have successfully submitted a Leave of Absence on behalf of another member.' :
`Your Leave
of Absence request has been submitted successfully.
It will take effect on your selected start date.` }}
</p>

4
ui/src/components/loa/loaList.vue
View File

@@ -59,7 +59,9 @@ async function loadLOAs() {
LOAList.value = result.data;
pageData.value = result.pagination;
} else {
LOAList.value = await getMyLOAs();
let result = await getMyLOAs(pageNum.value, pageSize.value);
LOAList.value = result.data;
pageData.value = result.pagination;
}
}