filter free angels by angeltype
This commit is contained in:
parent
3cc2896376
commit
fe6fab67be
|
@ -6,7 +6,22 @@ function admin_free() {
|
||||||
if (isset ($_REQUEST['search']))
|
if (isset ($_REQUEST['search']))
|
||||||
$search = strip_request_item('search');
|
$search = strip_request_item('search');
|
||||||
|
|
||||||
$users = sql_select("SELECT `User`.* FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID` AND `Shifts`.`start` < " . sql_escape(time()) . " AND `Shifts`.`end` > " . sql_escape(time()) . ") WHERE `User`.`Gekommen` = 1 AND `Shifts`.`SID` IS NULL GROUP BY `User`.`UID` ORDER BY `Nick`");
|
$angeltypesearch = "";
|
||||||
|
if (empty ($_REQUEST['angeltype']))
|
||||||
|
$_REQUEST['angeltype'] = '';
|
||||||
|
else {
|
||||||
|
$angeltypesearch = " INNER JOIN `UserAngelTypes` ON (`UserAngelTypes`.`angeltype_id` = '" . sql_escape($_REQUEST['angeltype']) . "' AND `UserAngelTypes`.`user_id` = `User`.`UID`";
|
||||||
|
if (isset ($_REQUEST['confirmed_only']))
|
||||||
|
$angeltypesearch .= " AND `UserAngelTypes`.`confirm_user_id`";
|
||||||
|
$angeltypesearch .= ") ";
|
||||||
|
}
|
||||||
|
|
||||||
|
$angel_types_source = sql_select("SELECT `id`, `name` FROM `AngelTypes` ORDER BY `name`");
|
||||||
|
$angel_types = array('' => 'alle Typen');
|
||||||
|
foreach ($angel_types_source as $angel_type)
|
||||||
|
$angel_types[$angel_type['id']] = $angel_type['name'];
|
||||||
|
|
||||||
|
$users = sql_select("SELECT `User`.* FROM `User` ${angeltypesearch} LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID` AND `Shifts`.`start` < " . sql_escape(time()) . " AND `Shifts`.`end` > " . sql_escape(time()) . ") WHERE `User`.`Gekommen` = 1 AND `Shifts`.`SID` IS NULL GROUP BY `User`.`UID` ORDER BY `Nick`");
|
||||||
|
|
||||||
$table = "";
|
$table = "";
|
||||||
if ($search == "")
|
if ($search == "")
|
||||||
|
@ -41,8 +56,9 @@ function admin_free() {
|
||||||
}
|
}
|
||||||
return template_render('../templates/admin_free.html', array (
|
return template_render('../templates/admin_free.html', array (
|
||||||
'search' => $search,
|
'search' => $search,
|
||||||
|
'angeltypes' => html_select_key('angeltype', 'angeltype', $angel_types, $_REQUEST['angeltype']),
|
||||||
'table' => $table,
|
'table' => $table,
|
||||||
'link' => page_link_to('admin_free')
|
'link' => page_link_to('admin_free')
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<form action="%link%" method="post">
|
<form action="%link%" method="post">
|
||||||
<p>
|
<p>
|
||||||
Search Angel: <input type="text" name="search" value="%search%" /><input type="submit" name="submit" value="Search" />
|
Search Angel: <input type="text" name="search" value="%search%" placeholder="Name" /> %angeltypes% <input type="submit" name="submit" value="Search" />
|
||||||
</p>
|
</p>
|
||||||
</form>
|
</form>
|
||||||
<table>
|
<table>
|
||||||
|
|
Loading…
Reference in New Issue