From 4f4b6b147befb7e7159c6088f1463fdb6c34975b Mon Sep 17 00:00:00 2001
From: Tim Repke <repketim@informatik.hu-berlin.de>
Date: Tue, 23 Sep 2014 00:05:33 +0100
Subject: [PATCH] barely changed anything in overview
---
registration-system/admin/index.php | 1 +
registration-system/admin/pages_overview.php | 13 +++----------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/registration-system/admin/index.php b/registration-system/admin/index.php
index 876221c..a0d5630 100644
--- a/registration-system/admin/index.php
+++ b/registration-system/admin/index.php
@@ -5,6 +5,7 @@
* Date: 8/8/14
* Time: 4:19 PM
*/
+error_reporting(E_ALL || E_STRICT);
session_start();
diff --git a/registration-system/admin/pages_overview.php b/registration-system/admin/pages_overview.php
index 88f7fb3..1176fac 100644
--- a/registration-system/admin/pages_overview.php
+++ b/registration-system/admin/pages_overview.php
@@ -19,15 +19,8 @@ $mitfahrer['gesaa'] = $admin_db->count("bachelor", ["fahrt_id" => $config_cur
$antag = $admin_db->query("SELECT date_format(von, '%j') as von FROM fahrten WHERE fahrt_id=$config_current_fahrt_id")->fetchAll()[0]['von'];
$abtag = $admin_db->query("SELECT date_format(bis, '%j') as von FROM fahrten WHERE fahrt_id=$config_current_fahrt_id")->fetchAll()[0]['bis'];
-$tmp = $admin_db->query("SELECT date_format(antag, '%j') as antag, SELECT date_format(abtag, '%j') as abtag FROM bachelor WHERE fahrt_id=$config_current_fahrt_id")->fetchAll()[0]['bis'];
-$mitfahrer['erste'] = $admin_db->count("bachelor", ["AND"=>
- ["backstepped" => NULL,
- "fahrt_id" => $config_current_fahrt_id,
- "anday" => $antag]]);
-$mitfahrer['zweit'] = $admin_db->count("bachelor", ["AND"=>
- ["backstepped" => NULL,
- "fahrt_id" => $config_current_fahrt_id,
- "abday" => $abtag]]);
+$mitfahrer['erste'] = $admin_db->query("SELECT date_format(anday, '%j') as anday, COUNT(anday) as anday_cnt FROM bachelor WHERE fahrt_id=".$config_current_fahrt_id." GROUP BY anday ORDER BY anday ASC LIMIT 1")->fetchAll()[0]['anday_cnt'];
+$mitfahrer['zweit'] = $admin_db->query("SELECT date_format(abday, '%j') as abday, COUNT(abday) as abday_cnt FROM bachelor WHERE fahrt_id=".$config_current_fahrt_id." GROUP BY abday ORDER BY abday DESC LIMIT 1")->fetchAll()[0]['abday_cnt'];
$mitfahrer['veget'] = $admin_db->count("bachelor", ["AND"=>
["backstepped" => NULL,
"fahrt_id" => $config_current_fahrt_id,
@@ -46,7 +39,7 @@ $text .= "<div style='float:left; margin-left: 15px'><h2>Mitfahrer</h2>
<li>Gesamt: ".$mitfahrer['gesam']." (".$mitfahrer['gesaa'].")</li>
<ul>
<li>Erste Nacht: ".$mitfahrer['erste']."</li>
- <li>Zweite Nacht: ".$mitfahrer['zweit']."</li>
+ <li>Letzte Nacht: ".$mitfahrer['zweit']."</li>
<li>Vegetarier: ".$mitfahrer['veget']."</li>
<li>Zurückgetreten: ".$mitfahrer['backs']."</li>
<li>Personen am Treffpunkt: ".$mitfahrer['treff']."</li>
--
GitLab