Skip to content

Commit f846ff4

Browse files
committed
Fix bug
1 parent 6518ef4 commit f846ff4

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

course-matrix/frontend/src/pages/Compare/CompareTimetables.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ import {
1717
import {
1818
Select,
1919
SelectContent,
20-
SelectItem,
2120
SelectTrigger,
2221
SelectValue,
2322
} from "@/components/ui/select";
24-
import { SemesterIcon } from "@/components/semester-icon";
2523
import { GitCompareArrows } from "lucide-react";
2624
import { useGetTimetablesSharedWithMeQuery } from "@/api/sharedApiSlice";
2725
import { TimetableShare } from "../Home/Home";
@@ -177,6 +175,7 @@ export const CompareTimetables = () => {
177175
<TimetableCompareItem
178176
key={`timetable1/${timetable.id}/${timetable.user_id}`}
179177
timetable={timetable}
178+
timetableNumber={1}
180179
/>
181180
))}
182181
</SelectContent>
@@ -213,6 +212,7 @@ export const CompareTimetables = () => {
213212
<TimetableCompareItem
214213
key={`timetable2/${timetable.id}/${timetable.user_id}`}
215214
timetable={timetable}
215+
timetableNumber={2}
216216
/>
217217
))}
218218
</SelectContent>

course-matrix/frontend/src/pages/Home/TimetableCompareButton.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
import {
2121
Select,
2222
SelectContent,
23-
SelectItem,
2423
SelectTrigger,
2524
SelectValue,
2625
} from "@/components/ui/select";
@@ -119,6 +118,7 @@ export const TimetableCompareButton = ({
119118
<TimetableCompareItem
120119
key={`timetable1/${timetable.id}/${timetable.user_id}`}
121120
timetable={timetable}
121+
timetableNumber={1}
122122
/>
123123
))}
124124
</SelectContent>
@@ -145,6 +145,7 @@ export const TimetableCompareButton = ({
145145
<TimetableCompareItem
146146
key={`timetable2/${timetable.id}/${timetable.user_id}`}
147147
timetable={timetable}
148+
timetableNumber={2}
148149
/>
149150
))}
150151
</SelectContent>

course-matrix/frontend/src/pages/Home/TimetableCompareItem.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import { useEffect, useState } from "react";
77

88
interface TimetableCompareItemProps {
99
timetable: Timetable;
10+
timetableNumber: number;
1011
}
1112

12-
const TimetableCompareItem = ({ timetable }: TimetableCompareItemProps) => {
13+
const TimetableCompareItem = ({ timetable, timetableNumber }: TimetableCompareItemProps) => {
1314
const { data: usernameData } = useGetUsernameFromUserIdQuery(
1415
timetable.user_id,
1516
);
@@ -24,10 +25,7 @@ const TimetableCompareItem = ({ timetable }: TimetableCompareItemProps) => {
2425
}, [loadedUsername, usernameData]);
2526

2627
return (
27-
<SelectItem
28-
key={`timetable2/${timetable.id}/${timetable.user_id}`}
29-
value={`timetable2/${timetable.id}/${timetable.user_id}`}
30-
>
28+
<SelectItem value={`timetable${timetableNumber}/${timetable.id}/${timetable.user_id}`}>
3129
<div className="flex flex-row justify-between gap-2">
3230
<span className="flex items-center gap-2">
3331
<SemesterIcon semester={timetable.semester} size={18} />

0 commit comments

Comments
 (0)