Small changes

Author: Alexandra Zwinger

src/components/calendar/meeting/ExamDateModal.tsx

@@ -8,7 +8,7 @@ interface Props {
     isOpen: boolean;
     modules: UserModule[];
     onClose: () => void;
-    onSubmit: (moduleName: string, date: string, time: string, room: string) => void;
+    onSubmit: (moduleName: string, date: string, time: string, room: string | undefined) => void;
 }
 
 export default function ExamDateModal({isOpen, modules, onClose, onSubmit}: Props) {
@@ -20,7 +20,7 @@ export default function ExamDateModal({isOpen, modules, onClose, onSubmit}: Prop
     useEffect(() => {
         setDay(pick.examDate);
         setHour(pick.examTime);
-        setLoc(pick.examLoc);
+        setLoc(pick.examLoc ? pick.examLoc : "");
     }, [pick])
 
     if (!isOpen) return null;

src/components/yourStudies/UserInfo.tsx

@@ -36,12 +36,28 @@ export default function UserInfo(props: { reload: boolean }) {
     async function fetchMeetings() {
         try {
             const resp = await getMeetingsOfWeek(axiosInstance);
-            setWeeklyMeetings(resp);
+            setWeeklyMeetings(filterMeetingsThisWeek(resp)); // this is necessary, because backend doesn't have filter function yet
         } catch (e) {
             console.error(e);
         }
     }
 
+    function filterMeetingsThisWeek(meetings: MeetingDto[]): MeetingDto[] {
+        const now = new Date();
+        const startOfWeek = new Date(now);
+        startOfWeek.setDate(now.getDate() - now.getDay() + 1);
+        startOfWeek.setHours(0, 0, 0, 0);
+
+        const endOfWeek = new Date(startOfWeek);
+        endOfWeek.setDate(startOfWeek.getDate() + 6);
+        endOfWeek.setHours(23, 59, 59, 999);
+
+        return meetings.filter(meeting => {
+            const from = new Date(meeting.dateFrom);
+            return from >= startOfWeek && from <= endOfWeek;
+        });
+    }
+
     function calculateProgress(module: UserModule) {
         if (!module.chapter) return 0;
         let total = 0, checked = 0;
@@ -65,7 +81,7 @@ export default function UserInfo(props: { reload: boolean }) {
     const openExamModal = () => setIsExamModalOpen(true);
     const closeExamModal = () => setIsExamModalOpen(false);
 
-    const handleAddExam = async (moduleName: string, date: string, time: string, room: string) => {
+    const handleAddExam = async (moduleName: string, date: string, time: string, room: string | undefined) => {
         const updated = modules.map(m =>
             m.name === moduleName
                 ? {...m, examDate: date, examLoc: room, examTime: time}

src/components/yourStudies/UserSettings.tsx

@@ -87,8 +87,8 @@ export default function UserSettings(props: { reload: boolean, setReload: Dispat
                 name: module,
                 chapter: [],
                 examDate: "--",
-                examLoc: "--",
-                examTime: "--"
+                examLoc: undefined,
+                examTime: "--",
             }]);
         setModule("");
         if (!allModules.some(m => m.name.toUpperCase() === module.toUpperCase())) {

src/dtos/ModuleDto.tsx

@@ -1,7 +1,7 @@
 export type UserModule = {
     name: string;
     examDate: string;
-    examLoc: string;
+    examLoc: string | undefined;
     examTime: string;
     chapter: Chapter[];
 }