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 index c0d1b81d..aff1c912 100644 --- 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 = () => {
- Chartfield Information: - = chartfieldInformation ?> -
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 index 58bdbcc7..1a21264c 100644 --- 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 index d3a72260..4e68e65b 100644 --- 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 )} - + {roomNumber.some((room) => + [220, 221, 222, 223, 224].includes(Number(room)) + ) && ( + + )} {roomNumber.includes('202') || (roomNumber.includes('1201') && (