Skip to content

Commit 32254ac

Browse files
committed
#2131 default date added and end time fixed
1 parent b6f6013 commit 32254ac

2 files changed

Lines changed: 16 additions & 9 deletions

File tree

src/frontend/src/pages/CalendarPage/CalendarComponents/CalendarDayCard.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ const CalendarDayCard: React.FC<CalendarDayCardProps> = ({ cardDate, events, tea
155155
setIsCreateModalOpen(false);
156156
}}
157157
teamTypes={teamTypes}
158+
defaultDate={cardDate}
158159
/>
159160
<CardContent sx={{ padding: 0 }}>
160161
<DayCardTitle />

src/frontend/src/pages/CalendarPage/DesignReviewCreateModal.tsx

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,15 @@ interface DesignReviewCreateModalProps {
4949
showModal: boolean;
5050
handleClose: () => void;
5151
teamTypes: TeamType[];
52+
defaultDate: Date;
5253
}
5354

54-
export const DesignReviewCreateModal: React.FC<DesignReviewCreateModalProps> = ({ showModal, handleClose, teamTypes }) => {
55+
export const DesignReviewCreateModal: React.FC<DesignReviewCreateModalProps> = ({
56+
showModal,
57+
handleClose,
58+
teamTypes,
59+
defaultDate
60+
}) => {
5561
const HOURS: number[] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
5662
const query = useQuery();
5763

@@ -101,9 +107,9 @@ export const DesignReviewCreateModal: React.FC<DesignReviewCreateModalProps> = (
101107
} = useForm({
102108
resolver: yupResolver(schema),
103109
defaultValues: {
104-
date: new Date(),
110+
date: defaultDate,
105111
startTime: 0,
106-
endTime: 0,
112+
endTime: 1,
107113
teamTypeId: ''
108114
}
109115
});
@@ -139,7 +145,7 @@ export const DesignReviewCreateModal: React.FC<DesignReviewCreateModalProps> = (
139145
open={showModal}
140146
onHide={handleClose}
141147
title="Create Design Review"
142-
reset={() => reset({ date: new Date() })}
148+
reset={() => reset({ date: defaultDate })}
143149
handleUseFormSubmit={handleSubmit}
144150
onFormSubmit={onSubmit}
145151
formId="create-design-review-form"
@@ -158,7 +164,7 @@ export const DesignReviewCreateModal: React.FC<DesignReviewCreateModalProps> = (
158164
onClose={() => setDatePickerOpen(false)}
159165
onOpen={() => setDatePickerOpen(true)}
160166
onChange={(newValue) => {
161-
onChange(newValue ?? new Date());
167+
onChange(newValue ?? defaultDate);
162168
}}
163169
PopperProps={{
164170
placement: 'right'
@@ -221,9 +227,9 @@ export const DesignReviewCreateModal: React.FC<DesignReviewCreateModalProps> = (
221227
control={control}
222228
render={({ field: { onChange, value } }) => (
223229
<Select
224-
id="start-time-autocomplete"
230+
id="end-time-autocomplete"
225231
displayEmpty
226-
renderValue={(value) => meetingStartTimePipe([value + 1])}
232+
renderValue={(value) => meetingStartTimePipe([value])}
227233
value={value}
228234
onChange={(event: SelectChangeEvent<number>) => onChange(Number(event.target.value))}
229235
size={'small'}
@@ -240,10 +246,10 @@ export const DesignReviewCreateModal: React.FC<DesignReviewCreateModalProps> = (
240246
}
241247
}}
242248
>
243-
{HOURS.map((hour) => {
249+
{HOURS.slice(1).map((hour) => {
244250
return (
245251
<MenuItem key={hour} value={hour}>
246-
{meetingStartTimePipe([hour + 1])}
252+
{meetingStartTimePipe([hour])}
247253
</MenuItem>
248254
);
249255
})}

0 commit comments

Comments
 (0)