From 05a6a3ee2346fba4b19e18eb7b78ccadbc53666e Mon Sep 17 00:00:00 2001
From: AlexE030 <ebner.alexander@gmx.de>
Date: Fri, 16 Jun 2023 12:13:20 +0200
Subject: [PATCH] Zwischenpush

---
 anwendung/src/components/CalenderView.jsx     |  4 +++-
 anwendung/src/components/StatusBar.jsx        | 23 ++++++++-----------
 anwendung/src/components/SubmitWarning.jsx    |  2 +-
 .../src/pages/semesteroverviewLecturer.js     |  2 +-
 .../anwprj/Database/DataBaseHandler.java      |  2 +-
 .../anwprj/controller/ModuleController.java   |  1 -
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/anwendung/src/components/CalenderView.jsx b/anwendung/src/components/CalenderView.jsx
index 27f5ba5..b5f8975 100644
--- a/anwendung/src/components/CalenderView.jsx
+++ b/anwendung/src/components/CalenderView.jsx
@@ -109,7 +109,9 @@ export default function CalenderView(p) {
                     for (let k = 0; k < 20; k++) {
                         if (en[i][k] != null) {
 
-                            if (en[i][k].semesterid != currentsid) {
+
+                            if (en[i][k].semesterid != currentsid)
+                            {
                                 for (let l = 0; l < 20; l++) {
                                     if (en[i][l] != null && en[i][l].usercreatedbyid != userid) {
                                         if (en[i][l].timestart <= en[i][k].timestart && en[i][l].timeend >= en[i][k].timeend) {
diff --git a/anwendung/src/components/StatusBar.jsx b/anwendung/src/components/StatusBar.jsx
index c6b4c23..2bb443d 100644
--- a/anwendung/src/components/StatusBar.jsx
+++ b/anwendung/src/components/StatusBar.jsx
@@ -4,24 +4,21 @@ import {console} from "next/dist/compiled/@edge-runtime/primitives/console";
 
 export default function StatusBar(p)
 {
-    let testindex = 1;
-    const modules = p.modules;
+    const module = p.module;
 
     let url = baseURL + "/entries/planned?sessionid=" + localStorage.getItem("sessionid");
 
-    fetch(url).then(response => response.json()).then(e => {
-        modules.forEach(modules => {
-            e.forEach(e => {
-                if (e.moduleid == modules.id){
-                    testindex = 2;
-                    if (modules.activated == 0){
-                        testindex = 3;
-                    }
+    fetch(url).then(response => response.json()).then(entries => {
+        let testindex = 1;
+        entries.forEach(e => {
+            if (e.moduleid == module.id){
+                testindex = 2;
+                if (module.activated == 0){
+                    testindex = 3;
                 }
-            })
-
-        console.log(testindex);
+            }
         })
+        console.log(testindex);
     })
 
 
diff --git a/anwendung/src/components/SubmitWarning.jsx b/anwendung/src/components/SubmitWarning.jsx
index c296614..e82b636 100644
--- a/anwendung/src/components/SubmitWarning.jsx
+++ b/anwendung/src/components/SubmitWarning.jsx
@@ -7,7 +7,7 @@ export default function SubmitWarning(p){
         let url = baseURL + "/module?sessionid=" + localStorage.getItem("sessionid");
 
         let json1 = {
-            "id": 0,
+            "id": localStorage.getItem("moduleid"),
             "userid": localStorage.getItem("userid"),
             "semesterid": localStorage.getItem("currentsid"),
             "name": localStorage.getItem("currentmodulename"),
diff --git a/anwendung/src/pages/semesteroverviewLecturer.js b/anwendung/src/pages/semesteroverviewLecturer.js
index 740850c..e0bd9d3 100644
--- a/anwendung/src/pages/semesteroverviewLecturer.js
+++ b/anwendung/src/pages/semesteroverviewLecturer.js
@@ -68,7 +68,7 @@ export default function SemesteroverviewLecturer(p) {
                         editable={false} text={semesterNames[index]} text2={e.name}
                         onClick={(f) => onClickSemester(e, f, semesterNames[index])}
                     />
-                    <StatusBar progress={0} modules={entries}/>
+                    <StatusBar progress={0} module={e}/>
                 </div>
             ))}
         </div>
diff --git a/backend/src/main/java/com/example/backend/anwprj/Database/DataBaseHandler.java b/backend/src/main/java/com/example/backend/anwprj/Database/DataBaseHandler.java
index 6449512..cda73da 100644
--- a/backend/src/main/java/com/example/backend/anwprj/Database/DataBaseHandler.java
+++ b/backend/src/main/java/com/example/backend/anwprj/Database/DataBaseHandler.java
@@ -360,7 +360,7 @@ public class DataBaseHandler {
             st.executeUpdate("update modules set activated=" + m.getActivated() + ", semesterid=" + m.getsemesterid() + ", name='" + m.getName() + "' where id=" + m.getid());
 
 
-            return null;
+            return getModule(m.getid());
         } catch (SQLException ex) {
             ex.printStackTrace();
             return null;
diff --git a/backend/src/main/java/com/example/backend/anwprj/controller/ModuleController.java b/backend/src/main/java/com/example/backend/anwprj/controller/ModuleController.java
index 5ef9c29..d30a37c 100644
--- a/backend/src/main/java/com/example/backend/anwprj/controller/ModuleController.java
+++ b/backend/src/main/java/com/example/backend/anwprj/controller/ModuleController.java
@@ -143,7 +143,6 @@ public class ModuleController
             {
                 return new ResponseEntity<>(m, HttpStatus.OK);
             }
-
             return new ResponseEntity<>(HttpStatus.NOT_FOUND);
         }