From d4377c7d90f24bdbce6baf9b52ce93388e19882a Mon Sep 17 00:00:00 2001
From: Soham Gangrade <soham.gangrade.sg@gmail.com>
Date: Tue, 27 Oct 2026 16:30:08 -0400
Subject: [PATCH 1/2] Fixed location not showing in the 2 hour reminder email

---
 peopleportal/server/src/clients/AgendaClient/Jobs/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/peopleportal/server/src/clients/AgendaClient/Jobs/index.ts b/peopleportal/server/src/clients/AgendaClient/Jobs/index.ts
index 0a5a0c8..5711fe3 100644
--- a/peopleportal/server/src/clients/AgendaClient/Jobs/index.ts
+++ b/peopleportal/server/src/clients/AgendaClient/Jobs/index.ts
@@ -67,7 +67,7 @@ class JobHelperFunctions {
                 endTime: event.endTime.toLocaleString("en-US", {
                     timeZone: "America/New_York",
                 }),
-                location: event.location,
+                eventLocation: event.location,
                 inviteLink: inviteLink,
                 googleCalendarLink: gCalendarLink,
             },

From 44dadff81b9fb6c3efa6e593c9a7b6a2c3ec9223 Mon Sep 17 00:00:00 2001
From: Soham Gangrade <soham.gangrade.sg@gmail.com>
Date: Wed, 28 Oct 2026 00:19:48 -0400
Subject: [PATCH 2/2] Show Cancelled instead of Declined for cancelled RSVPs

---
 .../src/components/fabric/EventAttendance.tsx      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/peopleportal/webui/src/components/fabric/EventAttendance.tsx b/peopleportal/webui/src/components/fabric/EventAttendance.tsx
index 6619dd9..97349c9 100644
--- a/peopleportal/webui/src/components/fabric/EventAttendance.tsx
+++ b/peopleportal/webui/src/components/fabric/EventAttendance.tsx
@@ -175,6 +175,16 @@ const statusVariant = (
             return "secondary";
     }
 };
+const statusLabel = (status: RsvpStatus): string => {
+    switch (status) {
+        case "Accept":
+            return "Accepted";
+        case "Decline":
+            return "Declined";
+        case "Cancel":
+            return "Cancelled";
+    }
+};
 
 const EventFormDialog = ({
     open,
@@ -757,9 +767,7 @@ export const EventAttendance = () => {
                                 </CardDescription>
                             </div>
                             <Badge variant={statusVariant(rsvp.status)}>
-                                {rsvp.status === "Accept"
-                                    ? "Accepted"
-                                    : "Declined"}
+                                {statusLabel(rsvp.status)}
                             </Badge>
                         </CardHeader>
                         {updating ? (