From c646254616fa67115bc0c84bf456416f3b9e0d06 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Tue, 27 Jan 2026 15:00:29 -0500
Subject: [PATCH] first pass of discharge form

---
 ui/src/components/members/DischargeMember.vue |  91 +++++
 ui/src/pages/memberList.vue                   | 315 +++++++++---------
 2 files changed, 253 insertions(+), 153 deletions(-)
 create mode 100644 ui/src/components/members/DischargeMember.vue

diff --git a/ui/src/components/members/DischargeMember.vue b/ui/src/components/members/DischargeMember.vue
new file mode 100644
index 0000000..ba3849d
--- /dev/null
+++ b/ui/src/components/members/DischargeMember.vue
@@ -0,0 +1,91 @@
+<script setup lang="ts">
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form, Field as VeeField } from 'vee-validate'
+import * as z from 'zod'
+import { X, AlertTriangle } from 'lucide-vue-next'
+
+import { Button } from '@/components/ui/button'
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+} from '@/components/ui/dialog'
+import { Field, FieldLabel, FieldError } from '@/components/ui/field'
+import { Input } from '@/components/ui/input'
+import { Textarea } from '@/components/ui/textarea'
+import MemberCard from './MemberCard.vue'
+import { Member } from '@shared/types/member'
+
+// 1. Props for control and data
+const props = defineProps<{
+    open: boolean
+    member: Member | null
+}>()
+
+const emit = defineEmits(['update:open', 'discharged'])
+
+// 2. Discharge-specific schema
+const formSchema = toTypedSchema(z.object({
+    reason: z.string().min(1, "Please provide a valid reason for discharge").max(200),
+    effectiveDate: z.string().min(1, "Date is required"),
+}))
+
+function onSubmit(values: any) {
+    console.log('Discharging member:', props.member?.member_id)
+    console.log('Discharge Data:', values)
+
+    // Notify parent to refresh/close
+    emit('discharged', { memberId: props.member?.member_id, ...values })
+    emit('update:open', false)
+}
+</script>
+
+<template>
+    <Dialog :open="open" @update:open="emit('update:open', $event)">
+        <DialogContent class="sm:max-w-[425px]">
+            <DialogHeader>
+                <div class="flex items-center gap-2 mb-1">
+                    <!-- <AlertTriangle class="size-5" /> -->
+                    <DialogTitle>Discharge Member</DialogTitle>
+                </div>
+                <DialogDescription>
+                    You are initiating the discharge process for <MemberCard :member-id="member.member_id"></MemberCard>
+                    <!-- <span class="font-semibold text-foreground">{{ member }}</span> -->
+                </DialogDescription>
+            </DialogHeader>
+
+            <Form v-slot="{ handleSubmit }" as="" :validation-schema="formSchema">
+                <form id="dischargeForm" @submit="handleSubmit($event, onSubmit)" class="space-y-4 py-2">
+                    <VeeField v-slot="{ componentField, errors }" name="reason">
+                        <Field :data-invalid="!!errors.length">
+                            <FieldLabel>Reason for Discharge</FieldLabel>
+                            <Textarea placeholder="Retirement, inactivity, etc. "
+                                v-bind="componentField" class="resize-none" />
+                            <FieldError v-if="errors.length" :errors="errors" />
+                        </Field>
+                    </VeeField>
+
+                    <VeeField v-slot="{ componentField, errors }" name="effectiveDate">
+                        <Field :data-invalid="!!errors.length">
+                            <FieldLabel>Effective Date</FieldLabel>
+                            <Input type="date" v-bind="componentField" />
+                            <FieldError v-if="errors.length" :errors="errors" />
+                        </Field>
+                    </VeeField>
+                </form>
+            </Form>
+
+            <DialogFooter class="gap-2 sm:gap-0">
+                <Button variant="ghost" @click="emit('update:open', false)">
+                    Cancel
+                </Button>
+                <Button type="submit" form="dischargeForm" variant="destructive">
+                    Discharge
+                </Button>
+            </DialogFooter>
+        </DialogContent>
+    </Dialog>
+</template>
\ No newline at end of file
diff --git a/ui/src/pages/memberList.vue b/ui/src/pages/memberList.vue
index df2a858..81a45d2 100644
--- a/ui/src/pages/memberList.vue
+++ b/ui/src/pages/memberList.vue
@@ -30,6 +30,7 @@ import { Button } from "@/components/ui/button";
 import Badge from "@/components/ui/badge/Badge.vue";
 import Input from "@/components/ui/input/Input.vue";
 import Spinner from "@/components/ui/spinner/Spinner.vue";
