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

Zeiterfassung

Browse Source 
* Fix 0 Tage Urlaubsanzeige Verrechnung abgeschlossen/Verrechnungs Monatsübersicht
 * Umbau Personaladministration für Conny
 * $git_merge_ts eingebaut
This commit is contained in:
Daniel Spitzer
2024-07-05 10:53:35 +02:00
parent 3d10967292
commit 2b7744bd20
6 changed files with 51 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,9 @@ $type[1] = "Angestellter";
$type[2] = "Arbeiter";
$type[3] = "Lehrling";
?>
<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= $git_merge_ts ?>" rel="stylesheet"
type="text/css"/>
<link href="<?= self::getResourcePath() ?>datatables/DataTables-2x/datatables.min.css?<?= $git_merge_ts ?>" rel="stylesheet"
type="text/css"/>
<style>
.border-dark {
@@ -49,19 +51,22 @@ $type[3] = "Lehrling";
<div class="col-lg-12">
<table id="datatable" class="table table-hover table-sm">
<thead>
<tr>
<tr class="bg-white">
<th class="text-center edit-width-medium">Aktiv</th>
<th class="text-center">Mitarbeiter</th>
<th class="text-center">Geburtstag</th>
<th class="text-center">Vertragsart</th>
<th class="text-center">Start Zeitaufzeichnung</th>
<th title="Zeiterfassung Start" class="text-center">ZE Start</th>
<th title="Zeiterfassung Ende" class="text-center">ZE Ende</th>
<th class="text-center">Sollzeiten</th>
<th class="text-center">Sollstunden</th>
<th title="Sollstunden" class="text-center">Sollst.</th>
<th class="text-center">Mehrstunden</th>
<th class="text-center">Überstunden</th>
<?php if ($me->superexpertEnabled()): ?>
<th class="text-center">Black P. Stunden</th>
<th title="Black Pig Stunden" class="text-center edit-width-medium">B. P. St.</th>
<?php endif; ?>
<th class="text-center">Offene Urlaube</th>
<th class="text-center edit-width">Schnellbuchung</th>
<th class="text-center" title="Offene Urlaube">Urlaubstage</th>
<th class="text-center edit-width">Schnellb.</th>
<th class="edit-width"></th>
</tr>
<tr id="filterrow">
@@ -70,6 +75,9 @@ $type[3] = "Lehrling";
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<?php if ($me->superexpertEnabled()): ?>
<th></th>
<?php endif; ?>
@@ -109,9 +117,15 @@ $type[3] = "Lehrling";
?>
<tr class="<?= ($timerecordingemployees[$timerecordinguser->id]['bmd_active'] == "0") ? "inactive_empoyee" : "" ?>">
<td class="text-center pr-3"><?= ($timerecordingemployees[$timerecordinguser->id]['bmd_active'] == "0") ? "Nein" : "Ja" ?></td>
<td><?= $timerecordinguser->name ?></td>
<td class="text-center"
data-order="<?= $timerecordingemployees[$timerecordinguser->id]['birthday'] ?>"><?= ($timerecordingemployees[$timerecordinguser->id]['birthday']) ? date("d.m.Y", $timerecordingemployees[$timerecordinguser->id]['birthday']) : "-" ?></td>
<td><?= $type[$timerecordingemployees[$timerecordinguser->id]['type']] ?></td>
<td class="text-center"><?= ($timerecordingemployees[$timerecordinguser->id]['startdate']) ? date("d.m.Y", $timerecordingemployees[$timerecordinguser->id]['startdate']) : "-" ?></td>
<td class="text-center"
data-order="<?= $timerecordingemployees[$timerecordinguser->id]['startdate'] ?>"><?= ($timerecordingemployees[$timerecordinguser->id]['startdate']) ? date("d.m.Y", $timerecordingemployees[$timerecordinguser->id]['startdate']) : "-" ?></td>
<td class="text-center"
data-order="<?= $timerecordingemployees[$timerecordinguser->id]['enddate'] ?>"><?= ($timerecordingemployees[$timerecordinguser->id]['enddate']) ? date("d.m.Y", $timerecordingemployees[$timerecordinguser->id]['enddate']) : "-" ?></td>
<td class="text-center text-nowrap"><?= ($timerecordingworkinghours) ? $timerecordingworkinghours[$timerecordinguser->id]['datetimetext'] : "" ?></td>
<td class="text-center"><?= $sum ?></td>
<td class="text-center"
@@ -124,7 +138,7 @@ $type[3] = "Lehrling";
<?php endif; ?>
<td class="text-center"
data-order="<?= ($timerecordingemployees[$timerecordinguser->id]['holidays_now']) ? $timerecordingemployees[$timerecordinguser->id]['holidays_now'] : '' ?>"><?= ($timerecordingemployees[$timerecordinguser->id]['holidays_now']) ? $timerecordingemployees[$timerecordinguser->id]['holidays_now'] . ' Tage' : '' ?> </td>
<td class="text-center"><?= ($timerecordingemployees[$timerecordinguser->id]['auto_workinghours'] == '1') ? 'Ja' : 'Nein' ?></td>
<td class="text-center pr-3"><?= ($timerecordingemployees[$timerecordinguser->id]['auto_workinghours'] == '1') ? 'Ja' : 'Nein' ?></td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
<a href="<?= self::getUrl("TimerecordingEmployee", "edit", ['id' => $timerecordingemployees[$timerecordinguser->id]['id'], "userid" => $timerecordinguser->id]) ?>"><i
class="far fa-edit" title="Bearbeiten"></i></a>
@@ -139,19 +153,25 @@ $type[3] = "Lehrling";
</div>
</div>
<script type="text/javascript"
src="<?= self::getResourcePath() ?>datatables/DataTables-2x/datatables.min.js?<?= $git_merge_ts ?>"></script>
<script type="text/javascript">
var hidesearch = [3, 4, 5, 6, 7, 9];
var hidesearch = [ 6, 7, 8, 9, 10,12];
var columnfilter = [0,11];
<?php if ($me->superexpertEnabled()): ?>
hidesearch = [3, 4, 5, 6, 7,8 ,10];
var columnfilter = [0,12];
hidesearch = [ 6, 7, 8, 9, 10, 11,13];
<?php endif; ?>
var columnoptions = '<option value=""></option><option value="Ja">Ja</option><option value="Nein">Nein</option>';
var pageLength = 100;
$(document).ready(function () {
});
</script>
<script type="text/javascript"
src="<?= self::getResourcePath() ?>assets/js/datatables-std.js?<?= date('U') ?>"></script>
src="<?= self::getResourcePath() ?>assets/js/datatables-std2.js?<?= $git_merge_ts ?>"></script>
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>