From 8e4bbf130fdd63a4195f83a155da73f6cb1b0684 Mon Sep 17 00:00:00 2001 From: Leopold Strobl Date: Thu, 29 Feb 2024 11:48:04 +0100 Subject: [PATCH] =?UTF-8?q?v1.3.0=20Feature:=20Filter,=20wie=20viele=20Tag?= =?UTF-8?q?e=20zuk=C3=BCnftig=20Check=20In=20/=20Check=20Out=20Angezeigt?= =?UTF-8?q?=20werden=20soll?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Packmonitor.php | 66 ++++++++++++++++++++---------------- config.php | 25 +++++++++----- sources/getCheckInTable.php | 60 ++++++++++++++++++-------------- sources/getCheckOutTable.php | 60 ++++++++++++++++---------------- 4 files changed, 120 insertions(+), 91 deletions(-) diff --git a/Packmonitor.php b/Packmonitor.php index ec9a298..9f4a031 100644 --- a/Packmonitor.php +++ b/Packmonitor.php @@ -1,11 +1,9 @@ @@ -21,42 +19,47 @@ $Epi = new Epirent(); - + - - - + +
-

Check-Out

+

Check-Out +

@@ -68,7 +71,7 @@ $Epi = new Epirent(); - +
@@ -77,7 +80,12 @@ $Epi = new Epirent();
-

Check-In

+

Check-In +