+import DischargeMember from "@/components/members/DischargeMember.vue";
 
 // --- State ---
 const router = useRouter();
@@ -128,172 +129,180 @@ onMounted(() => {
     fetchUnits();
     fetchMembers();
 });
+
+//discharge form logic
+const isDischargeOpen = ref(false)
+const targetMember = ref(null)
+
+function openDischargeModal(member) {
+    targetMember.value = member
+    isDischargeOpen.value = true
+}
+
+function handleDischargeSuccess(data) {
+    // Refresh your list or show a toast
+    console.log('Member removed from list:', data.memberId)
+}
 </script>
 
 <template>
-    <div class="mx-auto max-w-7xl w-full py-10 px-4">
-        <div class="flex flex-col gap-2">
-            <div class="flex flex-col md:flex-row md:items-center justify-between gap-4">
-                <div class="space-y-0.5">
-                    <h1 class="text-2xl font-bold tracking-tight text-foreground">Member Management</h1>
-                    <p class="text-muted-foreground text-sm">Directory of all personnel and unit assignments.</p>
+    <div>
+        <DischargeMember v-model:open="isDischargeOpen" :member="targetMember" @discharged="handleDischargeSuccess">
+        </DischargeMember>
+        <div class="mx-auto max-w-7xl w-full py-10 px-4">
+            <div class="flex flex-col gap-2">
+                <div class="flex flex-col md:flex-row md:items-center justify-between gap-4">
+                    <div class="space-y-0.5">
+                        <h1 class="text-2xl font-bold tracking-tight text-foreground">Member Management</h1>
+                        <p class="text-muted-foreground text-sm">Directory of all personnel and unit assignments.</p>
+                    </div>
                 </div>
