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 
Kalender Anpassungen

See merge request fronk/thetool!1450
This commit is contained in:
Daniel Spitzer
2025-06-12 09:13:10 +00:00
parent d254ffe762 a9a4b87a01
commit 80adb96253
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/TimerecordingReport/TimerecordingReportController.php
+20 -1
View File
@@ -427,7 +427,7 @@ class TimerecordingReportController extends mfBaseController
data-mileagestart="' . $timerecording->mileage_start . '" data-mileagestart="' . $timerecording->mileage_start . '"
data-mileageend="' . $timerecording->mileage_end . '" data-mileageend="' . $timerecording->mileage_end . '"
title="Bearbeiten"></i>'; title="Bearbeiten"></i>';
else : elseif ($timerecording->timerecordingCategory->hourday == 2) :
$edit .= '<i class="far fa-edit edit-button" data-id="' . $timerecording->id . '" $edit .= '<i class="far fa-edit edit-button" data-id="' . $timerecording->id . '"
data-date="' . $datadate . '" data-date="' . $datadate . '"
data-category="' . $timerecording->timerecordingCategory->id . '" data-category="' . $timerecording->timerecordingCategory->id . '"
@@ -444,6 +444,25 @@ class TimerecordingReportController extends mfBaseController
data-mileagestart="' . $timerecording->mileage_start . '" data-mileagestart="' . $timerecording->mileage_start . '"
data-mileageend="' . $timerecording->mileage_end . '" data-mileageend="' . $timerecording->mileage_end . '"
title="Bearbeiten"></i>'; title="Bearbeiten"></i>';
elseif ($timerecording->timerecordingCategory->hourday == 6) :
$edit .= '<i class="far fa-edit edit-button" data-id="' . $timerecording->id . '"
data-date="' . $datadate . '"
data-category="' . $timerecording->timerecordingCategory->id . '"
data-start="' . $start . '"
data-end="' . $end . '"
data-enddate="' . $enddate . '"
data-comment="' . $timerecording->comment . '"
data-userid="' . $timerecording->user_id . '"
data-businesstrip="' . $timerecording->businesstrip . '"
data-businesstripinfo="' . $timerecording->businesstrip_info . '"
data-homeoffice="' . $timerecording->homeoffice . '"
data-days="' . $ddays . '"
data-car="' . $timerecording->timerecordingCar_id . '"
data-mileagestart="' . $timerecording->mileage_start . '"
data-mileageend="' . $timerecording->mileage_end . '"
title="Bearbeiten"></i>';
else :
$edit .= '<div class="edit-placeholder"></div>';
endif; endif;
$edit .= '<i data-id="' . $timerecording->id . '" class="fas fa-trash text-danger delete-item" ></i>'; $edit .= '<i data-id="' . $timerecording->id . '" class="fas fa-trash text-danger delete-item" ></i>';
endif; endif;