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

Zeiterfassung

Browse Source 
Neue Features:
* BP Stunden Aufbuchen/Mindern
* Spezialbuchungen ohne Verechnungstechnische relevanz
This commit is contained in:
Daniel Spitzer
2024-12-29 20:24:36 +01:00
parent 42703dd303
commit 085d8facdc
12 changed files with 151 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Layout/default/TimerecordingEmployee/Form.php
View File

@@ -72,6 +72,7 @@ $daysSelect .= "</select>";
</div>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="user_id">Mitarbeiter *</label>
<div class="col-lg-3">
@@ -146,7 +147,7 @@ $daysSelect .= "</select>";
<div class="form-group row" style="display:none">
<label class="col-lg-2 col-form-label" for="holidays">Initiale Urlaubstage</label>
<div class="col-lg-1">
<input type="number" id="holidays" name="holidays"
<input type="number" id="holidays" name="holidays"
class="form-control"
value="<?= $timerecordingemployees->holidays ?>"/>
</div>
@@ -191,6 +192,19 @@ $daysSelect .= "</select>";
</div>
</div>
</div>
<?php if ($me->superexpertEnabled()): ?>
<div class="form-group row">
<label class="col-lg-2 col-form-label"
for="bmd_active">Nur im Admin-Mode sichtbar</label>
<div class="col-lg-3">
<div class="form-check">
<input id="only_admin"
class="form-check-input" <?php if ($timerecordingemployees->only_admin) echo 'checked="checked"'; ?>
type="checkbox" name="only_admin" value="1"/>
</div>
</div>
</div>
<?php endif; ?>
<div id="workinghours_div">
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="workinghours">Sollzeiten

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

@@ -5,7 +5,8 @@ $type[3] = "Lehrling";
?>
<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"
<link href="<?= self::getResourcePath() ?>datatables/DataTables-2x/datatables.min.css?<?= $git_merge_ts ?>"
rel="stylesheet"
type="text/css"/>
<style>
.border-dark {
@@ -92,6 +93,9 @@ $type[3] = "Lehrling";
</thead>
<tbody>
<?php foreach ($timerecordingusers as $timerecordinguser):
if ($timerecordingemployees[$timerecordinguser->id]['only_admin'] == 1 && !$me->superexpertEnabled()) {
continue;
}
if ($timerecordingworkinghours) {
$seconds = $timerecordingworkinghours[$timerecordinguser->id]['secondcounter'];
$minutes = floor(($seconds % 3600) / 60);
@@ -160,11 +164,11 @@ $type[3] = "Lehrling";
src="<?= self::getResourcePath() ?>datatables/DataTables-2x/datatables.min.js?<?= $git_merge_ts ?>"></script>
<script type="text/javascript">
var hidesearch = [ 6, 7, 8, 9, 10,13];
var columnfilter = [0,11,12];
var hidesearch = [6, 7, 8, 9, 10, 13];
var columnfilter = [0, 11, 12];
<?php if ($me->superexpertEnabled()): ?>
var columnfilter = [0,12,13];
hidesearch = [ 6, 7, 8, 9, 10, 11,14];
var columnfilter = [0, 12, 13];
hidesearch = [6, 7, 8, 9, 10, 11, 14];
<?php endif; ?>
var columnoptions = '<option value=""></option><option value="Ja">Ja</option><option value="Nein">Nein</option>';