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

Zeiterfassungs Update

Browse Source 
* neue Migration für Personaladministration (Aktive Verrechnung)
 * Verrechnung Anpassungen Black P.
 * superexpertEnabled Implementation Verrechnung/Personaladministration
 * Personaladministration (Aktive Verrechnung/Zeiterfassung Enddatum)
This commit is contained in:
Spitzer Daniel
2024-04-01 17:35:38 +02:00
parent 83b01ce931
commit c3ebfdfd2a
9 changed files with 112 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Layout/default/TimerecordingBilling/Detail.php
View File

@@ -38,6 +38,9 @@
<th class="text-center">Sollabweichung</th>
<th class="text-center">Akuelle Gutstunden</th>
<th class="text-center">Akuelle Überstunden</th>
<?php if ($me->superexpertEnabled()): ?>
<th class="text-center">Black P. Stunden</th>
<?php endif; ?>
<th class="text-center">Nichtleistungszeiten</th>
<th class="text-center">Diäten</th>
<th class="text-center">Homeoffice Tage</th>
@@ -50,6 +53,9 @@
<th></th>
<th></th>
<th></th>
<?php if ($me->superexpertEnabled()): ?>
<th></th>
<?php endif; ?>
<th></th>
<th></th>
<th></th>
@@ -75,7 +81,7 @@
}
$offdays .= "</div>";
} else {
$offdays = "keine";
$offdays = "-";
}
?>
<tr>
@@ -91,6 +97,10 @@
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>
<?php if ($me->superexpertEnabled()): ?>
<td data-order="<?= $timerecording['data']['time']['bpahours'] ?>"
class="text-center"><?= $timerecording['data']['time']['bpahours'] ?></td>
<?php endif; ?>
<td class=""><?= $offdays ?></td>
<td class="text-center"><?= number_format($timerecording['data']['time']['diet'], 2, ',', '.') . " €" ?></td>
<td class="text-center"><?= $timerecording['data']['time']['homeoffice'] ?> Tag(e)</td>
@@ -108,7 +118,9 @@
<script type="text/javascript">
var hidesearch = [2, 3, 4, 5, 6, 8, 9];
<?php if ($me->superexpertEnabled()): ?>
hidesearch = [2, 3, 4, 5, 6, 7, 9, 10];
<?php endif; ?>
$(document).ready(function () {
$('.buttons-excel').closest('div').append('<div ><button id="bmd-export" class="btn btn-info margina">BMD Import</button></div>');
$('.buttons-excel').closest('div').append('<div ><button id="bmd-export-nlz" class="btn btn-info margina">BMD NLZ Import</button></div>');