diff --git a/Layout/default/TimerecordingBilling/Overview.php b/Layout/default/TimerecordingBilling/Overview.php
index 31cc71f21..56323c3be 100644
--- a/Layout/default/TimerecordingBilling/Overview.php
+++ b/Layout/default/TimerecordingBilling/Overview.php
@@ -41,6 +41,7 @@
Mitarbeiter |
LZ |
NLZ |
+ Urlaub |
LZ + NLZ |
Sollst. |
Sollabweichung |
@@ -61,6 +62,7 @@
|
|
|
+ |
superexpertEnabled()): ?>
|
@@ -105,6 +107,7 @@
= "(" . $employee_number . ") " . $timerecordingbillingsemployee->timerecordingEmployee->user->name ?> |
= number_format(round($timerecordingbillingsemployee->ishours / 3600, 2), "2", ",", ".") ?> |
= $nlz ?> |
+ = $holidays[$timerecordingbillingsemployee->timerecordingEmployee->user_id] ?> |
= number_format(round($timerecordingbillingsemployee->ishourssum / 3600, 2), "2", ",", ".") ?> |
= number_format(round($timerecordingbillingsemployee->musthours / 3600, 2), "2", ",", ".") ?> |
= number_format(round(($timerecordingbillingsemployee->ishourssum - $timerecordingbillingsemployee->musthours) / 3600, 2), "2", ",", ".") ?> |
diff --git a/application/TimerecordingBilling/TimerecordingBillingController.php b/application/TimerecordingBilling/TimerecordingBillingController.php
index 118e0995a..6ea03fe6c 100644
--- a/application/TimerecordingBilling/TimerecordingBillingController.php
+++ b/application/TimerecordingBilling/TimerecordingBillingController.php
@@ -42,9 +42,20 @@ class TimerecordingBillingController extends mfBaseController
{
$timerecordingBillings = TimerecordingBillingModel::getAll();
$timerecordingBillingsEmployees = TimerecordingBillingEmployeeModel::getAllOrderbyNameDate();
+
+ $timerecordingemployees = TimerecordingEmployeeModel::getAll();
+ $enddate = strtotime("2024-12-31 23:59:59");
+ foreach ($timerecordingemployees as $timerecordingemployee) {
+ if ($timerecordingemployee->bmd_active == 0 && empty($timerecordingemployee->startdate) && empty($timerecordingemployee->enddate)) continue;
+ echo $timerecordingemployee->user_id . "
";
+ echo $enddate. "
";
+ $holidays[$timerecordingemployee->user_id] = $this->getholidays($timerecordingemployee->user_id, $enddate);
+ }
$this->layout()->setTemplate("TimerecordingBilling/Overview");
$this->layout()->set("timerecordingbillings", $timerecordingBillings);
+
$this->layout()->set("timerecordingbillingsemployees", $timerecordingBillingsEmployees);
+ $this->layout()->set("holidays", $holidays);
}
protected function detailClosedAction($timerecordingBilling)