diff --git a/css/ese-logo.png b/css/ese-logo.png index c014a3c..5751bbc 100755 Binary files a/css/ese-logo.png and b/css/ese-logo.png differ diff --git a/css/print.css b/css/print.css index ab50135..5cdeff5 100755 --- a/css/print.css +++ b/css/print.css @@ -6,33 +6,34 @@ body { } .container { - width:20cm; + width: 20cm; margin: 0mm; padding: 0mm; } .ticket { - height: 4cm; + height: 4.9cm; /* border: 1px dotted #ccc;*/ float: left; padding: 3mm; margin-left: 3mm; - min-width: 5.6cm; + min-width: 8.9cm; /*page-break-inside: avoid;*/ } .tickettext { /*float: left;*/ + margin-top: 7mm; } .ticketimg { float: right; - margin: -1mm 0 0 0; + margin: 1mm 0 0 0; padding: 0px; } .ticketimg img { - height: 2cm; + height: 2.7cm; margin: 0px; padding: 0px; } @@ -56,7 +57,7 @@ img.tutorticketimg { } .room, .time { - font-size: 10pt; + font-size: 12pt; width: 60%; text-align: left; } diff --git a/patronGen.php b/patronGen.php index 8b8001e..f05ce4e 100755 --- a/patronGen.php +++ b/patronGen.php @@ -20,7 +20,7 @@ if (isset($_GET["keyFile"])) $keyFile = $_GET["keyFile"]; // holds the key data, generated from the key file - $keyData = ReadKeyFile($keyFile); + // $keyData = ReadKeyFile($keyFile); // the group names and rooms for Monday and their start times for Tuesday, removes "Nicht am Tutorium teilgenommen" $patrons = ReadPatronsFile(PATRONS); array_splice($patrons, 0, 1); @@ -36,9 +36,28 @@
+
+
+
+
+
Tutorium in
+
+ ".$patrons[$patron_name][2]." Uhr"; + ?> +
+
+
+
@@ -49,7 +68,7 @@ for ($i = 0; $i < count($keyData); $i++)
".$patrons[$patron_name][2]." Uhr"; + echo " "; ?>
diff --git a/questionnaires/patrons.txt b/questionnaires/patrons.txt index 903c735..e67f48d 100755 --- a/questionnaires/patrons.txt +++ b/questionnaires/patrons.txt @@ -4,18 +4,18 @@ Nicht am Tutorium teilgenommen;; Edsger W. Dijkstra; APB/E005; 09:00 Kurt Gödel; APB/E006; 09:10 Konrad Zuse; APB/E007; 09:20 -Tim Berners-Lee; APB/E008; 09:30 -John von Neumann; APB/E009; 09:40 -Dennis Ritchie; APB/E010; 09:50 +Tim Berners-Lee; APB/E009; 09:30 +John von Neumann; APB/E010; 09:40 +Dennis M. Ritchie; WIL/C205; 09:50 Alan Turing; WIL/C206; 10:00 -Ada Lovelace; WIL/C106; 10:10 -Grace Hopper; WIL/C104; 10:20 -Richard M. Stallman; WIL/C103; 10:30 -Linus Torvalds; WIL/C102; 10:40 -Noam Chomsky; WIL/C105; 10:50 -Christiane Floyd; WIL/C205; 11:00 -Stephen A. Cook; WIL/C204; 11:10 -Ken Thompson; GER/A185; 11:20 -Donald Ervin Knuth; GER/A252; 11:30 -Master Inf/MInf; APB/E023; -Master Inf/MInf; APB/E023; +Ada Lovelace; WIL/C203; 10:10 +Grace Hopper; WIL/A221; 10:20 +Richard M. Stallman; WIL/C107; 10:30 +Linus Torvalds; WIL/B321; 10:40 +Noam Chomsky; WIL/A317; 10:50 +Christiane Floyd; REC/C118; 11:00 +Stephen A. Cook; REC/D16; 11:10 +Ken Thompson; REC/B214; 11:20 +Donald Ervin Knuth; REC/C213; 11:30 +Master Inf/MInf; APB/E023; +Master Inf/MInf; APB/E023;