epi/EpiWebview
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

DispoTimeDetail Objekt nicht sauber übergeben an die RowMark Methode

Browse Source
This commit is contained in:
Leopold Strobl
2025-10-28 13:34:06 +01:00
parent 5a88d0780a
commit feb4be6621
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/getCheckInTable.php
View File

@@ -59,6 +59,7 @@ function resolveRowMarkDateCheckIn(
$NachbereitungsTimeDetail, $NachbereitungsTimeDetail,
$RePackagingTimeDetail, $RePackagingTimeDetail,
$PackingNoteDetail, $PackingNoteDetail,
$DispoTimeDetail,
int $source int $source
): ?DateTimeImmutable { ): ?DateTimeImmutable {
$candidate = null; $candidate = null;
@@ -67,7 +68,7 @@ function resolveRowMarkDateCheckIn(
case 2: $candidate = dt($NachbereitungsTimeDetail->date_start ?? null); break; case 2: $candidate = dt($NachbereitungsTimeDetail->date_start ?? null); break;
case 3: $candidate = dt($RePackagingTimeDetail->date_start ?? null); break; case 3: $candidate = dt($RePackagingTimeDetail->date_start ?? null); break;
case 4: $candidate = dt($PackingNoteDetail->date_redelivery ?? null); break; case 4: $candidate = dt($PackingNoteDetail->date_redelivery ?? null); break;
case 5: $candidate = dt($DispoTimeDetail->date_end ?? null); break; case 5: $candidate = dt($DispoTimeDetail->date_end ?? null); break;
default: $candidate = null; break; default: $candidate = null; break;
} }
@@ -151,6 +152,7 @@ foreach ($data_output as $packingjob) {
$NachbereitungsTimeDetail, $NachbereitungsTimeDetail,
$RePackagingTimeDetail, $RePackagingTimeDetail,
$PackingNoteDetail, $PackingNoteDetail,
$DispoTimeDetail,
$source $source
); );

4
sources/getCheckOutTable.php
View File

@@ -39,7 +39,7 @@ function dayStart(DateTimeImmutable $d): DateTimeImmutable {
return $d->setTime(0, 0, 0); return $d->setTime(0, 0, 0);
} }
function resolveRowMarkDate($packingjob, $VorbereitungsTimeDetail, $PackingNoteDetail, int $source): ?DateTimeImmutable { function resolveRowMarkDate($packingjob, $VorbereitungsTimeDetail, $PackingNoteDetail, $DispoTimeDetail, int $source): ?DateTimeImmutable {
$candidate = null; $candidate = null;
switch ($source) { switch ($source) {
case 1: $candidate = dt($packingjob->date_start ?? null); case 1: $candidate = dt($packingjob->date_start ?? null);
@@ -152,7 +152,7 @@ if (
$limit = $todayFilter->modify('+' . (int) CheckOut_FutureDays . ' day'); $limit = $todayFilter->modify('+' . (int) CheckOut_FutureDays . ' day');
} }
$markDate = resolveRowMarkDate($packingjob, $VorbereitungsTimeDetail, $PackingNoteDetail, (int) CheckOutRowMarkSource); $markDate = resolveRowMarkDate($packingjob, $VorbereitungsTimeDetail, $PackingNoteDetail, $DispoTimeDetail, (int) CheckOutRowMarkSource);
if (CheckOut_FutureDays == -1 || ($markDate && $markDate <= $limit)) { if (CheckOut_FutureDays == -1 || ($markDate && $markDate <= $limit)) {
$trClass = rowClassForDate($markDate, $today); $trClass = rowClassForDate($markDate, $today);