-
-            </div>
-
-            <div class="flex flex-col gap-4 sm:flex-row sm:items-center justify-between border-y border-border/40 py-3">
-                <div class="flex items-center gap-2">
-                    <Select v-model="filters.status">
-                        <SelectTrigger
-                            class="h-8 w-fit min-w-[110px] border-none bg-muted/50 hover:bg-muted transition-colors text-xs">
-                            <SelectValue placeholder="Status" />
-                        </SelectTrigger>
-                        <SelectContent>
-                            <SelectItem value="all">All Statuses</SelectItem>
-                            <SelectItem v-for="s in MEMBER_STATUSES" :key="s" :value="s">
-                                <span class="capitalize">{{ s }}</span>
-                            </SelectItem>
-                        </SelectContent>
-                    </Select>
-
-                    <Select v-model="filters.unitId">
-                        <SelectTrigger
-                            class="h-8 w-fit min-w-[110px] border-none bg-muted/50 hover:bg-muted transition-colors text-xs">
-                            <SelectValue placeholder="Unit" />
-                        </SelectTrigger>
-                        <SelectContent>
-                            <SelectItem value="all">All Units</SelectItem>
-                            <SelectItem v-for="u in units" :key="u.id" :value="u.name">
-                                {{ u.name }}
-                            </SelectItem>
-                        </SelectContent>
-                    </Select>
-
-                    <div v-if="filters.status !== 'all' || filters.unitId !== 'all'"
-                        class="h-4 w-[1px] bg-border mx-1" />
-
-                    <Button v-if="filters.status !== 'all' || filters.unitId !== 'all'" variant="ghost" size="sm"
-                        class="h-8 px-2 text-xs text-muted-foreground"
-                        @click="filters.status = 'all'; filters.unitId = 'all'">
-                        Clear Filters
-                    </Button>
-                </div>
-
-                <div class="flex items-center gap-2">
-                    <div class="relative w-full sm:w-[260px]">
-                        <Search class="absolute left-3 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground/50" />
-                        <Input v-model="filters.search" placeholder="Search members..."
-                            class="h-8 pl-9 pr-8 bg-background text-xs focus-visible:ring-1" />
-                        <button v-if="filters.search" @click="filters.search = ''"
-                            class="absolute right-2.5 top-1/2 -translate-y-1/2 text-muted-foreground/60 hover:text-foreground transition-colors">
-                            <X class="size-3.5" />
-                        </button>
+                <div
+                    class="flex flex-col gap-4 sm:flex-row sm:items-center justify-between border-y border-border/40 py-3">
+                    <div class="flex items-center gap-2">
+                        <Select v-model="filters.status">
+                            <SelectTrigger
+                                class="h-8 w-fit min-w-[110px] border-none bg-muted/50 hover:bg-muted transition-colors text-xs">
+                                <SelectValue placeholder="Status" />
+                            </SelectTrigger>
+                            <SelectContent>
+                                <SelectItem value="all">All Statuses</SelectItem>
+                                <SelectItem v-for="s in MEMBER_STATUSES" :key="s" :value="s">
+                                    <span class="capitalize">{{ s }}</span>
+                                </SelectItem>
+                            </SelectContent>
+                        </Select>
+                        <Select v-model="filters.unitId">
+                            <SelectTrigger
+                                class="h-8 w-fit min-w-[110px] border-none bg-muted/50 hover:bg-muted transition-colors text-xs">
+                                <SelectValue placeholder="Unit" />
+                            </SelectTrigger>
+                            <SelectContent>
+                                <SelectItem value="all">All Units</SelectItem>
+                                <SelectItem v-for="u in units" :key="u.id" :value="u.name">
+                                    {{ u.name }}
+                                </SelectItem>
+                            </SelectContent>
+                        </Select>
+                        <div v-if="filters.status !== 'all' || filters.unitId !== 'all'"
+                            class="h-4 w-[1px] bg-border mx-1" />
+                        <Button v-if="filters.status !== 'all' || filters.unitId !== 'all'" variant="ghost" size="sm"
+                            class="h-8 px-2 text-xs text-muted-foreground"
+                            @click="filters.status = 'all'; filters.unitId = 'all'">
+                            Clear Filters
+                        </Button>
+                    </div>
+                    <div class="flex items-center gap-2">
+                        <div class="relative w-full sm:w-[260px]">
+                            <Search
+                                class="absolute left-3 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground/50" />
+                            <Input v-model="filters.search" placeholder="Search members..."
+                                class="h-8 pl-9 pr-8 bg-background text-xs focus-visible:ring-1" />
+                            <button v-if="filters.search" @click="filters.search = ''"
+                                class="absolute right-2.5 top-1/2 -translate-y-1/2 text-muted-foreground/60 hover:text-foreground transition-colors">
+                                <X class="size-3.5" />
+                            </button>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <div class="min-h-[500px]">
-            <Table>
-                <TableHeader>
-                    <TableRow class="hover:bg-transparent border-b">
-                        <TableHead class="w-[200px]">Member</TableHead>
-                        <TableHead>Rank</TableHead>
-                        <TableHead>Unit</TableHead>
-                        <TableHead>Status</TableHead>
-                        <TableHead>Notes</TableHead>
-                        <TableHead class="text-right">Actions</TableHead>
-                    </TableRow>
-                </TableHeader>
-
-                <TableBody>
-                    <template v-if="isLoaded">
-                        <TableRow v-for="member in paginatedMembers" :key="member.member_id"
-                            class="group cursor-pointer hover:bg-muted/30 transition-colors">
-                            <TableCell class="font-medium py-4">{{ member.member_name }}</TableCell>
-                            <TableCell>{{ member.rank }}</TableCell>
-                            <TableCell>{{ member.unit }}</TableCell>
-                            <TableCell>
-                                <Badge variant="outline" class="capitalize font-normal">{{ member.status }}</Badge>
-                            </TableCell>
-                            <TableCell>
-                                <Badge v-if="member.loa_until" variant="secondary"
-                                    class="bg-yellow-500/10 text-yellow-600 border-none">On LOA</Badge>
-                            </TableCell>
-                            <TableCell class="text-right" @click.stop>
-                                <DropdownMenu>
-                                    <DropdownMenuTrigger as-child>
-                                        <Button variant="ghost" size="icon" class="hover:bg-muted">
-                                            <Ellipsis class="size-5" />
-                                        </Button>
-                                    </DropdownMenuTrigger>
-                                    <DropdownMenuContent align="end" class="w-48">
-                                        <!-- <DropdownMenuItem @click="navigateToMember(member.member_id)">
-                                            View Profile
-                                        </DropdownMenuItem> -->
-                                        <DropdownMenuItem
-                                            class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
-                                            Discharge Member
-                                        </DropdownMenuItem>
-                                    </DropdownMenuContent>
-                                </DropdownMenu>
-                            </TableCell>
+            <div class="min-h-[500px]">
+                <Table>
+                    <TableHeader>
+                        <TableRow class="hover:bg-transparent border-b">
+                            <TableHead class="w-[200px]">Member</TableHead>
+                            <TableHead>Rank</TableHead>
+                            <TableHead>Unit</TableHead>
+                            <TableHead>Status</TableHead>
+                            <TableHead>Notes</TableHead>
+                            <TableHead class="text-right">Actions</TableHead>
                         </TableRow>
