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

Zeiterfassung Update

Browse Source 
* Gesammtsumme bei Admin Only Mitarbeitern einfeführt
This commit is contained in:
Daniel Spitzer
2025-02-14 12:30:21 +01:00
parent 5e8ec1d07d
commit d0404f515d
4 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/Timerecording/TimerecordingController.php
View File

@@ -680,6 +680,7 @@ class TimerecordingController extends mfBaseController
$holiDays = 0;
$plusHours = 0;
$startdate = time();
$allhours=0;
if (!$userid) {
$userid = $this->me->id;
}
@@ -697,6 +698,10 @@ class TimerecordingController extends mfBaseController
}
$overtime = $employee[0]->overtime_now;
if ($employee[0]->only_admin) {
$getAllHours=TimerecordingModel::getAllHours($userid);
$getAllHours=$getAllHours[0]->gesamt_summe;
}
}
$workinghours = TimerecordingEmployeeWorkingHourModel::search(['user_id' => $userid]);
$holidays = TimerecordingHolidayModel::getAll();
@@ -1155,6 +1160,7 @@ class TimerecordingController extends mfBaseController
$json['time']['must'] = sprintf('%02dh:%02dm', floor($mustSeconds / 3600), floor($mustSeconds / 60 % 60));
$json['time']['holidays'] = $holiDays;
$json['time']['plushours'] = $plusHours;
$json['time']['AllHours'] = sprintf('%02dh:%02dm', floor($getAllHours / 3600), floor($getAllHours / 60 % 60));;
$json['data'] = $rows;
$json['recordsFiltered'] = $responsecount;
$json['recordsTotal'] = $responsecount;