Backend Statusbar Update

Backend Statusbar Funktionen hinzugefügt

anwendung/src/components/CalenderView.jsx

@@ -128,7 +128,6 @@ export default function CalenderView(p) {
                                         if (en[i][k].timeend >= en[i][l].timestart && en[i][k].timeend <= en[i][l].timeend) {
                                             en[i][k].timeend = en[i][l].timestart
                                         }
-
                                     }
                                 }
                             }

anwendung/src/components/Constants.js

@@ -1,2 +1,2 @@
-export const baseURL = "http://185.245.96.48:8080"
+//export const baseURL = "http://185.245.96.48:8080"
-//export const baseURL = "http://localhost:8080"
+export const baseURL = "http://localhost:8080"

anwendung/src/pages/semesteroverviewLecturer.js

@@ -31,6 +31,8 @@ export default function SemesteroverviewLecturer(p) {
             let semesterURL = baseURL + "/semester/id/all?ids=" + args + "&sessionid=" + localStorage.getItem("sessionid");
             fetch(semesterURL).then(r => r.json()).then(sem => {
                 sem.map(e => {
+                    let progessURL = baseURL + "/entries/planned?sessionid=" + localStorage.getItem("sessionid") + "&semesterid=" + e.id;
+                    fetch(progessURL).then(r => r.json()).then(en => console.log(en))
                     temp.push(e.name)
                 })
             }).then(() => setSemesterNames(temp))

backend/src/main/java/com/example/backend/anwprj/Database/DataBaseHandler.java

@@ -106,7 +106,7 @@ public class DataBaseHandler
     public Entry[][] getAllEntrys(int semesterid, int daynumber, int yearnumber, int userid)
     {
         try {
-            ResultSet rs = st. executeQuery("select * from entries where " +
+            ResultSet rs = st.executeQuery("select * from entries where " +
                     "semesterid<>" + semesterid +
                     " and yearnumber=" + yearnumber +
                     " and usercreatedbyid=" + userid +
@@ -138,6 +138,24 @@ public class DataBaseHandler
         }
     }
 
+    public Entry[] getAllEntries(int semesterid, int userid)
+    {
+        try {
+            ResultSet rs = st.executeQuery("select * from entries where " +
+                    "semesterid=" + semesterid +
+                    " and usercreatedbyid=" + userid);
+            List<Entry> entriestate = new ArrayList<>();
+            Entry current  = null;
+            while((current = resultSetToEntry(rs)) != null)
+            {
+                entriestate.add(current);
+            }
+            return entriestate.toArray(new Entry[0]);
+        }catch (Exception e){
+            return null;
+        }
+    }
+
     public void deleteEntry(int id)
     {
         try

backend/src/main/java/com/example/backend/anwprj/controller/EntriesController.java

@@ -58,6 +58,24 @@ public class EntriesController
         return new ResponseEntity<>(null, HttpStatus.FORBIDDEN);
     }
 
+    @CrossOrigin
+    @GetMapping("/entries/planned")
+    public ResponseEntity<Integer[]> getEntries(@RequestParam(name = "semesterid") int semesterid,
+                                                @RequestParam(name = "sessionid") String sessionid)
+    {
+        User sessionUser = UserSessionIDHandler.getUserBySessionID(sessionid);
+        if (sessionUser != null)
+        {
+            var entries = db.getAllEntries(semesterid, sessionUser.getId());
+            var count = 0;
+            for (int i = 0; i < entries.length; i++) {
+                count += entries[i].getTimeend()-entries[i].getTimestart();
+            }
+            return new ResponseEntity<>(new Integer[]{count}, HttpStatus.OK);
+        }
+        return new ResponseEntity<>(HttpStatus.FORBIDDEN);
+    }
+
     /**
      POST
      A new entry to the database. Every user except of admins is allowed