diff options
| -rwxr-xr-x | cli.js | 23 | ||||
| -rw-r--r-- | zeitung/main.tex | 14 | ||||
| -rw-r--r-- | zeitung/parts/final.tex | 21 | ||||
| -rw-r--r-- | zeitung/parts/rankingtemplate.tex | 17 | ||||
| -rw-r--r-- | zeitung/parts/studentprofiles.tex | 5 | ||||
| -rw-r--r-- | zeitung/parts/teacherquotes.tex | 2 |
6 files changed, 48 insertions, 34 deletions
@@ -198,9 +198,8 @@ if ((idx = params.indexOf("-r")) > -1) { await fs.writeFile(__dirname + "/zeitung/parts/generated/stats/perc.tex", textex); // Ranking pranking banking yanking // Confusion ftw - don't ask :P - const rankingStart = - "\\ranking\n\\begin{tabularx}{\\textwidth}{*{3}{>{\\RaggedRight\\arraybackslash}X}}\n\n"; - const rankingEnd = "\\end{tabularx}\n"; + const rankingStart = "\\ranking\n\\begin{longtable}{R R R}\n\n"; + const rankingEnd = "\\end{longtable}\n"; const rankingtex = ["", "", "", "", "", ""]; data.ranking.forEach((q) => { const answers = [[], [], [], [], [], []]; @@ -217,14 +216,16 @@ if ((idx = params.indexOf("-r")) > -1) { const relevant = elem.slice(0, 3); const total_votes = relevant.reduce((a, b) => a + b.count, 0); let catted = ""; - relevant.forEach((e) => { + relevant.forEach((e, eind) => { let fitted = Math.ceil((e.count / total_votes) * 3); // 3 is max bottle count fitted = fitted == 0 ? 1 : fitted > 3 ? 3 : fitted; // Adjust float errors - catted += `\\rankinganswer{${e.name}}{${fitted}}\n`; + catted += `${e.name} @ \\rankingbottles{${fitted}}`; + if (eind < 2) catted += "BLABLAB\n"; + else catted += "\n\\vspace*{0.5cm}"; }); rankingtex[ ind - ] += `\\rankingquestion{${q.question}}\n\\begin{itemize}\n${catted}\\end{itemize}`; + ] += `\\rankingquestion{${q.question}}\n\\begin{tabular}{l l}\n${catted}\\end{tabular}`; // This is 10head const cntamp = rankingtex[ind].split("&").length - 1; @@ -237,11 +238,11 @@ if ((idx = params.indexOf("-r")) > -1) { await rankingtex.forEach(async (tex, ind) => { await fs.writeFile( __dirname + `/zeitung/parts/generated/ranking/${classes[ind]}.tex`, - rankingStart + tex + rankingEnd, + rankingStart + tex.replace(/@/g, "&").replace(/BLABLAB/g, "\\\\") + rankingEnd, ); }); - // Quotes boats coats floats goats oats // TODO: Fix teacher quotes + // Quotes boats coats floats goats oats textex = "\\def\\quoteclass{TGM13.1}\n\\quotepage"; let i = 0; for (const quote of data.quotes) { @@ -257,15 +258,17 @@ if ((idx = params.indexOf("-r")) > -1) { )}}\n`; i++; } + // Lol + await fs.writeFile(__dirname + `/zeitung/parts/generated/quotes/teacher.tex`, textex); // SECRET!! - textex = "\\begin{tabularx}{\\textwidth}{*{3}{>{\\RaggedRight\\arraybackslash}X}}\n\n"; + textex = "\\begin{longtable}{R R R}\n\n"; await data.secrets.forEach(async (secret, ind) => { textex += `{\\small ${secret.secret}}`; textex += ((ind + 1) % 3 == 0 ? "\\\\" : "&") + "\n"; if ((ind + 1) % 3 == 0) textex += "\\specialrule{.03em}{0em}{0em}\n"; }); - textex += "\\end{tabularx}\n"; + textex += "\\end{longtable}\n"; await fs.writeFile(__dirname + "/zeitung/parts/generated/secrets.tex", textex); // Final spinal vinyl diff --git a/zeitung/main.tex b/zeitung/main.tex index d2b5881..6ba62e7 100644 --- a/zeitung/main.tex +++ b/zeitung/main.tex @@ -13,6 +13,7 @@ \usepackage{fancyhdr} \usepackage{background,wallpaper} \usepackage{changepage} +\usepackage{longtable} \usepackage{tabularx} \usepackage{pgf-pie,qrcode} \usepackage{etoolbox} @@ -58,6 +59,9 @@ \backgroundsetup{contents={\oddflip[keepaspectratio=true, width=\paperwidth]{kordel.png}},scale=1.1,placement=top,opacity=1,position={0.4\textwidth, 3.3cm}} } +% Awesome column type +\newcolumntype{R}{>{\raggedright\arraybackslash}p{.30\textwidth}} + % Advertisements \newcommand\advert[1]{ \newpage @@ -75,6 +79,14 @@ \enableheader } +\newcommand\adverthalfnorot[1]{ + \newpage + \disableheader + \thispagestyle{empty} + \includepdf[noautoscale=true,width=\paperwidth]{parts/advertisements/#1.pdf} + \enableheader +} + % Class page \newcommand\classoverview[1]{ \newpage @@ -148,6 +160,7 @@ \part{classphoto} \part{questionnaire} \part{teacherprofiles} +\part{teacherquotes} \part{teacherranking} \part{secrets} \advert{ihk} @@ -155,6 +168,7 @@ \advert{uni-ulm} \part{photos} \part{trips} +\adverthalfnorot{b-group} \part{courseoverview} \part{committeeoverview} \part{conclusion} diff --git a/zeitung/parts/final.tex b/zeitung/parts/final.tex index 305f8f1..de718c7 100644 --- a/zeitung/parts/final.tex +++ b/zeitung/parts/final.tex @@ -1,9 +1,10 @@ \disableheader \thispagestyle{empty} -\ThisULCornerWallPaper{1.2}{vorderseitebg} +%\ThisULCornerWallPaper{1.2}{vorderseitebg} -\definecolor{textcolor}{rgb}{0.117, 0.176, 0.219} -\color{textcolor} +\definecolor{backcolor}{RGB}{41, 49, 51} +\pagecolor{backcolor} +\color{white} \bfseries \hspace{0pt} @@ -12,15 +13,15 @@ \begin{center} -{\cartamarina{\Huge Abitur 2021}} -\vspace*{1cm} + {\cartamarina{\Huge Abitur 2021}} + \vspace*{1cm} -\generated{final} + \generated{final} -\vspace*{1cm} -{\cartamarina{\Huge Robert-Bosch-Schule Ulm}} + \vspace*{1cm} + {\cartamarina{\Huge Robert-Bosch-Schule Ulm}} -\vfill -\hspace{0pt} + \vfill + \hspace{0pt} \end{center} diff --git a/zeitung/parts/rankingtemplate.tex b/zeitung/parts/rankingtemplate.tex index 0bfb9fb..b0a397c 100644 --- a/zeitung/parts/rankingtemplate.tex +++ b/zeitung/parts/rankingtemplate.tex @@ -1,13 +1,12 @@ \providecommand\rankingquestion[1]{ - \noindent\textbf{#1} + \textbf{#1} } -\providecommand\rankinganswer[2]{ - \item[] #1 - \setcounter{bottlecnt}{0} - \setcounter{bottlemax}{#2} - \stepcounter{bottlemax} % There is no <= in forloop - \forloop{bottlecnt}{1}{\value{bottlecnt} < \value{bottlemax}}{ - \includegraphics[scale=.027]{flasche.png} - } +\providecommand\rankingbottles[1]{ + \setcounter{bottlecnt}{0} + \setcounter{bottlemax}{#1} + \stepcounter{bottlemax} % There is no <= in forloop + \forloop{bottlecnt}{1}{\value{bottlecnt} < \value{bottlemax}}{ + \includegraphics[scale=.027]{flasche.png} + } } diff --git a/zeitung/parts/studentprofiles.tex b/zeitung/parts/studentprofiles.tex index 37d867a..4b9cfec 100644 --- a/zeitung/parts/studentprofiles.tex +++ b/zeitung/parts/studentprofiles.tex @@ -1,9 +1,4 @@ -\title{Schülersteckbriefe} -\kant[1-3] -\newpage - \providecommand\studentprofile[1]{ - \title{Übersicht - #1} \classoverview{#1} \inputall{parts/generated/students/#1} diff --git a/zeitung/parts/teacherquotes.tex b/zeitung/parts/teacherquotes.tex new file mode 100644 index 0000000..2c54923 --- /dev/null +++ b/zeitung/parts/teacherquotes.tex @@ -0,0 +1,2 @@ +\title{Lehrersteckbriefe} +\generated{quotes/teacher} |