3
0
Fork 0
mirror of https://github.com/fsr/eseeva synced 2024-11-15 00:43:12 +01:00

Merge branch 'db-en'

This commit is contained in:
Lucas Woltmann 2017-09-30 11:09:56 +02:00
commit 45f027dfc3
4 changed files with 44 additions and 24 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View file

@ -12,27 +12,28 @@ body {
}
.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;
}

View file

@ -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 @@
<body>
<div class="container">
<?php
for ($i = 0; $i < count($keyData); $i++)
for ($i = 0; $i < 400; $i++)
{
$pno = $i%(count(array_keys($patrons)));
$pno = $i%(count(array_keys($patrons)) - 1);
$patron_name = array_keys($patrons)[$pno];
?>
<div class="ticket">
<div class="patron"><?php echo $patron_name; ?></div>
<div class="tickettext">
<div class="ticketimg"><img src="css/ese-logo.png"/></div>
<div class="room">Tutorium in <br><strong><?php echo $patrons[$patron_name][1]; ?></strong></div>
<div class="time">
<?php
echo "Einschreibestart Mittwoch <br><strong>".$patrons[$patron_name][2]." Uhr</strong>";
?>
</div>
</div>
</div>
<?php
}
for ($i = 0; $i < 50; $i++)
{
$pno = 16;//$i%(count(array_keys($patrons)));
$patron_name = array_keys($patrons)[$pno];
?>
<div class="ticket">
@ -49,7 +68,7 @@ for ($i = 0; $i < count($keyData); $i++)
<div class="time">
<?php
// don't display start date if there is none (Master case)
echo ($patrons[$patron_name][2]=="") ? "&nbsp;" : "Einschreibestart Dienstag <strong>".$patrons[$patron_name][2]." Uhr</strong>";
echo "&nbsp;";
?>
</div>
</div>

View file

@ -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
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;