diff options
| -rw-r--r-- | admin/index.js | 4 | ||||
| -rw-r--r-- | admin/public/ranking.html | 24 | ||||
| -rw-r--r-- | admin/public/ranking.js | 29 | ||||
| -rw-r--r-- | admin/public/style.css | 4 | ||||
| -rw-r--r-- | app.js | 2 | ||||
| -rw-r--r-- | overview/public/index.html | 3 | ||||
| l--------- | overview/public/votes.html | 1 |
7 files changed, 48 insertions, 19 deletions
diff --git a/admin/index.js b/admin/index.js index 8c9c0ae..f7b7c7b 100644 --- a/admin/index.js +++ b/admin/index.js @@ -49,12 +49,12 @@ app.get("/api/questions", checkAdmin, async (req, res) => { app.get("/api/answers", checkAdmin, async (req, res) => { const answers = await db.query( - "SELECT question_id, name, middlename, surname, count(*) count FROM ranking_questions q INNER JOIN ranking_answers a ON q.id = a.question_id INNER JOIN users u ON answer_id = u.id GROUP BY question_id, answer_id ORDER BY count DESC", + "SELECT question_id, u.name, u.middlename, u.surname, c.name class, count(*) count FROM ranking_questions q INNER JOIN ranking_answers a ON q.id = a.question_id INNER JOIN users u ON answer_id = u.id INNER JOIN class c ON u.class_id = c.id GROUP BY question_id, answer_id ORDER BY count DESC", ); res.json(answers); }); -app.get("/api/votes", async (req, res) => { +app.get("/api/votes", checkAdmin, async (req, res) => { const votes = await db.query( "SELECT m.id, m.name, m.description, SUM(votes) votes FROM motto_votes mv RIGHT JOIN mottos m on mv.motto_id = m.id GROUP BY m.id, m.name, m.description ORDER BY SUM(votes) DESC", ); diff --git a/admin/public/ranking.html b/admin/public/ranking.html index 328f09a..adb05f2 100644 --- a/admin/public/ranking.html +++ b/admin/public/ranking.html @@ -21,10 +21,26 @@ <!-- TODO: Class-based stats (easily solveable in frontend) --> <div class="card"> - Welche/r Schüler/in... - <ul id="pupil"></ul> - Welche/r Lehrer/in... - <ul id="teacher"></ul> + <h2>Ranking</h2> + <div id="list"> + <span>Lehrer</span> + <ul></ul> + <br /> + <span>TGM13.1</span> + <ul></ul> + <br /> + <span>TGM13.2</span> + <ul></ul> + <br /> + <span>TGTM13.1</span> + <ul></ul> + <br /> + <span>TGI13.1</span> + <ul></ul> + <br /> + <span>TGI13.2</span> + <ul></ul> + </div> </div> <script src="ranking.js"></script> diff --git a/admin/public/ranking.js b/admin/public/ranking.js index 4281e23..ba44db6 100644 --- a/admin/public/ranking.js +++ b/admin/public/ranking.js @@ -1,3 +1,5 @@ +const classes = ["teacher", "TGM13.1", "TGM13.2", "TGTM13.1", "TGI13.1", "TGI13.2"]; + fetch("api/questions") .then((questions) => questions.json()) .then((questions) => { @@ -11,16 +13,27 @@ fetch("api/questions") }); function render(questions) { - const teacher = document.querySelector("ul#teacher"); - const pupil = document.querySelector("ul#pupil"); + const list = document.querySelectorAll("#list ul"); + + list.forEach((elem) => { + elem.style.display = "none"; + elem.previousElementSibling.addEventListener("click", () => { + elem.style.display = elem.style.display === "none" ? "block" : "none"; + console.log(elem.nextElementSibling); + }); + }); + questions.forEach((question) => { - const list = question.type === "teacher" ? teacher : pupil; - let answers = ""; + let answers = ["", "", "", "", "", ""]; question.answers.forEach((answer) => { - answers += `<li>${answer.name} ${answer.middlename ? answer.middlename + " " : ""}${answer.surname}: ${ - answer.count - }</li>`; + answers[classes.indexOf(answer.class)] += `<li>${answer.name} ${ + answer.middlename ? answer.middlename + " " : "" + }${answer.surname}: ${answer.count}</li>`; + }); + + answers.forEach((elem, ind) => { + if ((question.type != "teacher" || ind == 0) && (question.type == "teacher" || ind != 0)) + list[ind].insertAdjacentHTML("beforeend", `<li>${question.question}<br><ol>${answers[ind]}</ol></li>`); }); - list.insertAdjacentHTML("beforeend", `<li>${question.question}<br><ol>${answers}</ol></li>`); }); } diff --git a/admin/public/style.css b/admin/public/style.css index e18342e..f1bbc9e 100644 --- a/admin/public/style.css +++ b/admin/public/style.css @@ -28,6 +28,10 @@ div { background: white; } +#list span { + cursor: pointer; +} + @media only screen and (max-width: 700px) { .card { width: calc(100% - 20%); @@ -36,7 +36,7 @@ app.use("/mottovote", checkUser, mottovote); app.use("/quotes", checkUser, quotes); app.use("/poll", checkUser, poll); app.use("/profile", checkUser, profile); -app.use("/admin", admin); // Lel +app.use("/admin", checkAdmin, admin); // Lel app.use("/auth", auth); app.listen(process.env.PORT || 5005, () => console.log(`Server started on http://localhost:${process.env.PORT}`)); diff --git a/overview/public/index.html b/overview/public/index.html index 9323a88..c51123a 100644 --- a/overview/public/index.html +++ b/overview/public/index.html @@ -35,9 +35,6 @@ <a href="/mottovote" class="pure-menu-link">Motto-Voting</a> </li> <li class="pure-menu-item"> - <a href="/votes.html" class="pure-menu-link">Führende Mottos</a> - </li> - <li class="pure-menu-item"> <a href="/quotes" class="pure-menu-link">Zitate</a> </li> <li class="pure-menu-item"> diff --git a/overview/public/votes.html b/overview/public/votes.html deleted file mode 120000 index cfc670c..0000000 --- a/overview/public/votes.html +++ /dev/null @@ -1 +0,0 @@ -/home/melvin/code/abizeugs/admin/public/votes.html
\ No newline at end of file |