From d94a5716074378ec1f27b342bfd10b87744e6e16 Mon Sep 17 00:00:00 2001
From: "riho.takagi" <rihohearts@gmail.com>
Date: Mon, 8 Jan 2024 13:03:02 -0500
Subject: [PATCH] Change calendar event title

---
 .../src/client/booking/approval_email.html          | 13 +++++++++++--
 .../src/client/booking/components/FormInput.tsx     |  4 +++-
 .../src/client/booking/components/SheetEditor.tsx   |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/media_commons_booking_app/src/client/booking/approval_email.html b/media_commons_booking_app/src/client/booking/approval_email.html
index 3f97ae82..5b9c882e 100644
--- a/media_commons_booking_app/src/client/booking/approval_email.html
+++ b/media_commons_booking_app/src/client/booking/approval_email.html
@@ -135,8 +135,9 @@ <h2>Room Reservation Request</h2>
         <?= roomSetup ?>
         <?= setupDetails ?>
       </p>
+      <p>
         Chartfield for Room setup?:
-        <?= char ?>
+        <?= chartFieldForRoomSetup ?>
       </p>
       <p>
         Media Services:
@@ -151,11 +152,19 @@ <h2>Room Reservation Request</h2>
         Catering Details:
         <?= cateringService ?>
       </p>
-
+      <p>
+        Chartfield for Catering?:
+        <?= chartFieldForCatering ?>
+      </p>
       <p>
         Hire Security:
         <?= hireSecurity ?>
       </p>
+      <p>
+        Chartfield for Hiring Security?:
+        <?= chartFieldForSecurity ?>
+      </p>
+
       <p>
         <a
           href="https://sites.google.com/nyu.edu/370j-booking/admin"
diff --git a/media_commons_booking_app/src/client/booking/components/FormInput.tsx b/media_commons_booking_app/src/client/booking/components/FormInput.tsx
index a7912dcc..e899aea3 100644
--- a/media_commons_booking_app/src/client/booking/components/FormInput.tsx
+++ b/media_commons_booking_app/src/client/booking/components/FormInput.tsx
@@ -94,7 +94,9 @@ const FormInput = ({ hasEmail, handleParentSubmit, selectedRoom }) => {
   const onSubmit: SubmitHandler<Inputs> = (data) => {
     const dumpMediaServices = data.mediaServices || [];
     //@ts-ignore
-    data.mediaServices = dumpMediaServices?.join(', ');
+    data.mediaServices = Array.isArray(dumpMediaServices)
+      ? dumpMediaServices.join(', ')
+      : dumpMediaServices;
     handleParentSubmit(data);
   };
 
diff --git a/media_commons_booking_app/src/client/booking/components/SheetEditor.tsx b/media_commons_booking_app/src/client/booking/components/SheetEditor.tsx
index 9eaadead..d720207a 100644
--- a/media_commons_booking_app/src/client/booking/components/SheetEditor.tsx
+++ b/media_commons_booking_app/src/client/booking/components/SheetEditor.tsx
@@ -160,7 +160,7 @@ const SheetEditor = () => {
       )?.calendarId;
       const calendarEventId = await serverFunctions.addEventToCalendar(
         roomCalendarId,
-        `[REQUESTED] Room request from ${userEmail}`,
+        `[REQUESTED] ${room.roomId} ${data.department} ${userEmail}`,
         'Your reservation is not yet confirmed. The coordinator will review and finalize your reservation within a few days.',
         bookInfo.startStr,
         bookInfo.endStr,