Merge pull request #193 from ITPNYU/hotfix/safety_training

Hotfix/safety training
ITPNYU · Apr 16, 2024 · 06abc0c · 06abc0c
2 parents 019d5ad + 12c2e21
commit 06abc0c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/media_commons_booking_app/src/client/routes/booking/approval_email.html b/media_commons_booking_app/src/client/routes/booking/approval_email.html
@@ -68,6 +68,15 @@ <h2>Room Reservation Request</h2>
         <?= roomId ?>
       </p>
 
+      <p>
+        First name:
+        <?= firstName ?>
+      </p>
+      <p>
+        Last name:
+        <?= lastName ?>
+      </p>
+
       <p>
         Email:
         <?= email ?>

diff --git a/media_commons_booking_app/src/client/routes/booking/booking_detail.html b/media_commons_booking_app/src/client/routes/booking/booking_detail.html
@@ -66,6 +66,14 @@
         <?= roomId ?>
       </p>
 
+      <p>
+        First name:
+        <?= firstName ?>
+      </p>
+      <p>
+        Last name:
+        <?= lastName ?>
+      </p>
       <p>
         Email:
         <?= email ?>

diff --git a/media_commons_booking_app/src/client/routes/booking/hooks/useSubmitBooking.tsx b/media_commons_booking_app/src/client/routes/booking/hooks/useSubmitBooking.tsx
@@ -126,9 +126,13 @@ export default function useSubmitBooking(): [
       formatDate(new Date()),
     ]);
 
-    const isAutoApproval = (selectedRoomIds: string[], data: Booking) => {
-      const startDate = new Date(data.startDate);
-      const endDate = new Date(data.endDate);
+    const isAutoApproval = (
+      selectedRoomIds: string[],
+      data: Booking,
+      bookingCalendarInfo
+    ) => {
+      const startDate = new Date(bookingCalendarInfo?.startStr);
+      const endDate = new Date(bookingCalendarInfo?.endStr);
       const duration = endDate.getTime() - startDate.getTime();
       // If the selected rooms are all instant approval rooms and the user does not need catering, and hire security, and room setup, then it is auto-approval.
       return (
@@ -141,7 +145,7 @@ export default function useSubmitBooking(): [
       );
     };
 
-    if (isAutoApproval(selectedRoomIds, data)) {
+    if (isAutoApproval(selectedRoomIds, data, bookingCalendarInfo)) {
       serverFunctions.approveInstantBooking(calendarEventId);
     } else {
       const getApprovalUrl = serverFunctions.approvalUrl(calendarEventId);