k

6 files changed, 8 insertions, 12 deletions

diff --git a/cli.js b/cli.js
index 7ad1d1d..f040931 100755
--- a/cli.js
+++ b/cli.js
@@ -115,7 +115,8 @@ if ((idx = params.indexOf("-r")) > -1) {
                 future: answer("Zukunftspläne"),
             };
 
-            obj.birthday = new Date(obj.birthday == "nichts" ? "unbekannt" : obj.birthday).toLocaleDateString("de");
+            obj.birthday = new Date(obj.birthday).toLocaleDateString("de");
+            if (obj.birthday == "Invalid Date") obj.birthday = "unbekannt";
 
             // QR-Code
             obj.qrcode = sanitizeQR(answer("QR-Code Text (z.B. Social Media Links, random Text, whatever)"));
diff --git a/zeitung/main.tex b/zeitung/main.tex
index 487f321..a20717d 100644
--- a/zeitung/main.tex
+++ b/zeitung/main.tex
@@ -92,7 +92,7 @@
 	\newpage
 	\disableheader
 	\thispagestyle{empty}
-	\includepdf[noautoscale=true,width=\paperwidth]{parts/overview/#1.pdf}
+	\includepdf[pages=-,noautoscale=true,width=\paperwidth]{parts/overview/#1.pdf}
 	\enableheader
 }
 
@@ -154,12 +154,11 @@
 \disableheader
 \part{titlepage}
 \enableheader
-\advert{asb}
 \part{tableofcontents}
 \part{introduction}
-\adverthalf{gardena}
-\part{classphoto}
+\adverthalfnorot{gardena}
 \part{questionnaire}
+\advert{asb}
 \part{teacherprofiles}
 \part{teacherquotes}
 \part{teacherranking}
@@ -167,10 +166,9 @@
 \advert{ihk}
 \part{studentprofiles}
 \advert{uni-ulm}
-\part{photos}
 \part{trips}
-\adverthalfnorot{b-group}
 \part{conclusion}
+\adverthalfnorot{b-group}
 \part{imprint}
 \part{final}
 
diff --git a/zeitung/parts/classphoto.tex b/zeitung/parts/classphoto.tex
deleted file mode 100644
index 991ac37..0000000
--- a/zeitung/parts/classphoto.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-\title{Stufenfoto}
-\lipsum[1-2]
diff --git a/zeitung/parts/introduction.tex b/zeitung/parts/introduction.tex
index 100ed48..67827ae 100644
--- a/zeitung/parts/introduction.tex
+++ b/zeitung/parts/introduction.tex
@@ -1,2 +1,2 @@
 \title{Vorwort}
-Heeerzlich willkommen!
+Heeerzlich willkommen! Hier könnte ein Vorwort stehen.
diff --git a/zeitung/parts/photos.tex b/zeitung/parts/photos.tex
deleted file mode 100644
index fd546bf..0000000
--- a/zeitung/parts/photos.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-\title{Fotos}
-\lipsum[1-2]
diff --git a/zeitung/parts/studentprofiles.tex b/zeitung/parts/studentprofiles.tex
index b1dc194..2b4cb06 100644
--- a/zeitung/parts/studentprofiles.tex
+++ b/zeitung/parts/studentprofiles.tex
@@ -1,5 +1,6 @@
 \providecommand\studentprofile[1]{
 	\newpage
+	\title{#1}
 	\classoverview{#1}
 
 	\inputall{parts/generated/students/#1}