Zeiterfassung
* Anpassungen für Conny Reports für Stichtagauswertungen
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user