Remove chartfield information

ITPNYU · Oct 23, 2023 · 1b0d88e · 1b0d88e
1 parent fce666a
commit 1b0d88e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 23 deletions.
diff --git a/media_commons_booking_app/src/client/admin-page/components/Bookings.tsx b/media_commons_booking_app/src/client/admin-page/components/Bookings.tsx
@@ -115,8 +115,7 @@ export const Bookings = () => {
       mediaServicesDetails: values[23],
       catering: values[24],
       cateringService: values[25],
-      chartfieldInformation: values[26],
-      hireSecurity: values[27],
+      hireSecurity: values[26],
     };
   };
 
@@ -370,9 +369,7 @@ export const Bookings = () => {
                   </td>
                   <td className="px-2 py-4 w-18">{booking.catering}</td>
                   <td className="px-2 py-4 w-18">{booking.cateringService}</td>
-                  <td className="px-2 py-4 w-18">
-                    {booking.chartfieldInformation}
-                  </td>
+
                   <td className="px-2 py-4 w-18">{booking.hireSecurity}</td>
                 </tr>
               );

diff --git a/media_commons_booking_app/src/client/booking/approval_email.html b/media_commons_booking_app/src/client/booking/approval_email.html
@@ -148,10 +148,6 @@ <h2>Room Reservation Request</h2>
         Catering Details:
         <?= cateringService ?>
       </p>
-      <p>
-        Chartfield Information:
-        <?= chartfieldInformation ?>
-      </p>
 
       <p>
         Hire Security:

diff --git a/media_commons_booking_app/src/client/booking/components/Calendars.tsx b/media_commons_booking_app/src/client/booking/components/Calendars.tsx
@@ -62,7 +62,7 @@ export const Calendars = ({
 
       const allEvents = calendarApi.getEvents();
       return allEvents.some((event) => {
-        if (event.title.includes('Reserve')) return false;
+        if (event.title.includes(TITLE_TAG)) return false;
         return (
           (event.start >= info.start && event.start < info.end) ||
           (event.end > info.start && event.end <= info.end) ||

diff --git a/media_commons_booking_app/src/client/booking/components/FormInput.tsx b/media_commons_booking_app/src/client/booking/components/FormInput.tsx
@@ -23,7 +23,6 @@ export type Inputs = {
   catering: string;
   hireSecurity: string;
   expectedAttendance: string;
-  chartfieldInformation: string;
   cateringService: string;
   missingEmail?: string;
 };
@@ -50,7 +49,6 @@ const FormInput = ({ hasEmail, roomNumber, handleParentSubmit }) => {
     defaultValues: {
       setupDetails: '',
       cateringService: '',
-      chartfieldInformation: '',
       sponsorFirstName: '',
       sponsorLastName: '',
       sponsorEmail: '',
@@ -65,17 +63,11 @@ const FormInput = ({ hasEmail, roomNumber, handleParentSubmit }) => {
     mode: 'onBlur',
   });
   const [checklist, setChecklist] = useState(false);
-  const [agreement, setAgreement] = useState(false);
   const [resetRoom, setResetRoom] = useState(false);
   const [bookingPolicy, setBookingPolicy] = useState(false);
   const [showTextbox, setShowTextbox] = useState(false);
 
-  const disabledButton = !(
-    checklist &&
-    agreement &&
-    resetRoom &&
-    bookingPolicy
-  );
+  const disabledButton = !(checklist && resetRoom && bookingPolicy);
   useEffect(() => {
     trigger();
   }, [trigger]);
@@ -617,7 +609,19 @@ const FormInput = ({ hasEmail, roomNumber, handleParentSubmit }) => {
               (For Audio Lab 230) Request an audio technician
             </label>
           )}
-
+          {roomNumber.some((room) =>
+            [220, 221, 222, 223, 224].includes(Number(room))
+          ) && (
+            <label key={'103audioTechnician'}>
+              <input
+                type="checkbox"
+                value="(For Garage 103) Request an audio technician"
+                name="mediaServices"
+                {...register('mediaServices')}
+              />
+              (For 220-224) Using lights in ceiling grid
+            </label>
+          )}
           {roomNumber.includes('202') ||
             (roomNumber.includes('1201') && (
               <label key={'support'}>

diff --git a/media_commons_booking_app/src/client/booking/components/SheetEditor.tsx b/media_commons_booking_app/src/client/booking/components/SheetEditor.tsx
@@ -68,7 +68,6 @@ const SheetEditor = () => {
     'mediaServicesDetails',
     'catering',
     'cateringService',
-    'chartfieldInformation',
     'hireSecurity',
   ];
 

diff --git a/media_commons_booking_app/src/server/admin.js b/media_commons_booking_app/src/server/admin.js
@@ -44,8 +44,7 @@ export const bookingContents = (id) => {
     mediaServicesDetails: values[24],
     catering: values[25],
     cateringService: values[26],
-    chartfieldInformation: values[27],
-    hireSecurity: values[28],
+    hireSecurity: values[27],
     approvalUrl: approvalUrl(id),
     rejectedUrl: rejectUrl(id),
   };