@@ -88,8 +96,8 @@ $Epi = new Epirent(); - - + +
Dispo-Ende
RP-Ende
diff --git a/config.php b/config.php index 80b318e..22ad038 100644 --- a/config.php +++ b/config.php @@ -1,20 +1,29 @@ diff --git a/sources/getCheckInTable.php b/sources/getCheckInTable.php index 822608e..65d40eb 100644 --- a/sources/getCheckInTable.php +++ b/sources/getCheckInTable.php @@ -10,6 +10,8 @@ use chillerlan\QRCode\{ require('../vendor/autoload.php'); + + $options = new QROptions([ 'imageBase64' => false, 'qrCodeHeight' => 75, @@ -50,7 +52,9 @@ foreach ($data_output as $packingjob) { //End Of get Order Details - if (CheckIn_UseDispoEndForRowMarking || ($NachbereitungsTimeDetail->date_start==null)) { + + + if (CheckIn_UseDispoEndForRowMarking || ($NachbereitungsTimeDetail->date_start == null)) { $date = new DateTime($packingjob->date_end); } else { $date = new DateTime($NachbereitungsTimeDetail->date_start); @@ -58,32 +62,38 @@ foreach ($data_output as $packingjob) { $date->setTime(0, 0, 0); $today = new DateTime(); $today->setTime(0, 0, 0); - if ($date == $today) { + $todayFilter = new DateTime(); + $todayFilter->setTime(0,0,0); + if (CheckIn_FutureDays == -1 || $date <= ($todayFilter->modify('+'.CheckIn_FutureDays.' day'))) { + //prüfe, ob entweder unbegrenzte (-1) Anzeige Aktiv ist, oder das Datum kleiner oder Gleich heute + Zukunftsspanne ist + + if ($date == $today) { - echo ""; - } else if ($date < $today) { - echo ""; - } else { - echo ""; + echo ""; + } else if ($date < $today) { + echo ""; + } else { + echo ""; + } + if (Enable_QR_Code_CheckIn) { + echo "" . '
' . (new QRCode($options))->render($packingjob->packingnote_no) . "
"; + } else { + echo "" . $packingjob->packingnote_no . ""; + } + echo "" . $packingjob->contact->name . ""; + echo "" . $packingjob->event . ""; + if ($NachbereitungsTimeDetail->date_start != null) { + echo "" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . "
" . date_format(new \DateTime($NachbereitungsTimeDetail->date_start), 'd.m.Y') . " " . getTimeFromSeconds($NachbereitungsTimeDetail->time_start) . ""; + } else { + echo "" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . ""; + } + if ($NachbereitungsTimeDetail->date_end != null) { + echo "" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . "
" . date_format(new \DateTime($NachbereitungsTimeDetail->date_end), 'd.m.Y') . " " . getTimeFromSeconds($NachbereitungsTimeDetail->time_end) . ""; + } else { + echo "" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . ""; + } + echo ""; } - if (Enable_QR_Code_CheckIn) { - echo "" . '
' . (new QRCode($options))->render($packingjob->packingnote_no) . "
"; - } else { - echo "" . $packingjob->packingnote_no . ""; - } - echo "" . $packingjob->contact->name . ""; - echo "" . $packingjob->event . ""; - if ($NachbereitungsTimeDetail->date_start != null) { - echo "" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . "
" . date_format(new \DateTime($NachbereitungsTimeDetail->date_start), 'd.m.Y') . " " . getTimeFromSeconds($NachbereitungsTimeDetail->time_start) . ""; - } else { - echo "" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . ""; - } - if ($NachbereitungsTimeDetail->date_end != null) { - echo "" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . "
" . date_format(new \DateTime($NachbereitungsTimeDetail->date_end), 'd.m.Y') . " " . getTimeFromSeconds($NachbereitungsTimeDetail->time_end) . ""; - } else { - echo "" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . ""; - } - echo ""; } } diff --git a/sources/getCheckOutTable.php b/sources/getCheckOutTable.php index 6f6397e..1051fcb 100644 --- a/sources/getCheckOutTable.php +++ b/sources/getCheckOutTable.php @@ -49,48 +49,50 @@ foreach ($data_output as $packingjob) { $VorbereitungsTimeDetail = $scheduledetail; } } - - //End Of get Order Details if (CheckOut_UseDispoStartForRowMarking || ($VorbereitungsTimeDetail->date_start == null)) { $date = new DateTime($packingjob->date_start); - } else { $date = new DateTime($VorbereitungsTimeDetail->date_start); - } - + $date->setTime(0, 0, 0); $today = new DateTime(); $today->setTime(0, 0, 0); - if ($date == $today) { - echo ""; - } else if ($date < $today) { - echo ""; - } else { - echo ""; - } + $todayFilter = new DateTime(); + $todayFilter->setTime(0, 0, 0); + if (CheckOut_FutureDays == -1 || $date <= ($todayFilter->modify('+' . CheckOut_FutureDays . ' day'))) { + //prüfe, ob entweder unbegrenzte (-1) Anzeige Aktiv ist, oder das Datum kleiner oder Gleich heute + Zukunftsspanne ist + if ($date == $today) { - if (Enable_QR_Code_CheckOut) { - echo "" . '
' . (new QRCode($options))->render($packingjob->packingnote_no) . "
"; - } else { - echo "" . $packingjob->packingnote_no . ""; + echo ""; + } else if ($date < $today) { + echo ""; + } else { + echo ""; + } + + if (Enable_QR_Code_CheckOut) { + echo "" . '
' . (new QRCode($options))->render($packingjob->packingnote_no) . "
"; + } else { + echo "" . $packingjob->packingnote_no . ""; + } + echo "" . $packingjob->contact->name . ""; + echo "" . $packingjob->event . ""; + if ($VorbereitungsTimeDetail->date_start != null) { + echo "" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . "
" . date_format(new \DateTime($VorbereitungsTimeDetail->date_start), 'd.m.Y') . " " . getTimeFromSeconds($VorbereitungsTimeDetail->time_start) . ""; + } else { + echo "" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . ""; + } + if ($VorbereitungsTimeDetail->date_end != null) { + echo "" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . "
" . date_format(new \DateTime($VorbereitungsTimeDetail->date_end), 'd.m.Y') . " " . getTimeFromSeconds($VorbereitungsTimeDetail->time_end) . ""; + } else { + echo "" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . ""; + } + echo ""; } - echo "" . $packingjob->contact->name . ""; - echo "" . $packingjob->event . ""; - if ($VorbereitungsTimeDetail->date_start != null) { - echo "" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . "
" . date_format(new \DateTime($VorbereitungsTimeDetail->date_start), 'd.m.Y') . " " . getTimeFromSeconds($VorbereitungsTimeDetail->time_start) . ""; - } else { - echo "" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . ""; - } - if ($VorbereitungsTimeDetail->date_end != null) { - echo "" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . "
" . date_format(new \DateTime($VorbereitungsTimeDetail->date_end), 'd.m.Y') . " " . getTimeFromSeconds($VorbereitungsTimeDetail->time_end) . ""; - } else { - echo "" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . ""; - } - echo ""; } }