-
-                        <TableRow v-if="paginatedMembers.length === 0" class="hover:bg-transparent">
+                    </TableHeader>
+                    <TableBody>
+                        <template v-if="isLoaded">
+                            <TableRow v-for="member in paginatedMembers" :key="member.member_id"
+                                class="group cursor-pointer hover:bg-muted/30 transition-colors">
+                                <TableCell class="font-medium py-4">{{ member.member_name }}</TableCell>
+                                <TableCell>{{ member.rank }}</TableCell>
+                                <TableCell>{{ member.unit }}</TableCell>
+                                <TableCell>
+                                    <Badge variant="outline" class="capitalize font-normal">{{ member.status }}</Badge>
+                                </TableCell>
+                                <TableCell>
+                                    <Badge v-if="member.loa_until" variant="secondary"
+                                        class="bg-yellow-500/10 text-yellow-600 border-none">On LOA</Badge>
+                                </TableCell>
+                                <TableCell class="text-right" @click.stop>
+                                    <DropdownMenu>
+                                        <DropdownMenuTrigger as-child>
+                                            <Button variant="ghost" size="icon" class="hover:bg-muted">
+                                                <Ellipsis class="size-5" />
+                                            </Button>
+                                        </DropdownMenuTrigger>
+                                        <DropdownMenuContent align="end" class="w-48">
+                                            <!-- <DropdownMenuItem @click="navigateToMember(member.member_id)">
+                                                View Profile
+                                            </DropdownMenuItem> -->
+                                            <DropdownMenuItem @click="openDischargeModal(member)"
+                                                class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
+                                                Discharge Member
+                                            </DropdownMenuItem>
+                                        </DropdownMenuContent>
+                                    </DropdownMenu>
+                                </TableCell>
+                            </TableRow>
+                            <TableRow v-if="paginatedMembers.length === 0" class="hover:bg-transparent">
+                                <TableCell colspan="6" class="h-64 text-center">
+                                    <div class="flex flex-col items-center justify-center gap-2 text-muted-foreground">
+                                        <UserX class="size-10 opacity-20 mb-2" />
+                                        <p class="font-medium">No results found</p>
+                                        <p class="text-xs">Try adjusting your filters or search query.</p>
+                                    </div>
+                                </TableCell>
+                            </TableRow>
+                        </template>
+                        <TableRow v-else>
                             <TableCell colspan="6" class="h-64 text-center">
