diff options
18 files changed, 99 insertions, 57 deletions
@@ -83,6 +83,7 @@ if ((idx = params.indexOf("-r")) > -1) { else return "nichts"; }; + // Be aware, I'm a longtime rhyme primer db.dump().then((data) => { data.users.forEach(async (user) => { hay = data.profile.filter((e) => e.user_id === user.id); @@ -112,7 +113,7 @@ if ((idx = params.indexOf("-r")) > -1) { textex += "\\student\n\n"; - // Characteristics + // Characteristics olympics kinetics acoustics if (chars && chars.length > 0) { chars.forEach((char, ind) => { textex += `\\studentchar{${sanitize(char.txt)}`; @@ -123,7 +124,7 @@ if ((idx = params.indexOf("-r")) > -1) { textex += "\\divider"; - // Ugly inline comments + // Comments contents intents indents events if (comments && comments.length > 0) { textex += "\n\n\\renewcommand{\\arraystretch}{1.5}\\hspace*{\\commentsx}\\begin{tabularx}{\\commentswidth}{*{2}{>{\\RaggedRight\\arraybackslash}X}}"; @@ -136,11 +137,11 @@ if ((idx = params.indexOf("-r")) > -1) { } await fs.writeFile( - __dirname + "/zeitung/parts/students/" + user.class + "/" + user.username + ".tex", + __dirname + "/zeitung/parts/generated/students/" + user.class + "/" + user.username + ".tex", textex, ); - // Fat stats hats mad lads + // Stats chats hats cats rats textex = ""; const questions = [...new Set(data.questions.map((a) => a[0].id))]; const statrad = 2.5; @@ -166,7 +167,25 @@ if ((idx = params.indexOf("-r")) > -1) { } }); - await fs.writeFile(__dirname + "/zeitung/parts/stats/perc.tex", textex); + await fs.writeFile(__dirname + "/zeitung/parts/generated/stats/perc.tex", textex); + + // Teacher ranking pranking banking yanking + textex = "\\ranking\n"; + const teacher_ranking = data.ranking.filter((e) => e.type === "teacher"); + teacher_ranking.forEach((e) => { + textex += `\\rankingquestion{${e.question}}\n`; + textex += "\\rankinganswersstart\n"; + const a = e.answers; + for (let i = 0; i < 3; i++) { + textex += `\\rankinganswer{${a[i].name} ${a[i].surname}}{${a[i].count}}\n`; + } + textex += "\\rankinganswersstop\n"; + }); + + await fs.writeFile(__dirname + "/zeitung/parts/generated/ranking/teacher.tex", textex); + + // Quotes boats coats floats goats oats + textex = ""; }); }); console.log("Probably finished?"); @@ -234,14 +234,17 @@ class DB { } async dump() { + // Users 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'", ); + // Profile 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", ); + // Questions (percentage) const rawQuestions = await this.query( "SELECT q.id, q.question question, o.answer_option option, COUNT(a.user_id) count FROM question_questions q INNER JOIN question_options o ON q.id = o.question_id INNER JOIN question_answers a ON o.id = a.option_id GROUP BY o.id", ); @@ -251,13 +254,23 @@ class DB { questions[e.id - 1].push(e); }); + // Ranking + const ranking = await this.query( + "SELECT q.id, question, t.name type FROM ranking_questions q INNER JOIN types t ON type_id = t.id ORDER BY q.id", + ); + const answers = await this.query( + "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", + ); + ranking.forEach((question) => (question.answers = [])); + answers.forEach((answer) => ranking.filter((q) => q.id === answer.question_id)[0].answers.push(answer)); + + // Comments and characteristics for (const user of users) { user.comments = await this.query("SELECT comment from profile_comments where profile_id=" + user.id); user.chars = await this.query("SELECT txt from profile_char where profile_id=" + user.id); - //user["comments"].forEach((comment) => console.log("Kommentar: " + comment.comment)); } - return { users, profile, questions }; + return { users, profile, questions, ranking }; } async query(query, params) { diff --git a/zeitung/.gitignore b/zeitung/.gitignore index 27514f8..63b68fb 100644 --- a/zeitung/.gitignore +++ b/zeitung/.gitignore @@ -1,7 +1,6 @@ build/ *.log svg-inkscape/ -parts/students/*/*.tex -parts/students/figures/ -parts/test/ +parts/generated/**/*.tex +parts/generated/students/figures/ *.otf diff --git a/zeitung/main.tex b/zeitung/main.tex index 20c9af9..8aa38c9 100644 --- a/zeitung/main.tex +++ b/zeitung/main.tex @@ -1,13 +1,12 @@ \documentclass[a4paper, 13pt]{article} % Packages -\usepackage[a4paper, inner=2.5cm, outer=2.5cm, top=2.5cm, bottom=2.5cm, bindingoffset=0cm]{geometry} +\usepackage[a4paper, inner=1.5cm, outer=1.5cm, top=1.5cm, bottom=3cm, bindingoffset=0cm]{geometry} \usepackage{amsmath,amsthm,amssymb,amsfonts} \usepackage{graphicx} \usepackage[colorlinks=true, allcolors=blue]{hyperref} \usepackage{fontspec,xunicode,xltxtra} \usepackage{afterpage} -\usepackage{sectsty} \usepackage{float} \usepackage{kantlipsum,lipsum} \usepackage{eso-pic} @@ -20,7 +19,6 @@ % Font \setmainfont{"[tierra-nueva.otf]"}[BoldFont="[tierra-nueva-bold.otf]"] -\sectionfont{\fontsize{20}{15}\selectfont} % GERMAN \usepackage[ngerman=ngerman-x-latest]{hyphsubst} @@ -47,12 +45,12 @@ \setlength{\headheight}{60pt} \addtolength{\topmargin}{-35pt} \pagestyle{fancy} -\fancyheadoffset{2.5cm} -\fancyfootoffset{2.5cm} +\fancyheadoffset{1.5cm} +\fancyfootoffset{1.5cm} \fancyhf{} -\fancyhead[L]{\hspace*{1cm}\vspace*{0.7cm}\Huge{\rightmark}} -\fancyfoot[R]{\vspace*{-15pt}\oddflip[keepaspectratio=true, width=\paperwidth]{welle.png}} -\fancyfoot[L]{\checkoddpage\vspace*{-1.3cm}\hspace*{\ifoddpage 3cm \else 17.5cm \fi}\Huge{\thepage}} +\fancyhead[L]{\hspace*{1cm}\vspace*{-0.3cm}\Huge{\rightmark}} +\fancyfoot[R]{\vspace*{0cm}\oddflip[keepaspectratio=true, width=\paperwidth]{welle.png}} +\fancyfoot[L]{\checkoddpage\vspace*{-0.7cm}\hspace*{\ifoddpage 3cm \else 17.5cm \fi}\Huge{\thepage}} % Custom title command for header \renewcommand{\sectionmark}[1]{\markright{#1}} @@ -62,6 +60,9 @@ \addcontentsline{toc}{section}{\protect\numberline{\thesection}#1} } +% I don't like paragraph indentation +\setlength{\parindent}{0pt} + \begin{document} \title{ABI Zeitung 2021} @@ -77,13 +78,14 @@ \def\part#1{\input{parts/#1.tex}\newpage} \def\student{\input{parts/studenttemplate.tex}} -\def\stat#1{\input{parts/stats/#1.tex}} +\def\ranking{\input{parts/rankingtemplate.tex}} +\def\generated#1{\input{parts/generated/#1.tex}} %\maketitle \backgroundsetup{contents={}} \part{titlepage} -\backgroundsetup{contents={\oddflip[keepaspectratio=true, width=\paperwidth]{kordel.png}},scale=1.1,placement=top,opacity=1,position={0.5\textwidth, 3.3cm}} +\backgroundsetup{contents={\oddflip[keepaspectratio=true, width=\paperwidth]{kordel.png}},scale=1.1,placement=top,opacity=1,position={0.4\textwidth, 3.3cm}} \part{tableofcontents} \part{introduction} \part{classphoto} @@ -92,7 +94,7 @@ \part{teacherranking} \part{secrets} \part{classoverview} -%\part{studentprofiles} +\part{studentprofiles} \part{studentranking} \part{citations} \part{photos} diff --git a/zeitung/parts/stats/.gitkeep b/zeitung/parts/generated/ranking/.gitkeep index e69de29..e69de29 100644 --- a/zeitung/parts/stats/.gitkeep +++ b/zeitung/parts/generated/ranking/.gitkeep diff --git a/zeitung/parts/students/TGI13.1/.gitkeep b/zeitung/parts/generated/stats/.gitkeep index e69de29..e69de29 100644 --- a/zeitung/parts/students/TGI13.1/.gitkeep +++ b/zeitung/parts/generated/stats/.gitkeep diff --git a/zeitung/parts/students/TGI13.2/.gitkeep b/zeitung/parts/generated/students/TGI13.1/.gitkeep index e69de29..e69de29 100644 --- a/zeitung/parts/students/TGI13.2/.gitkeep +++ b/zeitung/parts/generated/students/TGI13.1/.gitkeep diff --git a/zeitung/parts/students/TGM13.1/.gitkeep b/zeitung/parts/generated/students/TGI13.2/.gitkeep index e69de29..e69de29 100644 --- a/zeitung/parts/students/TGM13.1/.gitkeep +++ b/zeitung/parts/generated/students/TGI13.2/.gitkeep diff --git a/zeitung/parts/students/TGM13.2/.gitkeep b/zeitung/parts/generated/students/TGM13.1/.gitkeep index e69de29..e69de29 100644 --- a/zeitung/parts/students/TGM13.2/.gitkeep +++ b/zeitung/parts/generated/students/TGM13.1/.gitkeep diff --git a/zeitung/parts/students/TGTM13.1/.gitkeep b/zeitung/parts/generated/students/TGM13.2/.gitkeep index e69de29..e69de29 100644 --- a/zeitung/parts/students/TGTM13.1/.gitkeep +++ b/zeitung/parts/generated/students/TGM13.2/.gitkeep diff --git a/zeitung/parts/generated/students/TGTM13.1/.gitkeep b/zeitung/parts/generated/students/TGTM13.1/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/zeitung/parts/generated/students/TGTM13.1/.gitkeep diff --git a/zeitung/parts/imprint.tex b/zeitung/parts/imprint.tex index cee13b1..4b9bb3d 100644 --- a/zeitung/parts/imprint.tex +++ b/zeitung/parts/imprint.tex @@ -3,13 +3,16 @@ % TODO: Druckerei, Auflage, Verfasser (PFLICHT) % Alle Rechte vorbehalten -\begin{tabular}{ l l } - \textbf{V.i.S.d.P} & RBS TG13 \\ % Verantwortlich im Sinne des Presserechts - \textbf{\LaTeX} & Marvin Borner, Lars Krönner \\ - \textbf{Web-Plattform} & Lars Krönner, Marvin Borner \\ - \textbf{Web-Hosting} & Marvin Borner \\ - \textbf{Design} & Leia Saumweber, Tomislav Strazanac \\ - \textbf{Finanzierung \& Werbung} & Lars Mayer \\ - \textbf{Planung \& Organisation} & Mathias Schmiegel, Sebastian Sutor \\ - \textbf{Open-Source Code} & \url{https://github.com/marvinborner/abitur2021} -\end{tabular} +\textbf{Hinweis:} Der Inhalt dieser Abizeitung wurde komplett dynamisch mittels \LaTeX und JavaScript generiert. Der Source-Code dazu kann hier gefunden werden: \url{https://github.com/marvinborner/abitur2021} +\newline +\begin{table}[b] + \begin{tabular}{ l l } + \textbf{V.i.S.d.P} & RBS TG13 \\ % Verantwortlich im Sinne des Presserechts + \textbf{\LaTeX} & Marvin Borner, Lars Krönner \\ + \textbf{Web-Plattform} & Lars Krönner, Marvin Borner \\ + \textbf{Web-Hosting} & Marvin Borner \\ + \textbf{Design} & Leia Saumweber, Tomislav Strazanac \\ + \textbf{Finanzierung \& Werbung} & Lars Mayer \\ + \textbf{Planung \& Organisation} & Mathias Schmiegel, Sebastian Sutor \\ + \end{tabular} +\end{table} diff --git a/zeitung/parts/questionnaire.tex b/zeitung/parts/questionnaire.tex index 1c75b4c..ac5a889 100644 --- a/zeitung/parts/questionnaire.tex +++ b/zeitung/parts/questionnaire.tex @@ -1,7 +1,7 @@ \title{Prozent-Fragen} \begin{center} -\hspace{-1.5cm}\begin{tikzpicture} - \stat{perc} -\end{tikzpicture} + \hspace{-1.5cm}\begin{tikzpicture} + \generated{stats/perc} + \end{tikzpicture} \end{center} diff --git a/zeitung/parts/rankingtemplate.tex b/zeitung/parts/rankingtemplate.tex new file mode 100644 index 0000000..e223dd0 --- /dev/null +++ b/zeitung/parts/rankingtemplate.tex @@ -0,0 +1,13 @@ +\providecommand\rankingquestion[1]{ + \textbf{#1}\\ +} + +\providecommand\rankinganswer[2]{ + \textbf{#1}: #2\\ +} + +\providecommand\rankinganswersstart{ +} + +\providecommand\rankinganswersstop{ +} diff --git a/zeitung/parts/stats/perc.tex b/zeitung/parts/stats/perc.tex deleted file mode 100644 index 8042777..0000000 --- a/zeitung/parts/stats/perc.tex +++ /dev/null @@ -1,8 +0,0 @@ -\node at (0, 2.75) {Bist du Single/Vergeben?};\pie[hide number, scale font, sum=auto, text=inside, pos={0,0}, radius=2.5]{41/Single, 13/Vergeben} -\node at (8, 2.75) {Wie kommst du hauptsächlich zur Schule?};\pie[hide number, scale font, sum=auto, text=inside, pos={8,0}, radius=2.5]{21/Bus, 21/Auto, 7/Bahn, 3/Fahrrad, 2/Fuß} -\node at (0, 8.75) {Hast du schon einmal blau gemacht?};\pie[hide number, scale font, sum=auto, text=inside, pos={0,6}, radius=2.5]{35/Ja, 19/Nein} -\node at (8, 8.75) {Was machst du nach der Schule?};\pie[hide number, scale font, sum=auto, text=inside, pos={8,6}, radius=2.5]{28/Studium, 10/Ausbildung, 7/Keine Ahnung, 4/Arbeit, 4/Pause, 1/Work \& Travel} -\node at (0, 14.75) {Hast du Geschwister?};\pie[hide number, scale font, sum=auto, text=inside, pos={0,12}, radius=2.5]{53/Ja, 1/Nein} -\node at (8, 14.75) {Rauchst du?};\pie[hide number, scale font, sum=auto, text=inside, pos={8,12}, radius=2.5]{40/Nein, 7/Ja, 7/Auf Partys} -\node at (0, 20.75) {Hast du bewusstseinserweiternde Substanzen zu dir genommen?};\pie[hide number, scale font, sum=auto, text=inside, pos={0,18}, radius=2.5]{33/Nein, 21/Ja} -\node at (8, 20.75) {Bist du noch Jungfrau (nicht Sternzeichen)?};\pie[hide number, scale font, sum=auto, text=inside, pos={8,18}, radius=2.5]{29/Nein, 21/Ja} diff --git a/zeitung/parts/studentprofiles.tex b/zeitung/parts/studentprofiles.tex index 67d69d0..05da565 100644 --- a/zeitung/parts/studentprofiles.tex +++ b/zeitung/parts/studentprofiles.tex @@ -2,8 +2,8 @@ \kant[1-3] \newpage -\inputall{parts/students/TGI13.1} -\inputall{parts/students/TGI13.2} -\inputall{parts/students/TGM13.1} -\inputall{parts/students/TGM13.2} -\inputall{parts/students/TGTM13.1} +\inputall{parts/generated/students/TGI13.1} +%\inputall{parts/generated/students/TGI13.2} +%\inputall{parts/generated/students/TGM13.1} +%\inputall{parts/generated/students/TGM13.2} +%\inputall{parts/generated/students/TGTM13.1} diff --git a/zeitung/parts/studenttemplate.tex b/zeitung/parts/studenttemplate.tex index 057a85f..d02c7b3 100644 --- a/zeitung/parts/studenttemplate.tex +++ b/zeitung/parts/studenttemplate.tex @@ -17,18 +17,18 @@ } % Ring -\def\ringx{50pt} +\def\ringx{20pt} \def\ringy{250pt} \def\ringwidth{250pt} \def\ringimgwidth{180pt} \def\ringoffset{(\ringwidth - \ringimgwidth) / 2} \ifoddpage\else - \def\ringx{-\paperwidth - 350pt} % ringwidth + 2 * ringx + \def\ringx{-\paperwidth - 325pt} % ringwidth + 2 * ringx % Nope, idk anymore \fi \AddToShipoutPictureBG*{ \AtTextUpperLeft{ \put(-\ringx + \ringoffset, -\ringy + \ringoffset){ - \dfincludegraphics[keepaspectratio=true, width=\ringimgwidth]{parts/students/figures/bornerma.jpg} + \dfincludegraphics[keepaspectratio=true, width=\ringimgwidth]{parts/generated/students/figures/bornerma.jpg} } \put(-\ringx, -\ringy){ \oddflip[keepaspectratio=true, width=\ringwidth]{ring.png} @@ -37,18 +37,18 @@ } % Frame -\def\framex{130pt} +\def\framex{160pt} \def\framey{20pt} \def\framewidth{180pt} \def\frameimgwidth{160pt} \def\frameoffset{(\framewidth - \frameimgwidth) / 2} \ifoddpage\else - \def\framex{518pt} % paperwidth - framewidth / 2 + \def\framex{540pt} % paperwidth - framewidth / 2 % Nope, idk anymore \fi \AddToShipoutPictureBG*{ \AtTextLowerLeft{ \put(\textwidth - \framex + \frameoffset, \framey + \frameoffset + 8pt){ - \dfincludegraphics[keepaspectratio=true, width=\frameimgwidth]{parts/students/figures/child_\stdid.jpg} + \dfincludegraphics[keepaspectratio=true, width=\frameimgwidth]{parts/generated/students/figures/child_\stdid.jpg} } \put(\textwidth - \framex, \framey){ \oddflip[keepaspectratio=true, width=\framewidth]{rahmen.png} @@ -60,7 +60,7 @@ \ifoddpage \def\tablex{0.5\linewidth} \else - \def\tablex{-1cm} + \def\tablex{-0cm} \fi \def\tablewidth{0.6\linewidth} @@ -88,14 +88,14 @@ % Divider \providecommand\divider{ \begin{figure}[H] - \hspace*{-2.5cm}\includegraphics[keepaspectratio=true, width=\paperwidth]{mittelwelle.png} + \hspace*{-1.5cm}\includegraphics[keepaspectratio=true, width=\paperwidth]{mittelwelle.png} \end{figure} } % Comments \def\commentswidth{0.7\linewidth} \ifoddpage - \def\commentsx{-1cm} + \def\commentsx{-0cm} \else \def\commentsx{\framewidth} \fi diff --git a/zeitung/parts/teacherranking.tex b/zeitung/parts/teacherranking.tex index 67b66a3..3c44a3e 100644 --- a/zeitung/parts/teacherranking.tex +++ b/zeitung/parts/teacherranking.tex @@ -1,2 +1,3 @@ \title{Lehrerranking} -\lipsum[1-2] + +\generated{ranking/teacher} |