iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

highlight freeloaded shifts in user myshifts view

This commit is contained in:
Xu 2023-12-17 13:44:01 +01:00 committed by Igor Scheller
parent 23de3579af
commit f4c3f7a39e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/view/User_view.php
View File

@ -322,6 +322,7 @@ function User_view_myshift(Shift $shift, $user_source, $its_me)
'comment' => '', 'comment' => '',
'start' => $shift->start, 'start' => $shift->start,
'end' => $shift->end, 'end' => $shift->end,
'freeloaded' => $shift->freeloaded,
]; ];
if ($its_me) { if ($its_me) {
@ -412,7 +413,9 @@ function User_view_myshifts(
foreach ($myshifts_table as $i => &$shift) { foreach ($myshifts_table as $i => &$shift) {
$before = $myshifts_table[$i - 1] ?? null; $before = $myshifts_table[$i - 1] ?? null;
$after = $myshifts_table[$i + 1] ?? null; $after = $myshifts_table[$i + 1] ?? null;
if (Carbon::now() > $shift['start'] && Carbon::now() < $shift['end']) { if ($shift['freeloaded']) {
$shift['row-class'] = 'border border-danger border-2';
} elseif (Carbon::now() > $shift['start'] && Carbon::now() < $shift['end']) {
$shift['row-class'] = 'border border-info border-2'; $shift['row-class'] = 'border border-info border-2';
} elseif ($after && Carbon::now() > $shift['end'] && Carbon::now() < $after['start']) { } elseif ($after && Carbon::now() > $shift['end'] && Carbon::now() < $after['start']) {
$shift['row-class'] = 'border-bottom border-info'; $shift['row-class'] = 'border-bottom border-info';
@ -483,6 +486,7 @@ function User_view_worklog(Worklog $worklog, $admin_user_worklog_privilege)
'actions' => $actions, 'actions' => $actions,
'start' => $worklog->worked_at, 'start' => $worklog->worked_at,
'end' => $worklog->worked_at, 'end' => $worklog->worked_at,
'freeloaded' => false,
]; ];
} }