Merge branch 'main' into prod

ITPNYU · Dec 1, 2024 · a814734 · a814734
2 parents 6cedd8c + 3f2be47
commit a814734
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/booking-app/app/templates/booking_detail.html b/booking-app/app/templates/booking_detail.html
@@ -112,6 +112,12 @@
               contents.lastName }}
             </div>
           </td>
+        </tr>
+         <tr></tr>
+          <td>Department</td>
+          <td>
+            <div class="value-content">{{ contents.department }}</div>
+          </td>
         </tr>
         <tr>
           <td>Contact Info</td>

diff --git a/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx b/booking-app/components/src/client/routes/booking/components/CalendarVerticalResource.tsx
@@ -7,7 +7,7 @@ import {
 } from "@fullcalendar/core";
 import CalendarEventBlock, { NEW_TITLE_TAG } from "./CalendarEventBlock";
 import { FormContextLevel, RoomSetting } from "../../../../types";
-import React, { useContext, useEffect, useMemo, useRef } from "react";
+import { useContext, useEffect, useMemo, useRef } from "react";
 
 import { BookingContext } from "../bookingProvider";
 import { Error } from "@mui/icons-material";
@@ -240,6 +240,22 @@ export default function CalendarVerticalResource({
     );
   }
 
+  // const operationHoursToday = operationHours.find(
+  //   (setting) => Object.values(Days)[dateView.getDay()] === setting.day
+  // );
+
+  // if (operationHoursToday.isClosed) {
+  //   return (
+  //     <Empty>
+  //       <Typography>The Media Commons are closed on Sundays.</Typography>
+  //     </Empty>
+  //   );
+  // }
+
+  // const slotMinTime = `${operationHoursToday.open}:00:00`;
+  // const slotMaxTime = `${operationHoursToday.close}:00:00`;
+  // don't use these values until we talk to Samantha/Jhanele
+
   return (
     <FullCalendarWrapper>
       <FullCalendar

diff --git a/booking-app/components/src/types.ts b/booking-app/components/src/types.ts
@@ -195,6 +195,7 @@ export enum Role {
   RESIDENT_FELLOW = "Resident/Fellow",
   FACULTY = "Faculty",
   ADMIN_STAFF = "Admin/Staff",
+  CHAIR_PROGRAM_DIRECTOR = "Chair/Program Director"
 }
 
 export type RoomSetting = {