Zeiterfassung Feature Updates
* Reports wurde um Soll/Ist Detail Auswertung erweitert * Nachtzulage wird nun auch in der Verrechnungsübersicht angezeigt * M25,Ü50,Ü100 werden nun in Stichtagsauswertung mit berechnet * Bei der offenen Arbeitstage Auswertung wird nun die Arbeitszeitverschiebung rausgerechnet
This commit is contained in:
@@ -40,6 +40,7 @@
|
||||
<th class="text-center">Sollabweichung</th>
|
||||
<th class="text-center">Akuelle Gutstunden</th>
|
||||
<th class="text-center">Akuelle Überstunden</th>
|
||||
<th class="text-center">Nachtzulage</th>
|
||||
<?php if ($me->superexpertEnabled()): ?>
|
||||
<th class="text-center">Black P. Stunden</th>
|
||||
<?php endif; ?>
|
||||
@@ -55,6 +56,7 @@
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<?php if ($me->superexpertEnabled()): ?>
|
||||
<th></th>
|
||||
<?php endif; ?>
|
||||
@@ -101,6 +103,8 @@
|
||||
class="text-center"><?= $timerecording['data']['time']['plushours_now'] ?></td>
|
||||
<td data-order="<?= $timerecording['data']['time']['overtime_noworder'] ?>"
|
||||
class="text-center"><?= $timerecording['data']['time']['overtime_now'] ?></td>
|
||||
<td data-order="<?= $timerecording['data']['time']['overtimes']['nightAllowance'] ?>"
|
||||
class="text-center"><?= number_format(round($timerecording['data']['time']['overtimes']['nightAllowance'] / 3600, 2), "2", ",", ".") ?></td>
|
||||
<?php if ($me->superexpertEnabled()): ?>
|
||||
<td data-order="<?= $timerecording['data']['time']['bpahours'] ?>"
|
||||
class="text-center"><?= $timerecording['data']['time']['bpahours'] ?></td>
|
||||
@@ -126,9 +130,9 @@
|
||||
src="<?= self::getResourcePath() ?>datatables/DataTables-2x/datatables.min.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var hidesearch = [2, 3, 4, 5, 6, 8, 9];
|
||||
var hidesearch = [2, 3, 4, 5, 6, 7, 9, 10];
|
||||
<?php if ($me->superexpertEnabled()): ?>
|
||||
hidesearch = [2, 3, 4, 5, 6, 7, 9, 10];
|
||||
hidesearch = [2, 3, 4, 5, 6, 7, 8, 10, 11];
|
||||
<?php endif; ?>
|
||||
var pageLength = 100;
|
||||
var initc=2;
|
||||
|
||||
Reference in New Issue
Block a user