-                                <div class="flex flex-col items-center justify-center gap-2 text-muted-foreground">
-                                    <UserX class="size-10 opacity-20 mb-2" />
-                                    <p class="font-medium">No results found</p>
-                                    <p class="text-xs">Try adjusting your filters or search query.</p>
+                                <div class="flex flex-col items-center justify-center gap-4 text-muted-foreground">
+                                    <Spinner class="size-8" />
                                 </div>
                             </TableCell>
                         </TableRow>
-                    </template>
-
-                    <TableRow v-else>
-                        <TableCell colspan="6" class="h-64 text-center">
-                            <div class="flex flex-col items-center justify-center gap-4 text-muted-foreground">
-                                <Spinner class="size-8" />
-                            </div>
-                        </TableCell>
-                    </TableRow>
-                </TableBody>
-            </Table>
-        </div>
-
-        <div class="mt-8 flex flex-col sm:flex-row items-center justify-between gap-4 border-t pt-6">
-            <div class="flex items-center gap-3 text-sm">
-                <p class="text-muted-foreground text-nowrap">Items per page:</p>
-                <div class="flex bg-muted/50 p-1 rounded-md">
-                    <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
-                        class="px-3 py-1 rounded transition-all text-xs"
-                        :class="pageSize === size ? 'bg-background shadow-sm font-bold' : 'hover:text-foreground opacity-60'">
-                        {{ size }}
-                    </button>
-                </div>
+                    </TableBody>
+                </Table>
+            </div>
+            <div class="mt-8 flex flex-col sm:flex-row items-center justify-between gap-4 border-t pt-6">
+                <div class="flex items-center gap-3 text-sm">
+                    <p class="text-muted-foreground text-nowrap">Items per page:</p>
+                    <div class="flex bg-muted/50 p-1 rounded-md">
+                        <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
+                            class="px-3 py-1 rounded transition-all text-xs"
+                            :class="pageSize === size ? 'bg-background shadow-sm font-bold' : 'hover:text-foreground opacity-60'">
+                            {{ size }}
+                        </button>
+                    </div>
+                </div>
+                <Pagination v-if="totalItems > 0" :total="totalItems" :items-per-page="pageSize" :page="pageNum"
+                    :sibling-count="1" @update:page="setPage">
+                    <PaginationContent v-slot="{ items }">
+                        <PaginationPrevious />
+                        <template v-for="(item, index) in items" :key="index">
+                            <PaginationItem v-if="item.type === 'page'" :value="item.value"
+                                :is-active="item.value === pageNum">
+                                <Button variant="ghost" size="sm" :class="{ 'bg-muted': pageNum === item.value }"
+                                    @click="setPage(item.value)">
+                                    {{ item.value }}
+                                </Button>
+                            </PaginationItem>
+                            <PaginationEllipsis v-else-if="item.type === 'ellipsis'" :key="`ellipsis-${index}`" />
+                        </template>
+                        <PaginationNext />
+                    </PaginationContent>
+                </Pagination>
+                <p class="text-xs text-muted-foreground w-[100px] text-right">
+                    Total: {{ totalItems }}
+                </p>
             </div>
-
-            <Pagination v-if="totalItems > 0" :total="totalItems" :items-per-page="pageSize" :page="pageNum"
-                :sibling-count="1" @update:page="setPage">
-                <PaginationContent v-slot="{ items }">
-                    <PaginationPrevious />
-                    <template v-for="(item, index) in items" :key="index">
-                        <PaginationItem v-if="item.type === 'page'" :value="item.value"
-                            :is-active="item.value === pageNum">
-                            <Button variant="ghost" size="sm" :class="{ 'bg-muted': pageNum === item.value }"
-                                @click="setPage(item.value)">
-                                {{ item.value }}
-                            </Button>
-                        </PaginationItem>
-                        <PaginationEllipsis v-else-if="item.type === 'ellipsis'" :key="`ellipsis-${index}`" />
-                    </template>
-                    <PaginationNext />
-                </PaginationContent>
-            </Pagination>
-
-            <p class="text-xs text-muted-foreground w-[100px] text-right">
-                Total: {{ totalItems }}
-            </p>
         </div>
     </div>
 </template>
\ No newline at end of file