From e9de6c41aff6744986101a1cd1dd2533da098bbf Mon Sep 17 00:00:00 2001 From: AliGitGut Date: Sat, 10 Jun 2023 00:56:54 +0200 Subject: [PATCH] Backend Statusbar Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backend Statusbar Funktionen hinzugefügt --- anwendung/src/components/CalenderView.jsx | 1 - anwendung/src/components/Constants.js | 4 ++-- .../src/pages/semesteroverviewLecturer.js | 2 ++ backend/database.mv.db | Bin 126976 -> 94208 bytes .../anwprj/Database/DataBaseHandler.java | 20 +++++++++++++++++- .../anwprj/controller/EntriesController.java | 18 ++++++++++++++++ 6 files changed, 41 insertions(+), 4 deletions(-) diff --git a/anwendung/src/components/CalenderView.jsx b/anwendung/src/components/CalenderView.jsx index 3fb6d22..3589f08 100644 --- a/anwendung/src/components/CalenderView.jsx +++ b/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 } - } } } diff --git a/anwendung/src/components/Constants.js b/anwendung/src/components/Constants.js index e70872d..20d725f 100644 --- a/anwendung/src/components/Constants.js +++ b/anwendung/src/components/Constants.js @@ -1,2 +1,2 @@ -export const baseURL = "http://185.245.96.48:8080" -//export const baseURL = "http://localhost:8080" \ No newline at end of file +//export const baseURL = "http://185.245.96.48:8080" +export const baseURL = "http://localhost:8080" \ No newline at end of file diff --git a/anwendung/src/pages/semesteroverviewLecturer.js b/anwendung/src/pages/semesteroverviewLecturer.js index 1503bf8..64d570a 100644 --- a/anwendung/src/pages/semesteroverviewLecturer.js +++ b/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)) diff --git a/backend/database.mv.db b/backend/database.mv.db index 5cd7f22bfb7796541516854cb2dcaf7db8e5bc5b..2a63463240cfd03a3441804befda7a91bf2c16a9 100644 GIT binary patch literal 94208 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" + 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 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 diff --git a/backend/src/main/java/com/example/backend/anwprj/controller/EntriesController.java b/backend/src/main/java/com/example/backend/anwprj/controller/EntriesController.java index 70c7207..619da64 100644 --- a/backend/src/main/java/com/example/backend/anwprj/controller/EntriesController.java +++ b/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 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