summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Favre <gnomus@gnomus.de>2014-12-06 17:30:35 +0100
committerFelix Favre <gnomus@gnomus.de>2014-12-06 17:30:35 +0100
commit2654fcf2288e67c1272b3713d4ea185b971f3882 (patch)
tree91742b062f9db957ca666ea390c58166b9f2700c
parent67bca99571009104ee74da635f44b57350312172 (diff)
use glyph_bool in admin_active view
-rw-r--r--includes/pages/admin_active.php50
1 files changed, 25 insertions, 25 deletions
diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index 24628d0e..58c36f5d 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -5,7 +5,7 @@ function admin_active_title() {
function admin_active() {
global $tshirt_sizes, $shift_sum_formula;
-
+
$msg = "";
$search = "";
$forced_count = sql_num_query("SELECT * FROM `User` WHERE `force_active`=1");
@@ -16,7 +16,7 @@ function admin_active() {
$search = strip_request_item('search');
if (isset($_REQUEST['set_active'])) {
$ok = true;
-
+
if (isset($_REQUEST['count']) && preg_match("/^[0-9]+$/", $_REQUEST['count'])) {
$count = strip_request_item('count');
if ($count < $forced_count) {
@@ -27,7 +27,7 @@ function admin_active() {
$ok = false;
$msg .= error(_("Please enter a number of angels to be marked as active."), true);
}
-
+
if ($ok)
$limit = " LIMIT " . $count;
if (isset($_REQUEST['ack'])) {
@@ -39,14 +39,14 @@ function admin_active() {
$user_nicks[] = User_Nick_render($usr);
}
engelsystem_log("These angels are active now: " . join(", ", $user_nicks));
-
+
$limit = "";
$msg = success(_("Marked angels."), true);
} else {
$set_active = '<a href="' . page_link_to('admin_active') . '&amp;serach=' . $search . '">&laquo; ' . _("back") . '</a> | <a href="' . page_link_to('admin_active') . '&amp;search=' . $search . '&amp;count=' . $count . '&amp;set_active&amp;ack">' . _("apply") . '</a>';
}
}
-
+
if (isset($_REQUEST['active']) && preg_match("/^[0-9]+$/", $_REQUEST['active'])) {
$id = $_REQUEST['active'];
$user_source = User($id);
@@ -84,9 +84,9 @@ function admin_active() {
} else
$msg = error(_("Angel not found."), true);
}
-
+
$users = sql_select("SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` WHERE `User`.`Gekommen` = 1 GROUP BY `User`.`UID` ORDER BY `force_active` DESC, `shift_length` DESC" . $limit);
-
+
$matched_users = array();
if ($search == "")
$tokens = array();
@@ -107,10 +107,10 @@ function admin_active() {
$usr['nick'] = User_Nick_render($usr);
$usr['shirt_size'] = $tshirt_sizes[$usr['Size']];
$usr['work_time'] = round($usr['shift_length'] / 60) . ' min (' . round($usr['shift_length'] / 3600) . ' h)';
- $usr['active'] = '<img src="pic/icons/' . ($usr['Aktiv'] == 1 ? 'tick' : 'cross') . '.png" alt="' . $usr['Aktiv'] . '">';
- $usr['force_active'] = '<img src="pic/icons/' . ($usr['force_active'] == 1 ? 'tick' : 'cross') . '.png" alt="' . $usr['force_active'] . '">';
- $usr['tshirt'] = '<img src="pic/icons/' . ($usr['Tshirt'] == 1 ? 'tick' : 'cross') . '.png" alt="' . $usr['Tshirt'] . '">';
-
+ $usr['active'] = glyph_bool($usr['Aktiv'] == 1);
+ $usr['force_active'] = glyph_bool($usr['force_active'] == 1);
+ $usr['tshirt'] = glyph_bool($usr['Tshirt'] == 1);
+
$actions = array();
if ($usr['Aktiv'] == 0)
$actions[] = '<a href="' . page_link_to('admin_active') . '&amp;active=' . $usr['UID'] . '&amp;search=' . $search . '">' . _("set active") . '</a>';
@@ -120,31 +120,31 @@ function admin_active() {
}
if ($usr['Tshirt'] == 1)
$actions[] = '<a href="' . page_link_to('admin_active') . '&amp;not_tshirt=' . $usr['UID'] . '&amp;search=' . $search . '">' . _("remove t-shirt") . '</a>';
-
+
$usr['actions'] = join(' ', $actions);
-
+
$matched_users[] = $usr;
}
-
+
$shirt_statistics = sql_select("
- SELECT `Size`, count(`Size`) AS `count`
- FROM `User`
- WHERE `Tshirt`=1
- GROUP BY `Size`
+ SELECT `Size`, count(`Size`) AS `count`
+ FROM `User`
+ WHERE `Tshirt`=1
+ GROUP BY `Size`
ORDER BY `count` DESC");
$shirt_statistics[] = array(
'Size' => '<b>' . _("Sum") . '</b>',
- 'count' => '<b>' . sql_select_single_cell("SELECT count(*) FROM `User` WHERE `Tshirt`=1") . '</b>'
+ 'count' => '<b>' . sql_select_single_cell("SELECT count(*) FROM `User` WHERE `Tshirt`=1") . '</b>'
);
-
+
return page_with_title(admin_active_title(), array(
form(array(
form_text('search', _("Search angel:"), $search),
- form_submit('submit', _("Search"))
+ form_submit('submit', _("Search"))
)),
$set_active == "" ? form(array(
form_text('count', _("How much angels should be active?"), $count),
- form_submit('set_active', _("Preview"))
+ form_submit('set_active', _("Preview"))
)) : $set_active,
msg(),
table(array(
@@ -155,13 +155,13 @@ function admin_active() {
'active' => _("Active?"),
'force_active' => _("Forced"),
'tshirt' => _("T-shirt?"),
- 'actions' => ""
+ 'actions' => ""
), $matched_users),
'<h2>' . _("Given shirts") . '</h2>',
table(array(
'Size' => _("Size"),
- 'count' => _("Count")
- ), $shirt_statistics)
+ 'count' => _("Count")
+ ), $shirt_statistics)
));
}
?>