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

Zeiterfassung Update

Browse Source 
* Neue migration für Homeoffice/Urlaubsänderungen
 * Soll zeiten nun vom Startdatum abhängig
 * Neue Summierung der Sollzeiten in der Personalverwaltung
 * Urlaubstage werden nun Tage statt Stunden angezeigt (in Buchungen und Auswertungen)
 * Urlaube werden nun bis 1.1.2024 berücksichtigt
 * Homeoffice Flag nun möglich
 * Abwesenheitskalender Sichtbar für alle
 * Neuer Buchungszeitraum für Urlaubsgutschrift/Urlaubsminderung
This commit is contained in:
Spitzer Daniel
2024-03-04 17:57:02 +01:00
parent 6e53d0f6d7
commit 5025b88c0d
9 changed files with 161 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/TimerecordingCategories/Form.php
+21 -6
View File
@@ -65,7 +65,8 @@
<label class="col-lg-2 col-form-label" for="approval">Genehmigungspflichtig</label>
<div class="col-lg-3">
<div class="form-check">
<input id="approval" class="form-check-input" <?php if ($timerecordingcategoriess->approval) echo 'checked="checked"'; ?>
<input id="approval"
class="form-check-input" <?php if ($timerecordingcategoriess->approval) echo 'checked="checked"'; ?>
type="checkbox" name="approval" value="1" id="olt">
</div>
</div>
@@ -75,25 +76,30 @@
Pflichtfeld</label>
<div class="col-lg-3">
<div class="form-check">
<input id="require_comment" class="form-check-input" <?php if ($timerecordingcategoriess->require_comment) echo 'checked="checked"'; ?>
<input id="require_comment"
class="form-check-input" <?php if ($timerecordingcategoriess->require_comment) echo 'checked="checked"'; ?>
type="checkbox" name="require_comment" value="1">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="businesstrip">Dienstreisemöglichkeit</label>
<label class="col-lg-2 col-form-label"
for="businesstrip">Dienstreisemöglichkeit</label>
<div class="col-lg-3">
<div class="form-check">
<input id="businesstrip" class="form-check-input" <?php if ($timerecordingcategoriess->businesstrip) echo 'checked="checked"'; ?>
<input id="businesstrip"
class="form-check-input" <?php if ($timerecordingcategoriess->businesstrip) echo 'checked="checked"'; ?>
type="checkbox" name="businesstrip" value="1">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="only_admin">Nur für Buchhaltung zu buchen</label>
<label class="col-lg-2 col-form-label" for="only_admin">Nur für Buchhaltung zu
buchen</label>
<div class="col-lg-3">
<div class="form-check">
<input id="only_admin" class="form-check-input" <?php if ($timerecordingcategoriess->only_admin) echo 'checked="checked"'; ?>
<input id="only_admin"
class="form-check-input" <?php if ($timerecordingcategoriess->only_admin) echo 'checked="checked"'; ?>
type="checkbox" name="only_admin" value="1">
</div>
</div>
@@ -130,6 +136,15 @@
$('form').on('blur', 'input[type=number]', function (e) {
$(this).off('wheel.disableScroll')
});
$(document).ready(function () {
$("body").on("change", "#hourday", function () {
if ($(this).val() == 5) {
$("#only_admin").prop("checked", true);
} else {
}
});
$("#hourday").change();
});
</script>
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
Layout/default/TimerecordingReport/Index.php
+16 -4
View File
@@ -92,7 +92,9 @@ $years[time() - 31536000] = date('Y', time() - 31536000);
.fixed-state {
background-color: #d0fbd9;
}
.form-check-label {
margin-top: 2px;
}
</style>
<!-- start page title -->
<div class="row">
@@ -141,7 +143,7 @@ $years[time() - 31536000] = date('Y', time() - 31536000);
data-comment="<?= $timerecordingCategories->require_comment ?>"
data-hourday="<?= $timerecordingCategories->hourday ?>"
data-businesstrip="<?= $timerecordingCategories->businesstrip ?>"
data-homeoffice="<?= ($timerecordingCategories->hourday==1) ? 1 : 0 ?>"><?= $timerecordingCategories->name ?></option>
data-homeoffice="<?= ($timerecordingCategories->hourday == 1) ? 1 : 0 ?>"><?= $timerecordingCategories->name ?></option>
<?php
endforeach; ?>
</select>
@@ -186,6 +188,16 @@ $years[time() - 31536000] = date('Y', time() - 31536000);
</div>
</div>
<div id="days-div" class="col-lg-1" style="display:none">
<div class="form-row">
<div class="form-group col">
<label class=" col-form-label" for="days">Anzahl Tage</label>
<input type="number" id="days" name="days" class="form-control "
placeholder=""/>
</div>
</div>
</div>
<div class="form-group col-lg-2">
<label class="col-form-label" for="comment">Anmerkung</label>
<input type="text" id="comment" name="comment" class="form-control"
@@ -193,7 +205,7 @@ $years[time() - 31536000] = date('Y', time() - 31536000);
</div>
</div>
<div class="row" >
<div class="row">
<div class="col-lg-1 mb-2" id="homeoffice-div">
<div class="form-check text-center mt-1">
@@ -326,7 +338,7 @@ $years[time() - 31536000] = date('Y', time() - 31536000);
<table id="datatable" class="table table-hover table-sm">
<thead>
<tr>
<th style="min-width: 250px;" class="text-center text-nowrap ">Mitarbeiter</th>
<th style="min-width: 250px;" class="text-center text-nowrap ">Mitarbeiter</th>
<th style="width: 200px;" class="text-center text-nowrap ">Datum</th>
<th class="text-nowrap edit-width text-center">Von</th>
<th class="text-nowrap edit-width text-center">Bis</th>