Add ability to see punches of managed users

master
Skylar Ittner 7 years ago
parent 1fb4afc6aa
commit 900e3bb709

@ -45,5 +45,7 @@ define("STRINGS", [
"x on the clock" => "{time} on the clock",
"x punches" => "{count} punches",
"history" => "History",
"shifts" => "Shifts"
"shifts" => "Shifts",
"show all punches" => "Show other users",
"name" => "Name"
]);

@ -6,11 +6,21 @@ dieifnotloggedin();
header("Content-Type: application/json");
require_once __DIR__ . "/login.php";
require_once __DIR__ . "/userinfo.php";
$showmanaged = ($VARS['show_all'] == 1 && account_has_permission($_SESSION['username'], "QWIKCLOCK_MANAGE"));
$managed_uids = [];
if ($showmanaged) {
$managed_uids = getManagedUIDs($_SESSION['uid']);
}
$managed_uids[] = $_SESSION['uid'];
$out = [];
$out['draw'] = intval($VARS['draw']);
$out['recordsTotal'] = $database->count('punches', ['uid' => $_SESSION['uid']]);
$out['recordsTotal'] = $database->count('punches', ['uid' => $managed_uids]);
$filter = false;
// sort
@ -21,9 +31,12 @@ if ($VARS['order'][0]['dir'] == 'asc') {
}
switch ($VARS['order'][0]['column']) {
case 1:
$order = ["in" => $sortby];
$order = ["uid" => $sortby];
break;
case 2:
$order = ["in" => $sortby];
break;
case 3:
$order = ["out" => $sortby];
break;
}
@ -37,13 +50,13 @@ if (!is_empty($VARS['search']['value'])) {
"in[~]" => $VARS['search']['value'],
"out[~]" => $VARS['search']['value']
],
"uid" => $_SESSION['uid']
"uid" => $managed_uids
]
];
$where = $wherenolimit;
$where["LIMIT"] = [$VARS['start'], $VARS['length']];
} else {
$where = ["uid" => $_SESSION['uid'], "LIMIT" => [$VARS['start'], $VARS['length']]];
$where = ["uid" => $managed_uids, "LIMIT" => [$VARS['start'], $VARS['length']]];
}
if (!is_null($order)) {
@ -52,20 +65,29 @@ if (!is_null($order)) {
$punches = $database->select('punches', [
'uid',
'in',
'out',
'notes'
], $where);
$usercache = [];
for ($i = 0; $i < count($punches); $i++) {
// Get user info
if (!isset($usercache[$punches[$i]['uid']])) {
$usercache[$punches[$i]['uid']] = getUserByID($punches[$i]['uid']);
}
$punches[$i][0] = "";
$punches[$i][1] = date(DATETIME_FORMAT, strtotime($punches[$i]['in']));
$punches[$i][1] = $usercache[$punches[$i]['uid']]['name'];
$punches[$i][2] = date(DATETIME_FORMAT, strtotime($punches[$i]['in']));
if (is_null($punches[$i]['out'])) {
$punches[$i][2] = lang("na", false);
$punches[$i][3] = lang("na", false);
} else {
$punches[$i][2] = date(DATETIME_FORMAT, strtotime($punches[$i]['out']));
$punches[$i][3] = date(DATETIME_FORMAT, strtotime($punches[$i]['out']));
}
$punches[$i][3] = $punches[$i]['notes'];
$punches[$i][4] = $punches[$i]['notes'];
}
$out['status'] = "OK";

@ -49,6 +49,7 @@ $totalpunches = count($punches);
<thead>
<tr>
<th data-priority="0"></th>
<th data-priority="2"><i class="fa fa-fw fa-user"></i> <?php lang('name'); ?></th>
<th data-priority="1"><i class="fa fa-fw fa-play"></i> <?php lang('in'); ?></th>
<th data-priority="1"><i class="fa fa-fw fa-stop"></i> <?php lang('out'); ?></th>
<th data-priority="2"><i class="fa fa-fw fa-sticky-note-o"></i> <?php lang('notes'); ?></th>
@ -60,8 +61,16 @@ $totalpunches = count($punches);
<tfoot>
<tr>
<th data-priority="0"></th>
<th data-priority="2"><i class="fa fa-fw fa-user"></i> <?php lang('name'); ?></th>
<th data-priority="1"><i class="fa fa-fw fa-play"></i> <?php lang('in'); ?></th>
<th data-priority="1"><i class="fa fa-fw fa-stop"></i> <?php lang('out'); ?></th>
<th data-priority="2"><i class="fa fa-fw fa-sticky-note-o"></i> <?php lang('notes'); ?></th>
</tfoot>
</table>
</table>
<script>
/* Give JavaScript access to the lang string
* it needs to inject the show deleted checkbox
*/
var lang_show_all_punches = "<?php lang("show all punches") ?>";
</script>

@ -1,4 +1,4 @@
$('#punchtable').DataTable({
var punchtable = $('#punchtable').DataTable({
responsive: {
details: {
display: $.fn.dataTable.Responsive.display.modal({
@ -20,15 +20,22 @@ $('#punchtable').DataTable({
orderable: false
},
{
targets: 3,
targets: 4,
orderable: false
}
],
order: [
[1, 'desc']
[2, 'desc']
],
serverSide: true,
ajax: {
url: "lib/getpunchtable.php"
url: "lib/getpunchtable.php",
data: function (d) {
if ($('#show_all_checkbox').is(':checked')) {
d.show_all = 1;
}
},
}
});
});
$('#punchtable_filter').append("<div class=\"checkbox\" style=\"display: inline-block\"><label><input type=\"checkbox\" id=\"show_all_checkbox\" onclick=\"punchtable.ajax.reload()\"> " + lang_show_all_punches + "</label></div>");
Loading…
Cancel
Save