From be9ace5238abdd49f5a66f971ede5a8c2f5c41af Mon Sep 17 00:00:00 2001 From: brausjonas Date: Thu, 22 Jun 2023 00:01:48 +0200 Subject: [PATCH] Fixed User Loading Bug Manchmal wurden User im Input Form nicht richtig geladen. Dieser Bug ist hiermit behoben --- anwendung/src/components/InputForm.jsx | 69 +++++++++++++------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/anwendung/src/components/InputForm.jsx b/anwendung/src/components/InputForm.jsx index d0b5c65..6e84565 100644 --- a/anwendung/src/components/InputForm.jsx +++ b/anwendung/src/components/InputForm.jsx @@ -40,51 +40,50 @@ export default function InputForm(p) { let url = baseURL + "/users/all?sessionid=" + localStorage.getItem("sessionid") fetch(url).then(r => r.json()).then(u => { setUsers(u) - }) + }).then(() => { + let tempSemesterNumber = 0 + if(localStorage.getItem("currentsid") != 0) + { + fetch(baseURL + "/semester/id?sessionid=" + localStorage.getItem("sessionid") + "&id=" + localStorage.getItem("currentsid")).then(r => r.json()).then(semester => { + setCourseName(semester.name) + let startYear = semester.startyear + let endYear = semester.endyear + let start = new Date(startYear, 0, semester.startday) + let end = new Date(endYear, 0, semester.endday) + setStartDate(startYear + "-" + ((start.getMonth() + 1) < 10 ? "0" + (start.getMonth() + 1) : (start.getMonth() + 1)) + "-" + (start.getDate() < 10 ? "0" + start.getDate() : start.getDate())) + setEndDate(endYear + "-" + ((end.getMonth() + 1) < 10 ? "0" + (end.getMonth() + 1) : (end.getMonth() + 1)) + "-" + (end.getDate() < 10 ? "0" + end.getDate() : end.getDate())) - let tempSemesterNumber = 0 - if(localStorage.getItem("currentsid") != 0) - { - fetch(baseURL + "/semester/id?sessionid=" + localStorage.getItem("sessionid") + "&id=" + localStorage.getItem("currentsid")).then(r => r.json()).then(semester => { - setCourseName(semester.name) - let startYear = semester.startyear - let endYear = semester.endyear - let start = new Date(startYear, 0, semester.startday) - let end = new Date(endYear, 0, semester.endday) + tempSemesterNumber = semester.number + setSemesterNumber(semester.number) - setStartDate(startYear + "-" + ((start.getMonth() + 1) < 10 ? "0" + (start.getMonth() + 1) : (start.getMonth() + 1)) + "-" + (start.getDate() < 10 ? "0" + start.getDate() : start.getDate())) - setEndDate(endYear + "-" + ((end.getMonth() + 1) < 10 ? "0" + (end.getMonth() + 1) : (end.getMonth() + 1)) + "-" + (end.getDate() < 10 ? "0" + end.getDate() : end.getDate())) + arr = [] + modulesDummy[semester.number].map(e => { + arr.push({"moduleid": -1, "userid": -1, "activated": 0}) + }) - tempSemesterNumber = semester.number - setSemesterNumber(semester.number) - - arr = [] - modulesDummy[semester.number].map(e => { - arr.push({"moduleid": -1, "userid": -1, "activated": 0}) - }) - - }).then(() => { - fetch(baseURL + "/module/bysemesterid?sessionid=" + localStorage.getItem("sessionid") + "&semesterid=" + localStorage.getItem("currentsid")).then(r => r.json()).then(modules => { - console.log(modules) - for(let i = 0; i < modules.length; i++) - { - for(let j = 0; j < modulesDummy[tempSemesterNumber].length; j++) + }).then(() => { + fetch(baseURL + "/module/bysemesterid?sessionid=" + localStorage.getItem("sessionid") + "&semesterid=" + localStorage.getItem("currentsid")).then(r => r.json()).then(modules => { + console.log(modules) + for(let i = 0; i < modules.length; i++) { - if(modulesDummy[tempSemesterNumber][j] == modules[i].name) + for(let j = 0; j < modulesDummy[tempSemesterNumber].length; j++) { - arr[j].userid = modules[i].userid - arr[j].moduleid = modules[i].id - arr[j].activated = modules[i].activated - break + if(modulesDummy[tempSemesterNumber][j] == modules[i].name) + { + arr[j].userid = modules[i].userid + arr[j].moduleid = modules[i].id + arr[j].activated = modules[i].activated + break + } } } - } - setModuleUserMapping(arr) + setModuleUserMapping(arr) + }) }) - }) - } + } + }) }, []) function onButtonAbort(e) {