From 5b00fe8bcae15985b6e60fe0ee4d3d7a9679c61f Mon Sep 17 00:00:00 2001 From: nimanns Date: Thu, 21 Nov 2024 22:06:05 -0500 Subject: [PATCH 1/4] Add 'Chair / Program Director' to affiliation dropdown menu options (issue #480) --- booking-app/components/src/types.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/booking-app/components/src/types.ts b/booking-app/components/src/types.ts index f66c5694..d4f419c2 100644 --- a/booking-app/components/src/types.ts +++ b/booking-app/components/src/types.ts @@ -196,6 +196,7 @@ export enum Role { RESIDENT_FELLOW = "Resident/Fellow", FACULTY = "Faculty", ADMIN_STAFF = "Admin/Staff", + CHAIR_PROGRAM_DIRECTOR = "Chair/Program Director" } export type RoomSetting = { From 9919a8d76827d1b751d6b66222ae524147239b8e Mon Sep 17 00:00:00 2001 From: lucia <51058748+lucia-gomez@users.noreply.github.com> Date: Sat, 30 Nov 2024 21:31:53 -0500 Subject: [PATCH 2/4] fix isClosed error --- .../components/CalendarVerticalResource.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx b/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx index 06f37356..3ffd1206 100644 --- a/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx +++ b/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx @@ -246,13 +246,13 @@ export default function CalendarVerticalResource({ (setting) => Object.values(Days)[dateView.getDay()] === setting.day ); - if (operationHoursToday.isClosed) { - return ( - - The Media Commons are closed on Sundays. - - ); - } + // if (operationHoursToday.isClosed) { + // return ( + // + // The Media Commons are closed on Sundays. + // + // ); + // } const slotMinTime = `${operationHoursToday.open}:00:00`; const slotMaxTime = `${operationHoursToday.close}:00:00`; From 5df80b2f206c3030626ce098b03832d8ce7009cb Mon Sep 17 00:00:00 2001 From: lucia <51058748+lucia-gomez@users.noreply.github.com> Date: Sat, 30 Nov 2024 21:31:53 -0500 Subject: [PATCH 3/4] fix isClosed error --- .../components/CalendarVerticalResource.tsx | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx b/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx index 06f37356..1d75faa4 100644 --- a/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx +++ b/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx @@ -246,16 +246,16 @@ export default function CalendarVerticalResource({ (setting) => Object.values(Days)[dateView.getDay()] === setting.day ); - if (operationHoursToday.isClosed) { - return ( - - The Media Commons are closed on Sundays. - - ); - } + // if (operationHoursToday.isClosed) { + // return ( + // + // The Media Commons are closed on Sundays. + // + // ); + // } - const slotMinTime = `${operationHoursToday.open}:00:00`; - const slotMaxTime = `${operationHoursToday.close}:00:00`; + // const slotMinTime = `${operationHoursToday.open}:00:00`; + // const slotMaxTime = `${operationHoursToday.close}:00:00`; // don't use these values until we talk to Samantha/Jhanele return ( @@ -284,8 +284,8 @@ export default function CalendarVerticalResource({ eventResize={handleEventEdit} eventDrop={handleEventEdit} headerToolbar={false} - slotMinTime={slotMinTime} - slotMaxTime={slotMaxTime} + slotMinTime="9:00:00" + slotMaxTime="21:00:00" allDaySlot={false} aspectRatio={isMobile ? 0.5 : 1.5} expandRows={true} From 3f2be4739f80ff62fa9e03f865eaea094d4feef0 Mon Sep 17 00:00:00 2001 From: lucia <51058748+lucia-gomez@users.noreply.github.com> Date: Sat, 30 Nov 2024 21:45:43 -0500 Subject: [PATCH 4/4] add department to email details --- booking-app/app/templates/booking_detail.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/booking-app/app/templates/booking_detail.html b/booking-app/app/templates/booking_detail.html index e676336e..2cc23001 100644 --- a/booking-app/app/templates/booking_detail.html +++ b/booking-app/app/templates/booking_detail.html @@ -112,6 +112,12 @@ contents.lastName }} + + + Department + +
{{ contents.department }}
+ Contact Info