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

See merge request fronk/thetool!1584
This commit is contained in:
Daniel Spitzer
2025-07-29 16:12:24 +00:00
parent 47a7e81473 3705789df4
commit 239ecffe1a
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Layout/default/TimerecordingReportExport/Index.php
View File

@@ -5,6 +5,12 @@
type="text/css"/>
<style>
.fa-triangle-exclamation {
font-size: 22px;
vertical-align: top;
color: red;
margin-right: 5px;
}
</style>
<!-- start page title -->
<div class="row">
@@ -36,7 +42,8 @@
<p>Hier wird eine XLS Auswertung pro Mitarbeiter generiert mit Urlaub, Mehrstunden und
Gutstunden
zum Stichtag X<br>
<b>Zur Zeit ist der Stichtag auf den letzten Tag des ausgewählten Monats gesetzt.</b><br>
<b><i class="fa-solid fa-triangle-exclamation"></i> Zur Zeit ist der Stichtag auf den
letzten Tag des ausgewählten Monats gesetzt.</b><br>
</p>
<div class="row">

5
application/TimerecordingReportExport/TimerecordingReportExportController.php
View File

@@ -104,8 +104,8 @@ class TimerecordingReportExportController extends mfBaseController
$sheet->setCellValue('B' . $row, $employee_number);
$sheet->setCellValue('C' . $row, $timerecordingbillingsemployee->timerecordingEmployee->user->name);
$sheet->setCellValue('D' . $row, $holidays[$timerecordingbillingsemployee->timerecordingEmployee->user_id]);
$sheet->setCellValue('E' . $row, number_format(round(($timerecordingbillingsemployee->plushours_all + $timerecordingbillingsemployee->transfer_plushours) / 3600, 2), "2", ",", "."));
$sheet->setCellValue('F' . $row, number_format(round(($timerecordingbillingsemployee->timerecordingEmployee->overtime_now + $overtimediff) / 3600, 2), "2", ",", "."));
$sheet->setCellValue('E' . $row, round(($timerecordingbillingsemployee->plushours_all + $timerecordingbillingsemployee->transfer_plushours) / 3600, 2));
$sheet->setCellValue('F' . $row, round(($timerecordingbillingsemployee->timerecordingEmployee->overtime_now + $overtimediff) / 3600, 2));
$oldEmployee_id = $timerecordingbillingsemployee->timerecordingEmployee_id;
$row++;
@@ -116,6 +116,7 @@ class TimerecordingReportExportController extends mfBaseController
$sheet->getStyle('A2:A' . $row)->getNumberFormat()->setFormatCode('@');
$sheet->getStyle('C2:C' . $row)->getNumberFormat()->setFormatCode($number_format_code);
$sheet->getStyle('E2:E' . $row)->getNumberFormat()->setFormatCode($number_format_code);
$sheet->getStyle('F2:F' . $row)->getNumberFormat()->setFormatCode($number_format_code);
$sheet->getStyle('G2:G' . $row)->getNumberFormat()->setFormatCode($number_format_code);
$sheet->getStyle('H2:H' . $row)->getNumberFormat()->setFormatCode($number_format_code);