From d72b5a39b3fdb28d4fb5b6df404a83742ce59c27 Mon Sep 17 00:00:00 2001
From: Tim Repke <repketim@informatik.hu-berlin.de>
Date: Sat, 20 Sep 2014 23:28:31 +0100
Subject: [PATCH] backstepped people are grayed out
---
registration-system/admin/pages_list.php | 4 ++--
registration-system/admin/pages_overview.php | 7 ++++---
registration-system/view/admin_style.css | 6 ++++++
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/registration-system/admin/pages_list.php b/registration-system/admin/pages_list.php
index 4701511..dab6070 100644
--- a/registration-system/admin/pages_list.php
+++ b/registration-system/admin/pages_list.php
@@ -108,10 +108,10 @@ END;
$people = $admin_db->select('bachelor',$columns, array("fahrt_id"=>$config_current_fahrt_id));
foreach($people as $person) {
- $text .= "<tr>";
+ $text .= "<tr>"; //".((explode(',',$columnFunctions['PaidReBack']($person))[2]==0) ? "" : "class='list-backstepped'")."
foreach($columnFunctions as $key => $value)
{
- $text .= "<td class='".$key."'>".$value($person)."</td>";
+ $text .= "<td class='".$key.((explode(',',$columnFunctions['PaidReBack']($person))[2]==0) ? '' : ' list-backstepped')."'>".$value($person)."</td>";
}
$text .= "</tr>";
}
diff --git a/registration-system/admin/pages_overview.php b/registration-system/admin/pages_overview.php
index db03ccf..3d8aa10 100644
--- a/registration-system/admin/pages_overview.php
+++ b/registration-system/admin/pages_overview.php
@@ -6,7 +6,7 @@
* Time: 8:04 PM
*/
-global $text, $headers, $admin_db, $config_current_fahrt_id, $ajax, $config_reisearten, $config_admin_verbose_level, $config_verbose_level;
+global $text, $headers, $admin_db, $config_current_fahrt_id, $ajax, $config_reisearten, $config_admin_verbose_level, $config_verbose_level, $config_essen;
$config_admin_verbose_level = 4;
$config_verbose_level = 4;
$text .= "<h1>Ãœbersichtsseite</h1>";
@@ -15,6 +15,7 @@ $text .= "<h1>Ãœbersichtsseite</h1>";
$mitfahrer['gesam'] = $admin_db->count("bachelor", ["AND"=>
["backstepped" => NULL,
"fahrt_id" => $config_current_fahrt_id]]);
+$mitfahrer['gesaa'] = $admin_db->count("bachelor", ["fahrt_id" => $config_current_fahrt_id]);
$antag = $admin_db->query("SELECT date_format(von, '%j') as von FROM fahrten WHERE fahrt_id=$config_current_fahrt_id")->fetchAll()[0]['von'];
$abtag = date('z', DateTime::createFromFormat('Y-m-d',$admin_db->get("fahrten","bis", ["fahrt_id"=>$config_current_fahrt_id]))->getTimestamp());
@@ -29,7 +30,7 @@ $mitfahrer['zweit'] = $admin_db->count("bachelor", ["AND"=>
$mitfahrer['veget'] = $admin_db->count("bachelor", ["AND"=>
["backstepped" => NULL,
"fahrt_id" => $config_current_fahrt_id,
- ""]]);
+ "essen[!]" => $config_essen[0]]]);
$mitfahrer['backs'] = $admin_db->count("bachelor", ["AND"=>
["backstepped[!]" => NULL,
"fahrt_id" => $config_current_fahrt_id]]);
@@ -41,7 +42,7 @@ $mitfahrer['treff'] = $admin_db->count("bachelor", ["AND" =>
$text .= "<div style='float:left; margin-left: 15px'><h2>Mitfahrer</h2>
<ul class='list-nodeco'>
- <li>Gesamt: ".$mitfahrer['gesam']."</li>
+ <li>Gesamt: ".$mitfahrer['gesam']." (".$mitfahrer['gesaa'].")</li>
<ul>
<li>Erste Nacht: ".$mitfahrer['erste']."</li>
<li>Zweite Nacht: ".$mitfahrer['zweit']."</li>
diff --git a/registration-system/view/admin_style.css b/registration-system/view/admin_style.css
index 409da2d..ebb65c1 100644
--- a/registration-system/view/admin_style.css
+++ b/registration-system/view/admin_style.css
@@ -56,6 +56,12 @@ form table tr td{
padding: 0 5px;
}
+.list-backstepped{
+ color: #d3d3d3 !important;
+}
+.list-backstepped a{
+ color: #d3d3d3 !important;
+}
.cost-table{
padding: 5px;
}
--
GitLab