From 5803c7b29b5a2f7811edb1e10a2c8e7cb66b22a0 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Tue, 19 Mar 2024 11:41:50 +0100
Subject: [PATCH] Refactor fetchWeeklyReport function, updated submit button
 text, week fetched by params

---
 frontend/src/Components/EditWeeklyReport.tsx | 69 ++++++++++----------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/frontend/src/Components/EditWeeklyReport.tsx b/frontend/src/Components/EditWeeklyReport.tsx
index 0bfc608..3017204 100644
--- a/frontend/src/Components/EditWeeklyReport.tsx
+++ b/frontend/src/Components/EditWeeklyReport.tsx
@@ -16,42 +16,43 @@ export default function GetWeeklyReport(): JSX.Element {
   const token = localStorage.getItem("accessToken") ?? "";
   const username = localStorage.getItem("username") ?? "";
   const { projectName } = useParams();
+  const { fetchedWeek } = useParams();
+
+  const fetchWeeklyReport = async (): Promise<void> => {
+    const response = await api.getWeeklyReport(
+      username,
+      projectName ?? "",
+      fetchedWeek?.toString() ?? "0",
+      token,
+    );
+
+    if (response.success) {
+      const report: NewWeeklyReport = response.data ?? {
+        projectName: "",
+        week: 0,
+        developmentTime: 0,
+        meetingTime: 0,
+        adminTime: 0,
+        ownWorkTime: 0,
+        studyTime: 0,
+        testingTime: 0,
+      };
+
+      setWeek(report.week);
+      setDevelopmentTime(report.developmentTime);
+      setMeetingTime(report.meetingTime);
+      setAdminTime(report.adminTime);
+      setOwnWorkTime(report.ownWorkTime);
+      setStudyTime(report.studyTime);
+      setTestingTime(report.testingTime);
+    } else {
+      console.error("Failed to fetch weekly report:", response.message);
+    }
+  };
 
   useEffect(() => {
-    const fetchWeeklyReport = async (): Promise<void> => {
-      const response = await api.getWeeklyReport(
-        username,
-        projectName ?? "",
-        week.toString(),
-        token,
-      );
-
-      if (response.success) {
-        const report: NewWeeklyReport = response.data ?? {
-          projectName: "",
-          week: 0,
-          developmentTime: 0,
-          meetingTime: 0,
-          adminTime: 0,
-          ownWorkTime: 0,
-          studyTime: 0,
-          testingTime: 0,
-        };
-
-        setWeek(report.week);
-        setDevelopmentTime(report.developmentTime);
-        setMeetingTime(report.meetingTime);
-        setAdminTime(report.adminTime);
-        setOwnWorkTime(report.ownWorkTime);
-        setStudyTime(report.studyTime);
-        setTestingTime(report.testingTime);
-      } else {
-        console.error("Failed to fetch weekly report:", response.message);
-      }
-    };
-
     void fetchWeeklyReport();
-  }, [projectName, token, username, week]);
+  });
 
   const handleNewWeeklyReport = async (): Promise<void> => {
     const newWeeklyReport: NewWeeklyReport = {
@@ -233,7 +234,7 @@ export default function GetWeeklyReport(): JSX.Element {
               </tbody>
             </table>
             <Button
-              text="Submit"
+              text="Submit changes"
               onClick={(): void => {
                 return;
               }}