diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/pages/admin_active.php | 38 | ||||
| -rw-r--r-- | includes/view/User_view.php | 2 |
2 files changed, 30 insertions, 10 deletions
diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php index b79d1bd1..78796391 100644 --- a/includes/pages/admin_active.php +++ b/includes/pages/admin_active.php @@ -145,14 +145,23 @@ function admin_active() { $matched_users[] = $usr; } - - $shirt_statistics = sql_select(" + + $given_shirt_statistics = sql_select(" SELECT `Size`, count(`Size`) AS `count` FROM `User` WHERE `Tshirt`=1 GROUP BY `Size` - ORDER BY `count` DESC"); - $shirt_statistics[] = array( + ORDER BY `Size` DESC"); + $given_shirt_statistics[] = array( + 'Size' => '<b>' . _("Sum") . '</b>', + 'count' => '<b>' . sql_select_single_cell("SELECT count(*) FROM `User` WHERE `Tshirt`=1") . '</b>' + ); + $needed_shirt_statistics = sql_select(" + SELECT `Size`, count(`Size`) AS `count` + FROM `User` + GROUP BY `Size` + ORDER BY `Size` DESC"); + $needed_shirt_statistics[] = array( 'Size' => '<b>' . _("Sum") . '</b>', 'count' => '<b>' . sql_select_single_cell("SELECT count(*) FROM `User` WHERE `Tshirt`=1") . '</b>' ); @@ -178,11 +187,22 @@ function admin_active() { 'tshirt' => _("T-shirt?"), 'actions' => "" ), $matched_users), - '<h2>' . _("Given shirts") . '</h2>', - table(array( - 'Size' => _("Size"), - 'count' => _("Count") - ), $shirt_statistics) + div('row', [ + div('col-md-6', [ + '<h2>' . _("Needed shirts") . '</h2>' , + table(array( + 'Size' => _("Size"), + 'count' => _("Count") + ), $needed_shirt_statistics) + ]), + div('col-md-6', [ + '<h2>' . _("Given shirts") . '</h2>', + table(array( + 'Size' => _("Size"), + 'count' => _("Count") + ), $given_shirt_statistics) + ]) + ]) )); } ?> diff --git a/includes/view/User_view.php b/includes/view/User_view.php index 99a70ba9..3ab5f816 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -268,7 +268,7 @@ function User_angeltypes_render($user_angeltypes) { $class = 'text-warning'; else $class = 'text-success'; - $output[] = '<span class="' . $class . '">' . ($angeltype['coordinator'] ? '<span class="glyphicon glyphicon-certificate"></span> ' : '') . $angeltype['name'] . '</span>'; + $output[] = '<span class="' . $class . '">' . ($angeltype['coordinator'] ? glyph('education') : '') . $angeltype['name'] . '</span>'; } return join('<br />', $output); } |