Skip to content

Commit d74fc0d

Browse files
committed
#2136 added existing meeting data
1 parent f3eefbd commit d74fc0d

3 files changed

Lines changed: 19 additions & 25 deletions

File tree

src/frontend/src/components/TimeSlot.tsx

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import { Box } from '@mui/system';
2-
import { ReactElement } from 'react';
3-
import WarningIcon from '@mui/icons-material/Warning';
4-
import BuildIcon from '@mui/icons-material/Build';
5-
import ComputerIcon from '@mui/icons-material/Computer';
6-
import ElectricalServicesIcon from '@mui/icons-material/ElectricalServices';
2+
import { Icon } from '@mui/material';
73

84
interface TimeSlotProps {
95
text?: string;
@@ -28,23 +24,6 @@ const TimeSlot: React.FC<TimeSlotProps> = ({
2824
onMouseUp,
2925
onMouseOver
3026
}) => {
31-
const getIcon = (icon: string, small: boolean): ReactElement | null => {
32-
const iconFont = small ? { fontSize: '1.4em' } : { fontSize: '2em' };
33-
34-
switch (icon) {
35-
case 'warning':
36-
return <WarningIcon sx={iconFont} />;
37-
case 'build':
38-
return <BuildIcon sx={iconFont} />;
39-
case 'computer':
40-
return <ComputerIcon sx={iconFont} />;
41-
case 'electrical':
42-
return <ElectricalServicesIcon sx={iconFont} />;
43-
default:
44-
return null;
45-
}
46-
};
47-
4827
return (
4928
<Box
5029
sx={{
@@ -61,14 +40,15 @@ const TimeSlot: React.FC<TimeSlotProps> = ({
6140
fontWeight: 'bold',
6241
display: 'flex',
6342
flexDirection: 'column',
64-
justifyContent: 'center'
43+
justifyContent: 'center',
44+
alignItems: 'center'
6545
}}
6646
onMouseDown={onMouseDown}
6747
onMouseEnter={onMouseEnter}
6848
onMouseUp={onMouseUp}
6949
onMouseOver={onMouseOver}
7050
>
71-
{icon && <Box sx={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>{getIcon(icon, small)}</Box>}
51+
{icon && <Icon>{icon}</Icon>}
7252
{text}
7353
</Box>
7454
);

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Autocomplete, Box, Checkbox, Grid, TextField, useTheme } from '@mui/material';
22
import PageLayout from '../../../components/PageLayout';
3-
import { existingMeetingData, getDateRange } from '../../../utils/design-review.utils';
3+
import { getDateRange } from '../../../utils/design-review.utils';
44
import AvailabilityView from './AvailabilityView';
55
import { useAllUsers } from '../../../hooks/users.hooks';
66
import LoadingIndicator from '../../../components/LoadingIndicator';
@@ -36,6 +36,7 @@ const DesignReviewDetailPage: React.FC<DesignReviewDetailPageProps> = ({ designR
3636
);
3737
const [selectedEndDateTime, setselectedEndDateTime] = useState(new Date(`${new Date().toLocaleDateString()} 12:00:00`));
3838
const [usersToAvailabilities, setUsersToAvailabilities] = useState<Map<User, number[]>>(new Map());
39+
const [existingMeetingData, setexistingMeetingData] = useState<Map<number, string>>(new Map());
3940
const [dateRange, setDateRange] = useState('');
4041
const designReviewName = `${wbsPipe(designReview.wbsNum)} - ${designReview.wbsName}`;
4142
const conflictingDesignReviews = allDesignReviews
@@ -49,6 +50,18 @@ const DesignReviewDetailPage: React.FC<DesignReviewDetailPageProps> = ({ designR
4950
)
5051
: [];
5152

53+
useEffect(() => {
54+
if (allDesignReviews) {
55+
const newExistingMeetingData = new Map<number, string>();
56+
allDesignReviews?.forEach((designReview) =>
57+
designReview.meetingTimes.forEach((meetingTime) =>
58+
newExistingMeetingData.set(meetingTime, designReview.teamType.iconName)
59+
)
60+
);
61+
setexistingMeetingData(newExistingMeetingData);
62+
}
63+
}, [allDesignReviews]);
64+
5265
useEffect(() => {
5366
if (designReview && designReview.confirmedMembers.length > 0) {
5467
const newUsersToAvailabilities = new Map<User, number[]>();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const FinalizeDesignReviewDetailsModal = ({
2828
const [location, setLocation] = useState('');
2929
const [zoomLink, setZoomLink] = useState('');
3030

31+
// Need to do this so it can be called in the title
3132
if (!selectedStartDateTime) {
3233
return null;
3334
}

0 commit comments

Comments
 (0)