Fix last bugs

Author: Alexandra Zwinger

src/components/yourStudies/UserInfo.tsx

@@ -36,23 +36,12 @@ export default function UserInfo(props: { reload: boolean }) {
     async function fetchMeetings() {
         try {
             const resp = await getMeetingsOfWeek(axiosInstance);
-            setWeeklyMeetings(filterMeetingsForCurrentWeek(resp));
+            setWeeklyMeetings(resp);
         } catch (e) {
             console.error(e);
         }
     }
 
-    function filterMeetingsForCurrentWeek(meetings: MeetingDto[]) {
-        const now = new Date();
-        const start = new Date(now.setDate(now.getDate() - now.getDay() + 1));
-        const end = new Date(start);
-        end.setDate(start.getDate() + 6);
-        return meetings.filter(m => {
-            const d = new Date(m.dateFrom);
-            return d >= start && d <= end;
-        });
-    }
-
     function calculateProgress(module: UserModule) {
         if (!module.chapter) return 0;
         let total = 0, checked = 0;

src/form/CreateOrUpdateMeetingForm.tsx

@@ -16,6 +16,7 @@ import axiosInstance from "../AxiosConfig";
 import {getModules} from "../api/ModuleApi";
 import {ChangeType} from "../enum/ChangeType";
 import {UserModule} from "../dtos/ModuleDto";
+import {getUser} from "../api/UserApi";
 
 interface MeetingFormProps {
     open: boolean;
@@ -47,8 +48,8 @@ export function CreateOrUpdateMeetingForm({open, onClose, meeting, onlyThisMeeti
 
     const fetchModuleNames = async () => {
         try {
-            const response = await getModules(axiosInstance);
-            setModuleNames(response);
+            const response = await getUser(axiosInstance);
+            setModuleNames(response.modules);
         } catch (error) {
             console.error("Error fetching user modules:" + error);
         }