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!1475
This commit is contained in:
Daniel Spitzer
2025-06-23 17:57:27 +00:00
parent c2562884cf 2e732505ab
commit 08780d53c4
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Layout/default/TimerecordingBilling/Overview.php
View File

@@ -41,6 +41,7 @@
<th class="text-center">Mitarbeiter</th>
<th class="text-center">LZ</th>
<th class="text-center">NLZ</th>
<th class="text-center">Urlaub</th>
<th class="text-center">LZ + NLZ</th>
<th class="text-center">Sollst.</th>
<th class="text-center">Sollabweichung</th>
@@ -61,6 +62,7 @@
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<th class="text-center"></th>
<?php if ($me->superexpertEnabled()): ?>
<th></th>
<?php endif; ?>
@@ -105,6 +107,7 @@
<td data-order="<?= $timerecordingbillingsemployee->timerecordingEmployee->user->name . $timerecordingbillingsemployee->timerecordingBilling->month ?>"><?= "(" . $employee_number . ") " . $timerecordingbillingsemployee->timerecordingEmployee->user->name ?></td>
<td class="text-center"><?= number_format(round($timerecordingbillingsemployee->ishours / 3600, 2), "2", ",", ".") ?></td>
<td class="text-center"><?= $nlz ?></td>
<td class="text-center"><?= $holidays[$timerecordingbillingsemployee->timerecordingEmployee->user_id] ?></td>
<td class="text-center"><?= number_format(round($timerecordingbillingsemployee->ishourssum / 3600, 2), "2", ",", ".") ?></td>
<td class="text-center"><?= number_format(round($timerecordingbillingsemployee->musthours / 3600, 2), "2", ",", ".") ?></td>
<td class="text-center"><?= number_format(round(($timerecordingbillingsemployee->ishourssum - $timerecordingbillingsemployee->musthours) / 3600, 2), "2", ",", ".") ?></td>

11
application/TimerecordingBilling/TimerecordingBillingController.php
View File

@@ -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 . "<br>";
echo $enddate. "<br>";
$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)