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 Anpassungen Jobrad Feature

See merge request fronk/thetool!488
This commit is contained in:
Daniel Spitzer
2024-07-14 11:16:33 +00:00
parent 0817322c33 d52d83327f
commit 8b4589523e
5 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/TimerecordingBilling/TimerecordingBillingController.php
View File

@@ -269,7 +269,7 @@ class TimerecordingBillingController extends mfBaseController
if ($timerecordingBillingEmployee->overtime50free > 64800) {
$bodyarray = [$monthbmd, "1", $employee_number, "3110", "18", "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
if ($timerecordingBillingEmployee->timerecordingEmployee->jobbike == 1) {
if ($timerecordingBillingEmployee->jobbike == 1) {
$bodyarray = [$monthbmd, "1", $employee_number, "3115", "18", "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
$bodyarray = [$monthbmd, "1", $employee_number, "3116", "18", "", "", "", "", "", ""];
@@ -285,7 +285,7 @@ class TimerecordingBillingController extends mfBaseController
$overtime50free = str_replace(".", ",", $overtime50free);
$bodyarray = [$monthbmd, "1", $employee_number, "3110", $overtime50free, "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
if ($timerecordingBillingEmployee->timerecordingEmployee->jobbike == 1) {
if ($timerecordingBillingEmployee->jobbike == 1) {
$bodyarray = [$monthbmd, "1", $employee_number, "3115", $overtime50free, "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
$bodyarray = [$monthbmd, "1", $employee_number, "3116", $overtime50free, "", "", "", "", "", ""];
@@ -303,7 +303,7 @@ class TimerecordingBillingController extends mfBaseController
if ($timerecordingBillingEmployee->overtime100free > 64800) {
$bodyarray = [$monthbmd, "1", $employee_number, "3160", "18", "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
if ($timerecordingBillingEmployee->timerecordingEmployee->jobbike == 1) {
if ($timerecordingBillingEmployee->jobbike == 1) {
$bodyarray = [$monthbmd, "1", $employee_number, "3165", "18", "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
$bodyarray = [$monthbmd, "1", $employee_number, "3166", "18", "", "", "", "", "", ""];
@@ -318,7 +318,7 @@ class TimerecordingBillingController extends mfBaseController
} else {
$bodyarray = [$monthbmd, "1", $employee_number, "3160", $overtime100free, "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
if ($timerecordingBillingEmployee->timerecordingEmployee->jobbike == 1) {
if ($timerecordingBillingEmployee->jobbike == 1) {
$bodyarray = [$monthbmd, "1", $employee_number, "3165", $overtime100free, "", "", "", "", "", ""];
fputcsv($file, $bodyarray, ";");
$bodyarray = [$monthbmd, "1", $employee_number, "3166", $overtime100free, "", "", "", "", "", ""];
@@ -421,6 +421,7 @@ class TimerecordingBillingController extends mfBaseController
if ($export == 0) {
$reponse[$employee_number]['employee_id'] = $timerecordingsEmolyee->id;
$reponse[$employee_number]['user_id'] = $timerecordingsEmolyee->user_id;
$reponse[$employee_number]['jobbike'] = $timerecordingsEmolyee->jobbike;
$reponse[$employee_number]['homeoffice'] = $timerecording['time']['homeoffice'];
$reponse[$employee_number]['istimeall'] = $timerecording['time']['isorder'];
$reponse[$employee_number]['musttime'] = $timerecording['time']['mustorder'];
@@ -557,6 +558,7 @@ class TimerecordingBillingController extends mfBaseController
$data = [];
$data['timerecordingBilling_id'] = $id;
$data['timerecordingEmployee_id'] = $timerecording['employee_id'];
$data['jobbike'] = $timerecording['jobbike'];
$data['musthours'] = $timerecording['musttime'];
$data['overtime50'] = $timerecording['overtimes']['O50pfl'];
$data['overtime50free'] = $timerecording['overtimes']['O50free'];

1
application/TimerecordingBillingEmployee/TimerecordingBillingEmployeeModel.php
View File

@@ -20,6 +20,7 @@ class TimerecordingBillingEmployeeModel
private $nlz;
private $nlz_detail;
private $holidays;
private $jobbike;
private $transfer_plushours;
private $transfer_overtime;
private $transfer_bpahours;