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

Merge pull request '#120-LOA-Extension-Bug' (#153) from #120-LOA-Extension-Bug into main
All checks were successful
Continuous Integration / Update Development (push) Successful in 2m40s
Details

Browse Source 
Reviewed-on: #153
This commit was merged in pull request #153.
This commit is contained in:
Ajdj100
2026-01-17 09:24:05 -06:00
parent 3ff28de269 afbb771061
commit 7fff220053
1 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,15 +75,17 @@ function formatDate(date: Date): string {
}); });
} }
function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Overdue" | "Closed" { function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Extended" | "Overdue" | "Closed" {
if (loa.closed) return "Closed"; if (loa.closed) return "Closed";
const now = new Date(); const now = new Date();
const start = new Date(loa.start_date); const start = new Date(loa.start_date);
const end = new Date(loa.end_date); const end = new Date(loa.end_date);
const extension = new Date(loa.extended_till);
if (now < start) return "Upcoming"; if (now < start) return "Upcoming";
if (now >= start && now <= end) return "Active"; if (now >= start && (now <= end)) return "Active";
if (now >= start && (now <= extension)) return "Extended";
if (now > loa.extended_till || end) return "Overdue"; if (now > loa.extended_till || end) return "Overdue";
return "Overdue"; // fallback return "Overdue"; // fallback
@@ -191,6 +193,7 @@ function setPage(pagenum: number) {
<TableCell> <TableCell>
<Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-400">Upcoming</Badge> <Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-400">Upcoming</Badge>
<Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge> <Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge>
<Badge v-else-if="loaStatus(post) === 'Extended'" class="bg-green-500">Extended</Badge>
<Badge v-else-if="loaStatus(post) === 'Overdue'" class="bg-yellow-400">Overdue</Badge> <Badge v-else-if="loaStatus(post) === 'Overdue'" class="bg-yellow-400">Overdue</Badge>
<Badge v-else class="bg-gray-400">Ended</Badge> <Badge v-else class="bg-gray-400">Ended</Badge>
</TableCell> </TableCell>
@@ -232,27 +235,47 @@ function setPage(pagenum: number) {
<TableRow v-if="expanded === post.id" @mouseenter="hoverID = post.id" <TableRow v-if="expanded === post.id" @mouseenter="hoverID = post.id"
@mouseleave="hoverID = null" :class="{ 'bg-muted/50 border-t-0': hoverID === post.id }"> @mouseleave="hoverID = null" :class="{ 'bg-muted/50 border-t-0': hoverID === post.id }">
<TableCell :colspan="8" class="p-0"> <TableCell :colspan="8" class="p-0">
<div class="w-full p-3 mb-6 space-y-3"> <div class="w-full p-4 mb-6 space-y-4">
<div class="flex justify-between items-start gap-4">
<div class="space-y-3 w-full">
<!-- Header -->
<div class="flex items-center gap-2">
<h4 class="text-sm font-semibold text-foreground">
Reason
</h4>
<Separator class="flex-1" />
</div>
<!-- Content -->
<div
class="rounded-lg border bg-muted/40 px-4 py-3 text-sm leading-relaxed whitespace-pre-wrap text-muted-foreground w-full">
{{ post.reason || 'No reason provided.' }}
</div>
<!-- Dates -->
<div class="grid grid-cols-3 gap-4 text-sm">
<div>
<p class="text-muted-foreground">Start</p>
<p class="font-medium">
{{ formatDate(post.start_date) }}
</p>
</div> </div>
<div>
<p class="text-muted-foreground">Original end</p>
<p class="font-medium">
{{ formatDate(post.end_date) }}
</p>
</div>
<div class="">
<p class="text-muted-foreground">Extended to</p>
<p class="font-medium text-foreground">
{{post.extended_till ? formatDate(post.extended_till) : 'N/A' }}
</p>
</div>
</div> </div>
<!-- Reason -->
<div class="space-y-2">
<div class="flex items-center gap-2">
<h4 class="text-sm font-semibold text-foreground">
Reason
</h4>
<Separator class="flex-1" />
</div>
<div
class="rounded-lg border bg-muted/40 px-4 py-3 text-sm leading-relaxed whitespace-pre-wrap text-muted-foreground">
{{ post.reason || 'No reason provided.' }}
</div>
</div>
</div> </div>
</TableCell> </TableCell>
</TableRow> </TableRow>