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

Merge branch 'spidev' into 'master'

Browse Source 
Zeiterfassung Update

See merge request fronk/thetool!1814
This commit is contained in:
Daniel Spitzer
2025-10-07 09:32:48 +00:00
parent 66d1317ed6 1374a2b7cb
commit e8d912f9dc
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/TimerecordingPermit/TimerecordingPermitController.php
View File

@@ -62,6 +62,11 @@ class TimerecordingPermitController extends mfBaseController
} else if ($timerecordingCategoriess[0]->hourday == "2") {
$body .= 'von: ' . date("d.m.Y", $timerecordings->start) . ' bis: ' . date("d.m.Y", $timerecordings->end) . '
';
}
else if ($timerecordingCategoriess[0]->hourday == "6") {
$body .= 'von: ' . date("d.m.Y H:i", $timerecordings->start) . ' bis: ' . date("H:i", $timerecordings->end) . '
';
}
$body .= ucfirst($sendtext) . ' von: ' . $this->me->name . '

2
application/TimerecordingReport/TimerecordingReportController.php
View File

@@ -545,7 +545,7 @@ class TimerecordingReportController extends mfBaseController
'comment' => array('comment' => $timerecording->comment, 'order' => $timerecording->comment),
'edit' => array('edit' => $edit, 'order' => $edit),
'hourday' => array('hourday' => $timerecording->timerecordingCategory->hourday, 'order' => $timerecording->timerecordingCategory->hourday),
'approved' => array('approved' => $timerecording->approved, 'order' => $timerecording->approved)
);
}
endforeach;