From 9eaff24cbb6d78d7f28521a07c32630a90a96f82 Mon Sep 17 00:00:00 2001
From: vinsonzheng499 <109887112+vinsonzheng499@users.noreply.github.com>
Date: Mon, 30 Sep 2024 09:47:40 -0500
Subject: [PATCH] fix: added room number to course popup (#231)

---
 src/shared/types/CourseMeeting.ts                        | 4 ++--
 .../CourseCatalogInjectedPopup/HeadingAndActions.tsx     | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/shared/types/CourseMeeting.ts b/src/shared/types/CourseMeeting.ts
index 78381501..521f89ff 100644
--- a/src/shared/types/CourseMeeting.ts
+++ b/src/shared/types/CourseMeeting.ts
@@ -108,7 +108,7 @@ export class CourseMeeting {
         }
 
         startTimeString += startMinute === 0 ? ':00' : `:${startMinute}`;
-        startTimeString += startHour >= 12 ? 'pm' : 'am';
+        startTimeString += startHour >= 12 ? ' p.m.' : ' a.m.';
 
         if (endHour === 0) {
             endTimeString = '12';
@@ -118,7 +118,7 @@ export class CourseMeeting {
             endTimeString = `${endHour}`;
         }
         endTimeString += endMinute === 0 ? ':00' : `:${endMinute}`;
-        endTimeString += endHour >= 12 ? 'pm' : 'am';
+        endTimeString += endHour >= 12 ? ' p.m.' : ' a.m.';
 
         if (options.capitalize) {
             startTimeString = startTimeString.toUpperCase();
diff --git a/src/views/components/injected/CourseCatalogInjectedPopup/HeadingAndActions.tsx b/src/views/components/injected/CourseCatalogInjectedPopup/HeadingAndActions.tsx
index 95db60bf..ecd69aa4 100644
--- a/src/views/components/injected/CourseCatalogInjectedPopup/HeadingAndActions.tsx
+++ b/src/views/components/injected/CourseCatalogInjectedPopup/HeadingAndActions.tsx
@@ -156,7 +156,12 @@ export default function HeadingAndActions({ course, activeSchedule, onClose }: H
                         const timeString = meeting.getTimeString({ separator: ' to ', capitalize: false });
                         return (
                             <Text
-                                key={daysString + timeString + (meeting.location?.building ?? '')}
+                                key={
+                                    daysString +
+                                    timeString +
+                                    (meeting.location?.building ?? '') +
+                                    (meeting.location?.room ?? '')
+                                }
                                 variant='h4'
                                 as='p'
                             >
@@ -169,7 +174,7 @@ export default function HeadingAndActions({ course, activeSchedule, onClose }: H
                                             className='link'
                                             variant='h4'
                                         >
-                                            {meeting.location.building}
+                                            {meeting.location.building} {meeting.location.room}
                                         </Link>
                                     </>
                                 )}