2 files changed, 27 insertions, 7 deletions
diff --git a/cli.js b/cli.js
index e8afc3a..be988e9 100755
--- a/cli.js
+++ b/cli.js
@@ -64,14 +64,31 @@ if ((idx = params.indexOf("-r")) > -1) {
             break;
     }
 } else if ((idx = params.indexOf("-d")) > -1) {
-    // TODO: More dumping
+    // TODO: Erkennungsmerkmale, Wohnort??
+    // WARNING: UGLY!
+
+    let hay;
+    const answer = (needle) => {
+        const e = hay.find((e) => e.question === needle);
+        if (e && e.answer && e.answer.length > 1) return e.answer;
+        else return "nichts";
+    };
+
     db.dump().then((data) => {
         data.users.forEach((user) => {
-            const textex = `\\student\n\\studentimages{${user.id}}\n\\studentprofile{${user.name} ${
-                user.middlename || ""
-            } ${
-                user.surname
-            }}{18.12.2002}{Mathematik}{Wirtschaft}{Schlafen}{Canadian Pop}{Herr Schwarz}{Gehirn}{Cogito ergo sum}\n\\studenttable{Meistens wunderhübsch}{Essen}\n\\studentcomments{}`;
+            hay = data.profile.filter((e) => e.user_id === user.id);
+            const name = `${user.name} ${user.middlename || ""} ${user.surname}`;
+            const birthday = answer("Geburtsdatum");
+            const favsub = answer("Lieblingsfach");
+            const hatesub = answer("Hassfach");
+            const hobbies = answer("Hobbies");
+            const music = answer("Lieblingsbands/-musiker/-genre");
+            const missing = answer("Am meisten werde ich vermissen");
+            const motivation = answer("Ohne das hätte ich die Oberstufe nicht geschafft");
+            const quote = answer("Lebensmotto/Seniorquote");
+            const future = answer("Zukunftspläne");
+            let textex = `\\student\\studentimages{${user.id}}\\studentprofile{${name}}{${birthday}}{${favsub}}{${hatesub}}{${hobbies}}{${music}}{${missing}}{${motivation}}{${quote}}\\studenttable{TODO?}{${future}}\\studentcomments{}`;
+            textex = textex.replace(/(\r\n|\n|\r)/gm, "").replace(/&/g, "\\&");
             fs.writeFile(
                 __dirname + "/zeitung/parts/students/" + user.class + "/" + user.username + ".tex",
                 textex,
diff --git a/db.js b/db.js
index ca73c13..cc99f92 100644
--- a/db.js
+++ b/db.js
@@ -237,7 +237,10 @@ class DB {
         const users = await this.query(
             "SELECT u.id, u.username, u.name, u.middlename, u.surname, c.name class, t.name type FROM users u INNER JOIN class c ON u.class_id = c.id INNER JOIN types t ON u.type_id = t.id WHERE t.name = 'pupil'",
         );
-        return { users };
+        const profile = await this.query(
+            "SELECT q.question, a.answer, a.user_id FROM profile_questions q INNER JOIN profile_answers a ON a.question_id = q.id",
+        );
+        return { users, profile };
     }
 
     async query(query, params) {