Skip to content

Commit ae4312c

Browse files
committed
#2136 - main calendar is off by one day
1 parent e6a3e9e commit ae4312c

5 files changed

Lines changed: 18 additions & 116 deletions

File tree

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ const CalendarPage = () => {
4747

4848
confirmedDesignReviews.forEach((designReview) => {
4949
// Accessing the date actually converts it to local time, which causes the date to be off. This is a workaround.
50-
const date = datePipe(designReview.dateScheduled);
50+
const date = datePipe(
51+
new Date(designReview.dateScheduled.getTime() - designReview.dateScheduled.getTimezoneOffset() * -60000)
52+
);
5153
if (eventDict.has(date)) {
5254
eventDict.get(date)?.push(designReview);
5355
} else {
@@ -132,7 +134,10 @@ const CalendarPage = () => {
132134
) : (
133135
<CalendarDayCard
134136
cardDate={cardDate}
135-
events={eventDict.get(datePipe(cardDate)) ?? []}
137+
events={
138+
eventDict.get(datePipe(new Date(cardDate.getTime() - cardDate.getTimezoneOffset() * -60000))) ??
139+
[]
140+
}
136141
teamTypes={allTeamTypes}
137142
/>
138143
)}

src/frontend/src/pages/CalendarPage/DesignReviewDetailPage/AvailabilityView.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ const AvailabilityView: React.FC<AvailabilityViewProps> = ({ designReview, allDe
4141
times.push(i);
4242
}
4343
const cleanDate = new Date(currDr.dateScheduled.getTime() - currDr.dateScheduled.getTimezoneOffset() * -60000);
44+
if (currDr.designReviewId !== designReview.designReviewId)
45+
console.log(cleanDate.toLocaleDateString() === selectedDate.toLocaleDateString());
4446
return (
4547
currDr.status === DesignReviewStatus.SCHEDULED &&
4648
cleanDate.toLocaleDateString() === selectedDate.toLocaleDateString() &&
@@ -49,9 +51,10 @@ const AvailabilityView: React.FC<AvailabilityViewProps> = ({ designReview, allDe
4951
);
5052
});
5153

52-
currentWeekDesignReviews.forEach((designReview) =>
53-
designReview.meetingTimes.forEach((meetingTime) => {
54-
if (designReview.status === DesignReviewStatus.SCHEDULED) existingMeetingData.set(meetingTime, 'build');
54+
currentWeekDesignReviews.forEach((dr) =>
55+
dr.meetingTimes.forEach((meetingTime) => {
56+
if (dr.status === DesignReviewStatus.SCHEDULED && dr.designReviewId !== designReview.designReviewId)
57+
existingMeetingData.set(meetingTime, dr.teamType.iconName);
5558
})
5659
);
5760

src/frontend/src/pages/CalendarPage/DesignReviewDetailPage/DesignReviewDetailPage.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ const DesignReviewDetailPage: React.FC<DesignReviewDetailPageProps> = ({ designR
4040
const theme = useTheme();
4141
const [requiredUsers, setRequiredUsers] = useState(designReview.requiredMembers.map(userToAutocompleteOption));
4242
const [optionalUsers, setOptionalUsers] = useState(designReview.optionalMembers.map(userToAutocompleteOption));
43-
const [date, setDate] = useState(designReview.dateScheduled);
43+
const [date, setDate] = useState(
44+
new Date(designReview.dateScheduled.getTime() - designReview.dateScheduled.getTimezoneOffset() * -60000)
45+
);
4446
const [startTime, setStateTime] = useState(0);
4547
const [endTime, setEndTime] = useState(1);
4648

src/frontend/src/pages/CalendarPage/DesignReviewDetailPage/FinalizeDesignReviewDetailsModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ const FinalizeDesignReviewDetailsModal = ({
134134
)}
135135
{meetingType.includes('inPerson') && (
136136
<Box style={{ display: 'flex', alignItems: 'center', marginBottom: 50 }}>
137-
<Typography style={{ fontSize: '1.2em', marginRight: 136 }}>Location:</Typography>
138-
<ReactHookTextField name="location" control={control} sx={{ width: 0.5 }} errorMessage={errors.location} />
137+
<Typography style={{ fontSize: '1.2em', marginRight: 132 }}>Location:</Typography>
138+
<ReactHookTextField name="location" control={control} sx={{ width: 0.49 }} errorMessage={errors.location} />
139139
</Box>
140140
)}
141141
<Grid container justifyContent="center" style={{ alignItems: 'center' }}>

src/frontend/src/pages/CalendarPage/DesignReviewDetailPage/FinalizeDesignReviewModal.tsx

Lines changed: 0 additions & 108 deletions
This file was deleted.

0 commit comments

Comments
 (0)