Skip to content
Closed

hotfix #2099

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 49 additions & 30 deletions client/src/components/manageProjects/createNewEvent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ import { addDurationToTime } from './utilities/addDurationToTime';
import { timeConvertFromForm } from './utilities/timeConvertFromForm';
import validateEventForm from './utilities/validateEventForm';
import EventForm from './eventForm';
import { Box, Button, Modal } from '@mui/material';

const CreateNewEvent = ({
isOpen,
onClose,
projectToEdit,
projectID,
createNewRecurringEvent,
Expand Down Expand Up @@ -71,6 +74,14 @@ const CreateNewEvent = ({
createNewRecurringEvent(theNewEvent);
};

const handleClose = (event, reason) => {
setFormErrors({});
setFormValues(initialFormValues);
if (onClose) {
onClose(event, reason);
}
};

// Handle submission of new recurring event form
const handleFormSubmit = async () => {
const errors = validateEventForm(formValues, projectToEdit);
Expand All @@ -82,39 +93,47 @@ const CreateNewEvent = ({
}
setFormErrors(errors);
};

return (
<div>
<button
type="button"
className="meeting-cancel-button"
onClick={() => {
setFormValues(initialFormValues);
setFormErrors(null);
setIsCreateNew(false);
<Modal open={isOpen} onClose={handleClose}>
<Box
className="modal-box"
sx={{
position: 'absolute',
top: '42%',
left: '50%',
transform: 'translate(-50%, -50%)',
width: 450,
bgcolor: 'background.paper',
border: '2px solid #000',
boxShadow: 24,
pt: 4,
px: 4,
pb: 2,
}}
>
X
</button>
<EventForm
handleInputChange={handleInputChange}
formValues={formValues}
formErrors={formErrors}
setFormErrors={setFormErrors}
title="Create New Recurring Event"
>
<div className="button-box">
<button
type="button"
className="create-form-button"
onClick={() => {
handleFormSubmit();
}}
>
Create New Event
</button>
</div>
</EventForm>
</div>
<EventForm
handleInputChange={handleInputChange}
formValues={formValues}
formErrors={formErrors}
setFormErrors={setFormErrors}
title="Create New Recurring Event"
>
<div className="button-box">
<button
type="button"
className="create-form-button"
onClick={() => {
handleFormSubmit();
}}
>
Create New Event
</button>
</div>
</EventForm>
<Button onClick={handleClose}>Close</Button>
</Box>
</Modal>
);
};

Expand Down
Loading
Loading