diff options
| -rw-r--r-- | db.js | 26 | ||||
| -rw-r--r-- | drop.sql | 1 | ||||
| -rw-r--r-- | questions.txt | 10 | ||||
| -rw-r--r-- | questions/index.js | 19 | ||||
| -rw-r--r-- | questions/public/index.html | 5 | ||||
| -rw-r--r-- | questions/public/script.js | 46 | ||||
| -rw-r--r-- | tables.sql | 16 |
7 files changed, 81 insertions, 42 deletions
@@ -19,9 +19,9 @@ class DB { async init() { const tables = await this.getTables(); - for (const table of tables) if (table) await this.query(table); + for (const table of tables) if (table && table.length > 1) await this.query(table); console.info("Database initialized!"); - const res = await this.query("SELECT id FROM users"); + const res = await this.query("SELECT id FROM users LIMIT 1"); if (res.length === 0) await this.initValues(); } @@ -47,7 +47,7 @@ class DB { const drops = await fs.readFile(__dirname + "/drop.sql", "utf8"); for (const stmt of drops.split(";")) if (stmt && stmt.length > 1) await this.query(stmt); const tables = await this.getTables(); - for (const table of tables) if (table) await this.query(table); + for (const table of tables) if (table && table.length > 1) await this.query(table); } async resetQuotes() { @@ -180,18 +180,28 @@ class DB { async initQuestions() { const data = (await fs.readFile(__dirname + "/questions.txt", "utf8")).split("\n"); - for (const q of data) { - await this.query("INSERT INTO question_questions (question) VALUE (?)", [q]) - .catch(() => console.info("Question already exists!")); + for (const question of data) { + try { + const [q, a] = question.split(" - "); + const { insertId } = await this.query("INSERT INTO question_questions (question) VALUE (?)", [q]); + for (const answer of a.split(",")) { + await this.query("INSERT INTO question_options (answer_option, question_id) VALUE (?,?)", [answer, insertId]); + } + } catch (e) { + console.error(e); + console.info("Question already exists!"); + } } } async resetQuestions() { const tables = await this.getTables(); - await this.query("DROP TABLE question_answers"); - await this.query("DROP TABLE question_questions"); + await this.query("DROP TABLE IF EXISTS question_answers"); + await this.query("DROP TABLE IF EXISTS question_options"); + await this.query("DROP TABLE IF EXISTS question_questions"); await this.query(tables[12]); await this.query(tables[13]); + await this.query(tables[14]); await this.initQuestions(); } @@ -8,6 +8,7 @@ DROP TABLE IF EXISTS profile_answers; DROP TABLE IF EXISTS profile_questions; DROP TABLE IF EXISTS profile_input_types; DROP TABLE IF EXISTS question_answers; +DROP TABLE IF EXISTS question_options; DROP TABLE IF EXISTS question_questions; DROP TABLE IF EXISTS users; DROP TABLE IF EXISTS types; diff --git a/questions.txt b/questions.txt index 118c921..1447c6f 100644 --- a/questions.txt +++ b/questions.txt @@ -1,2 +1,8 @@ -Bist du blöd? -Fällst du durch? +Single/Vergeben - Single,Vergeben +Schulweg - Bus,Bahn,Auto,Fahrrad,Fuß +Schon einmal blau gemacht - Ja,Nein +Nach der Schule - Auslandsjahr,Arbeit,Ausbildung,Work & Travel,Pause,Studium +Geschwister - Ja,Nein +Raucher - Ja,Nein +Drogen - Ja,Nein +Jungfrau - Ja,Nein
\ No newline at end of file diff --git a/questions/index.js b/questions/index.js index 1f0f4ce..96bbb8b 100644 --- a/questions/index.js +++ b/questions/index.js @@ -7,15 +7,16 @@ app.use("/", checkUser, express.static(__dirname + "/public")); app.get("/api/question/:id", checkUser, async (req, res) => { try { - const questions = await db.query("SELECT id, question FROM question_questions"); + const questions = await db.query("SELECT id, question FROM question_questions ORDER BY id"); const id = +req.params.id; if (id >= 0 && id < questions.length) { const question = questions[id]; const answers = await db.query( - "SELECT answer FROM question_answers WHERE question_id = ? AND user_id = ?", + "SELECT option_id FROM question_answers WHERE question_id = ? AND user_id = ?", [question.id, req.session.uid], ); - question.answer = answers.length > 0 ? answers[0].answer : undefined; + question.answer = answers.length > 0 ? answers[0].option_id : undefined; + question.options = await db.query("SELECT id, answer_option FROM question_options WHERE question_id = ?", [question.id]); res.json(question); } else { res.json({}); @@ -45,21 +46,27 @@ app.get("/api/questions", checkUser, async (req, res) => { }); app.post("/api/answer", checkUser, async (req, res) => { - return await answer(req, res, "INSERT INTO question_answers (answer, question_id, user_id) VALUE (?,?,?)"); + return await answer(req, res, "INSERT INTO question_answers (option_id, question_id, user_id) VALUE (?,?,?)"); }); app.put("/api/answer", checkUser, async (req, res) => { - return await answer(req, res, "UPDATE question_answers SET answer = ? WHERE question_id = ? AND user_id = ?"); + return await answer(req, res, "UPDATE question_answers SET option_id = ? WHERE question_id = ? AND user_id = ?"); }); async function answer(req, res, qu) { const { question, answer } = req.body; + const fail = { success: false }; try { + const possibleAnswers = await db.query(`SELECT qo.id + FROM question_questions qq + INNER JOIN question_options qo on qq.id = qo.question_id + WHERE qq.id = ?`, [question]); + if (possibleAnswers.find(value => +value.id === +answer) === undefined) return res.json(fail); // Answer not for question await db.query(qu, [answer, question, req.session.uid]); res.json({ success: true }); } catch (e) { console.error(e); - res.json({ success: false }); + res.json(fail); } } diff --git a/questions/public/index.html b/questions/public/index.html index 90244f5..e21db81 100644 --- a/questions/public/index.html +++ b/questions/public/index.html @@ -26,10 +26,7 @@ <div class="bar" id="progress"></div> <label id="question_label" for="question"></label> <input name="question" id="question" hidden /> - <div class="answer-buttons pure-button-group" role="group"> - <button class="pure-button pure-button-primary answer-btn" data-value="1">Ja</button> - <button class="pure-button pure-button-primary answer-btn" data-value="0">Nein</button> - </div> + <div class="answer-buttons pure-button-group" role="group"></div> <br> <div class="back-skip pure-button-group" role="group"> <button id="prev-btn" class="pure-button">Zurück</button> diff --git a/questions/public/script.js b/questions/public/script.js index aaeac00..2a04a02 100644 --- a/questions/public/script.js +++ b/questions/public/script.js @@ -7,7 +7,6 @@ const question_label = document.getElementById("question_label"); const prev = document.getElementById("prev-btn"); const skip = document.getElementById("skip-btn"); const progress = document.getElementById("progress"); -const buttons = document.querySelectorAll(".answer-btn"); skip.addEventListener("click", () => getNext(qid + 1)); prev.addEventListener("click", () => getNext(qid - 1)); @@ -23,10 +22,21 @@ fetch(`api/question/${qid}`) if (!response.empty()) { question_label.innerText = response["question"]; question_input.setAttribute("value", response["id"]); + const div = document.getElementsByClassName("answer-buttons")[0]; + const prop = 100 / response.options.length; + for (const option of response.options) { + const btn = document.createElement("btn"); + btn.classList.add("pure-button", "pure-button-primary", "answer-btn"); + btn.dataset.value = `${option.id}`; + btn.textContent = option.answer_option; + btn.style.width = `${prop}%`; + div.append(btn); + } + addListeners(); if (response.answer !== undefined) { method = "PUT"; + document.querySelector(`.answer-btn[data-value="${response.answer}"]`).style.opacity = "0.5"; } - document.querySelector(`.answer-btn[data-value="${response.answer}"]`).style.opacity = "0.5"; } else getNext(); // Resets }); @@ -63,21 +73,19 @@ NodeList.prototype.on = function (listener, event) { } }; -buttons.on("click", async (e) => { - const body = JSON.stringify({ - question: question_input.value, - answer: e.target.dataset.value === "1", - }); - const resp = await fetch("api/answer", { - method, - headers: { "Content-Type": "application/json" }, - body, +function addListeners() { + const buttons = document.querySelectorAll(".answer-btn"); + buttons.on("click", async (e) => { + const body = JSON.stringify({ + question: question_input.value, + answer: e.target.dataset.value, + }); + const resp = await fetch("api/answer", { + method, + headers: { "Content-Type": "application/json" }, + body, + }); + const res = await resp.json(); + if (res.success) getNext(qid + 1); }); - const res = await resp.json(); - if (res.success) { - method = "PUT"; - getNext(qid + 1); - // document.querySelector(`.answer-btn[data-value="${e.target.dataset.value}"]`).style.opacity = "0.5"; - // document.querySelector(`.answer-btn[data-value="${+!+e.target.dataset.value}"]`).style.opacity = "1"; // Let's not talk about it - } -}); +}
\ No newline at end of file @@ -141,15 +141,25 @@ CREATE TABLE IF NOT EXISTS question_questions ) ENGINE = InnoDB DEFAULT CHARSET = utf8; +CREATE TABLE IF NOT EXISTS question_options +( + id INTEGER PRIMARY KEY AUTO_INCREMENT, + answer_option VARCHAR(50), + question_id INTEGER NOT NULL, + CONSTRAINT `fk_question_question2` FOREIGN KEY (question_id) REFERENCES question_questions (id) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8; + CREATE TABLE IF NOT EXISTS question_answers ( id INTEGER PRIMARY KEY AUTO_INCREMENT, question_id INTEGER NOT NULL, user_id INTEGER NOT NULL, - answer BOOLEAN NULL, + option_id INTEGER NOT NULL, UNIQUE KEY uk_answer (question_id, user_id), CONSTRAINT `fk_question_user` FOREIGN KEY (user_id) REFERENCES users (id), - CONSTRAINT `fk_question_question` FOREIGN KEY (question_id) REFERENCES question_questions (id) + CONSTRAINT `fk_question_question` FOREIGN KEY (question_id) REFERENCES question_questions (id), + CONSTRAINT `fk_question_answer2` FOREIGN KEY (option_id) REFERENCES question_options (id) ) ENGINE = InnoDB - DEFAULT CHARSET = utf8; + DEFAULT CHARSET = utf8;
\ No newline at end of file |