Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'spidev' into 'master'

Browse Source 
Zeiterfassung Anpassungen Jobrad Feature

See merge request fronk/thetool!488
This commit is contained in:
Daniel Spitzer
2024-07-14 11:16:33 +00:00
parent 0817322c33 d52d83327f
commit 8b4589523e
5 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Layout/default/TimerecordingBilling/DetailClosed.php
View File

@@ -193,7 +193,7 @@
}
?>
<tr>
<td class="text-nowrap">(<?= $employee_number ?>) <?= $timerecording->timerecordingEmployee->user->name ?> <?= ($timerecording->timerecordingEmployee->jobbike == 1) ? '<div class="float-right"><i title="Jobrad" class="fa-sharp fa-regular fa-person-biking"></i></div>' : '' ?></td>
<td class="text-nowrap">(<?= $employee_number ?>) <?= $timerecording->timerecordingEmployee->user->name ?> <?= ($timerecording->jobbike == 1) ? '<div class="float-right"><i title="Jobrad" class="fa-sharp fa-regular fa-person-biking"></i></div>' : '' ?></td>
<td class="text-center"><?= number_format(round($timerecording->ishours / 3600, 2), "2", ",", ".") ?></td>
<td class="text-center"><?= $nlz ?></td>
<td class="text-center"><?= number_format(round($timerecording->ishourssum / 3600, 2), "2", ",", ".") ?></td>

2
Layout/default/TimerecordingEmployee/Index.php
View File

@@ -163,7 +163,7 @@ $type[3] = "Lehrling";
var hidesearch = [ 6, 7, 8, 9, 10,13];
var columnfilter = [0,11,12];
<?php if ($me->superexpertEnabled()): ?>
var columnfilter = [0,12];
var columnfilter = [0,12,13];
hidesearch = [ 6, 7, 8, 9, 10, 11,14];
<?php endif; ?>