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
 * 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
This commit is contained in:
Spitzer Daniel
2024-03-04 13:57:44 +01:00
parent 65d313b6d1
commit ee5ab065d8
8 changed files with 164 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/TimerecordingReport/TimerecordingReportController.php
View File

@@ -269,6 +269,8 @@ class TimerecordingReportController extends mfBaseController
$edit = "";
if ($timerecording->businesstrip == 1) {
$category = "<span>" . $timerecording->timerecordingCategory->name . "</span><span class='text-bold ml-1'> (Dienstreise: " . $timerecording->businesstrip_info . ")</span>";
} else if ($timerecording->homeoffice == 1) {
$category = "<span>" . $timerecording->timerecordingCategory->name . "</span><span class='text-bold ml-1'> (Homeoffice)</span>";
} else {
$category = $timerecording->timerecordingCategory->name;
}
@@ -289,6 +291,7 @@ class TimerecordingReportController extends mfBaseController
data-userid="' . $timerecording->user_id . '"
data-businesstrip="' . $timerecording->businesstrip . '"
data-businesstripinfo="' . $timerecording->businesstrip_info . '"
data-homeoffice="' . $timerecording->homeoffice . '"
title="Bearbeiten"></i>';
else :
$edit .= '<div class="edit-placeholder"></div>';