From 321cb80c066bf9968bb419702eb08125d6476a8a Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 2 Feb 2026 00:28:31 -0500
Subject: [PATCH 1/3] fixed overdue LOA's not being sent to the client

---
 api/src/services/db/loaService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/services/db/loaService.ts b/api/src/services/db/loaService.ts
index d6a9c40..b7131bf 100644
--- a/api/src/services/db/loaService.ts
+++ b/api/src/services/db/loaService.ts
@@ -69,7 +69,7 @@ export async function getUserActiveLOA(userId: number): Promise<LOARequest[]> {
             FROM leave_of_absences
             WHERE member_id = ?
             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]);
     return LOAData;
 }

From 6f57e12a4226e873d4095d20480e5d4cf029122c Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 2 Feb 2026 00:35:57 -0500
Subject: [PATCH 2/3] Improved ovedue message

---
 ui/src/App.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/src/App.vue b/ui/src/App.vue
index 7e208d0..82bfe12 100644
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -36,8 +36,12 @@ const version = import.meta.env.VITE_APPLICATION_VERSION;
       </Alert>
       <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">
-          <p>You are on LOA until <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till ||
-            userStore.user?.LOAs?.[0].end_date) }}</strong></p>
+            <p v-if="new Date(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) > new Date()" class="text-yellow-600">
+            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"
             @click="async () => { await cancelLOA(userStore.user.LOAs?.[0].id); userStore.loadUser(); }">End
             LOA</Button>

From ea23589162a42ffac666fc73da1ef9d9cd6a9826 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 2 Feb 2026 00:38:50 -0500
Subject: [PATCH 3/3] WHOOPS FIXED WRONG TEXT COLOR IN BANNER

---
 ui/src/App.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/src/App.vue b/ui/src/App.vue
index 7e208d0..018ded8 100644
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -36,8 +36,12 @@ const version = import.meta.env.VITE_APPLICATION_VERSION;
       </Alert>
       <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">
-          <p>You are on LOA until <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till ||
-            userStore.user?.LOAs?.[0].end_date) }}</strong></p>
+            <p v-if="new Date(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) > new Date()">
+            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"
             @click="async () => { await cancelLOA(userStore.user.LOAs?.[0].id); userStore.loadUser(); }">End
             LOA</Button>