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 branch 'main' into devcontainers

Browse Source
This commit is contained in:
Ajdj100
2026-02-03 19:09:30 -06:00
parent d0839ed51d a7c8380c16
commit c4f46eeffd
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/services/db/loaService.ts
View File

@@ -69,7 +69,7 @@ export async function getUserActiveLOA(userId: number): Promise<LOARequest[]> {
FROM leave_of_absences FROM leave_of_absences
WHERE member_id = ? WHERE member_id = ?
AND closed IS NULL AND closed IS NULL
AND UTC_TIMESTAMP() BETWEEN start_date AND end_date;` AND UTC_TIMESTAMP() > start_date;`
const LOAData = await pool.query(sql, [userId]); const LOAData = await pool.query(sql, [userId]);
return LOAData; return LOAData;
} }

8
ui/src/App.vue
View File

@@ -36,8 +36,12 @@ const version = import.meta.env.VITE_APPLICATION_VERSION;
</Alert> </Alert>
<Alert v-if="userStore.user?.LOAs?.[0]" class="m-2 mx-auto max-w-5xl" variant="info"> <Alert v-if="userStore.user?.LOAs?.[0]" class="m-2 mx-auto max-w-5xl" variant="info">
<AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto"> <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
<p>You are on LOA until <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till || <p v-if="new Date(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) > new Date()">
userStore.user?.LOAs?.[0].end_date) }}</strong></p> LOA until <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) }}</strong>
</p>
<p v-else>
LOA expired on <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) }}</strong>
</p>
<Button variant="secondary" <Button variant="secondary"
@click="async () => { await cancelLOA(userStore.user.LOAs?.[0].id); userStore.loadUser(); }">End @click="async () => { await cancelLOA(userStore.user.LOAs?.[0].id); userStore.loadUser(); }">End
LOA</Button> LOA</Button>