(callback: (socket: Socket) => T): T {
+ if (!this.socket) {
+ throw new Error('Socket is not connected');
+ }
+ return callback(this.socket);
+ }
+}
+
+class SessionsSocket {
+ private url: string;
+ private socket: OptionalSocket;
+
+ constructor(url: string) {
+ this.url = url;
+ this.socket = new OptionalSocket();
+ }
+
+ connect() {
+ const newSocket = io(this.url, {
+ auth: {
+ token: 'dummy', // TODO: Replace with actual federated authentication token
+ }
+ });
+ this.socket.set(newSocket);
+ }
+
+ disconnect() {
+ this.socket.use(socket => socket.disconnect());
+ this.socket.unset();
+ }
+
+ on(event: string, callback: (...args: any[]) => void) {
+ this.socket.use(socket => socket.on(event, callback));
+ }
+
+ off(event: string, callback?: (...args: any[]) => void) {
+ this.socket.use(socket => socket.off(event, callback));
+ }
+
+ emit(event: string, ...args: any[]) {
+ this.socket.use(socket => socket.emit(event, args));
+ }
+}
+
+const sessionsSocket = new SessionsSocket(SOCKET_URL);
+
+export {
+ sessionsSocket,
+ SOCKET_URL,
+};
diff --git a/src/components/planner/sidebar/CoursesController.tsx b/src/components/planner/sidebar/CoursesController.tsx
index 5f3c87f5..6b9322a0 100644
--- a/src/components/planner/sidebar/CoursesController.tsx
+++ b/src/components/planner/sidebar/CoursesController.tsx
@@ -1,14 +1,36 @@
import { useContext } from 'react'
import ClassSelector from './CoursesController/ClassSelector'
import CourseContext from '../../../contexts/CourseContext'
+import MultipleOptionsContext from '../../../contexts/MultipleOptionsContext'
+import { TrashIcon } from "@heroicons/react/24/outline"
import { NoMajorSelectedSVG } from '../../svgs'
import { Button } from '../../ui/button'
const CoursesController = () => {
const { pickedCourses, setUcsModalOpen } = useContext(CourseContext);
+ const { multipleOptions, selectedOption, setMultipleOptions } = useContext(MultipleOptionsContext);
const noCoursesPicked = pickedCourses.length === 0;
+
+ const eraseClasses = () => {
+ const currentOption = multipleOptions[selectedOption];
+
+ const updatedCourseOptions = currentOption.course_options.map(courseOption => ({
+ ...courseOption,
+ picked_class_id: null,
+ locked: false,
+ }));
+
+ const updatedMultipleOptions = [...multipleOptions];
+ updatedMultipleOptions[selectedOption] = {
+ ...currentOption,
+ course_options: updatedCourseOptions,
+ };
+
+ setMultipleOptions(updatedMultipleOptions);
+ };
+
return (
{noCoursesPicked ? (
@@ -28,6 +50,20 @@ const CoursesController = () => {
))
)}
+
+ {!noCoursesPicked && (
+
+
+
+ )}
+
{slot.lesson_type}
- {/* {convertWeekday(slot.day)} */}
- {/* {getLessonBoxTime(slot)} */}
{slot.location}
{slot.professors.map((professor) => professor.acronym).join(', ')}
@@ -72,7 +69,7 @@ const ClassItem = ({ course_id, classInfo, onSelect, onMouseEnter, onMouseLeave
))}
-
+ 0 ? 'block' : 'hidden'} ${conflictSeverity() == 2 ? 'text-red-600' : 'text-amber-500'}`} aria-hidden="true" />
)
}
diff --git a/src/components/planner/sidebar/CoursesController/ClassSelectorDropdownController.tsx b/src/components/planner/sidebar/CoursesController/ClassSelectorDropdownController.tsx
index a5d42203..22893f8e 100644
--- a/src/components/planner/sidebar/CoursesController/ClassSelectorDropdownController.tsx
+++ b/src/components/planner/sidebar/CoursesController/ClassSelectorDropdownController.tsx
@@ -4,7 +4,7 @@ import { ClassInfo, CourseInfo, CourseOption, ProfessorInfo } from "../../../../
import StorageAPI from "../../../../api/storage";
import CourseContext from "../../../../contexts/CourseContext";
import MultipleOptionsContext from "../../../../contexts/MultipleOptionsContext";
-import { getAllPickedSlots, schedulesConflict, teacherIdsFromCourseInfo, uniqueTeachersFromCourseInfo } from "../../../../utils";
+import { teacherIdsFromCourseInfo, uniqueTeachersFromCourseInfo } from "../../../../utils";
import { Desert } from "../../../svgs";
import { DropdownMenuGroup, DropdownMenuItem, DropdownMenuPortal, DropdownMenuSeparator, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger } from "../../../ui/dropdown-menu";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "../../../ui/tabs";
@@ -157,13 +157,6 @@ const ClassSelectorDropdownController = ({
setMultipleOptions(newMultipleOptions)
}
- // Checks if any of the selected classes have time conflicts with the classInfo
- // This is used to display a warning icon in each class of the dropdown in case of conflicts
- const timesCollideWithSelected = (classInfo: ClassInfo) => {
- const pickedSlots = getAllPickedSlots(pickedCourses, multipleOptions[selectedOption])
- return pickedSlots.some((slot) => classInfo.slots.some((currentSlot) => schedulesConflict(slot, currentSlot)))
- }
-
return <>
{course.classes === null ? (
@@ -217,16 +210,17 @@ const ClassSelectorDropdownController = ({
{!course.classes || course.classes.length === 0
?
: <>
+ {selectedClassId && (
deleteOption()}>
Remover Seleção
+ )}
{course.classes &&
getOptions().map((classInfo) => (
{
setSelectedClassId(classInfo.id)
setPreview(null)
@@ -260,7 +254,6 @@ const ClassSelectorDropdownController = ({
key={`schedule-${classInfo.name}`}
course_id={course.id}
classInfo={classInfo}
- conflict={timesCollideWithSelected(classInfo)}
onSelect={() => {
setSelectedClassId(classInfo.id)
setPreview(null)
diff --git a/src/components/planner/sidebar/sessionController/course-picker/MajorSearchCombobox.tsx b/src/components/planner/sidebar/sessionController/course-picker/MajorSearchCombobox.tsx
index 16cf8dd0..8bf0473f 100644
--- a/src/components/planner/sidebar/sessionController/course-picker/MajorSearchCombobox.tsx
+++ b/src/components/planner/sidebar/sessionController/course-picker/MajorSearchCombobox.tsx
@@ -71,9 +71,11 @@ const MajorSearchCombobox = ({ selectedMajor, setSelectedMajor }: Props) => {
// handle that event and actually be scrollable with the mouse wheel
onWheel={(e) => e.stopPropagation()}
>
+ {selectedMajor && (
setSelectedMajor(null)}>
Remover Seleção
+ )}
{majors &&
majors.map((major) => (
{
return (isMandatory(first) && isMandatory(second)) ? 2 : 1;
}
+const classesConflictSeverity = (first: ClassInfo, second: ClassInfo): number => {
+ let maxSeverity = 0;
+
+ for (const slot of first.slots) {
+ for (const otherSlot of second.slots) {
+ if (schedulesConflict(slot, otherSlot)) {
+ maxSeverity = Math.max(maxSeverity, conflictsSeverity(slot, otherSlot));
+ }
+ }
+ }
+
+ return maxSeverity;
+}
+
const schedulesConflict = (first: SlotInfo, second: SlotInfo) => {
if (first.day !== second.day) return false
@@ -395,5 +409,6 @@ export {
uniqueTeachersFromCourseInfo,
teacherIdsFromCourseInfo,
scrollToTop,
+ classesConflictSeverity,
plausible
}