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!1903
This commit is contained in:
Daniel Spitzer
2025-11-25 06:59:42 +00:00
parent 6340d2eada e117a37b40
commit ed8a7cb8d8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/TimerecordingReport/TimerecordingReportController.php
View File

@@ -471,7 +471,7 @@ class TimerecordingReportController extends mfBaseController
if ($timerecording->completed == 0):
if ($timerecording->approved == 0) :
if ($timerecording->approved == 0 || $timerecording->approved == 1) :
$ddays = $timerecording->days;
if ($timerecording->timerecordingCategory->hourday == 8) {
$ddays = round($timerecording->hours_bpa / 60 / 60, 2);
@@ -1096,7 +1096,7 @@ class TimerecordingReportController extends mfBaseController
if ($timerecording->completed == 0 && $timerecording->timerecordingCategory->only_admin == 0):
if ($timerecording->approved == 0) :
if ($timerecording->approved == 0 || $timerecording->approved == 1) :
$edit = '<i class="far fa-edit edit-button" data-id="' . $timerecording->id . '"
data-date="' . $datadate . '"
data-category="' . $timerecording->timerecordingCategory->id . '"