From 31ae18b8a0887ddae9377cbaa24ca91753951648 Mon Sep 17 00:00:00 2001
From: Leopold Strobl <leopold.strobl@vt-media.de>
Date: Sat, 23 Mar 2024 15:49:15 +0100
Subject: [PATCH] v1.4.0: Progressbar v1.4.1: Bugfix Progressbar

---
 Packmonitor.php              |  2 ++
 sources/getCheckInTable.php  | 19 ++++++++++++++++---
 sources/getCheckOutTable.php | 11 +++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/Packmonitor.php b/Packmonitor.php
index 9f4a031..b9c2a1a 100644
--- a/Packmonitor.php
+++ b/Packmonitor.php
@@ -68,6 +68,7 @@ $Epi = new Epirent();
                                 <th scope="col">Event</th>
                                 <th scope="col">Dispo-Start<br><i>VB-Start</i></th>
                                 <th scope="col">Dispo-Ende<br><i>VB-Ende</i></th>
+                                <th scope="col">Status</th>
                             </tr>
                         </thead>
                         <tbody id="getCheckOutTableHolder">
@@ -94,6 +95,7 @@ $Epi = new Epirent();
                                 <th scope="col">Event</th>
                                 <th scope="col">Dispo-Start<br><i>RP-Start</i></th>
                                 <th scope="col">Dispo-Ende<br><i>RP-Ende</i></th>
+                                 <th scope="col">Status</th>
                             </tr>
                         </thead>
                         <tbody id="getCheckInTableHolder">
diff --git a/sources/getCheckInTable.php b/sources/getCheckInTable.php
index 65d40eb..6bc5a92 100644
--- a/sources/getCheckInTable.php
+++ b/sources/getCheckInTable.php
@@ -63,10 +63,10 @@ foreach ($data_output as $packingjob) {
         $today = new DateTime();
         $today->setTime(0, 0, 0);
         $todayFilter = new DateTime();
-        $todayFilter->setTime(0,0,0);
-        if (CheckIn_FutureDays == -1 || $date <= ($todayFilter->modify('+'.CheckIn_FutureDays.' day'))) {
+        $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 "<tr class='text-dark bg-warning'>";
@@ -92,6 +92,19 @@ foreach ($data_output as $packingjob) {
             } else {
                 echo "<td>" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . "</td>";
             }
+            echo "<td>";
+           
+            
+            
+            if ($packingjob->is_all_in == 0) {
+                echo "<span class='badge badge-success'>";
+            } else {
+                
+                echo '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: '.((($packingjob->ps_parameters->result->total_pieces-abs($packingjob->is_all_out))-abs($packingjob->is_all_in)) /($packingjob->ps_parameters->result->total_pieces - abs($packingjob->is_all_out)))*100 .'%" aria-valuenow="' . ($packingjob->ps_parameters->result->total_pieces-abs($packingjob->is_all_out)) . '" aria-valuemin="0" aria-valuemax="' . $packingjob->ps_parameters->result->total_pieces - abs($packingjob->is_all_out) . '"></div></div>';
+
+                echo "<span class='badge badge-info'>";
+            }
+            echo (($packingjob->ps_parameters->result->total_pieces-abs($packingjob->is_all_out))-abs($packingjob->is_all_in)) . "/" . $packingjob->ps_parameters->result->total_pieces - abs($packingjob->is_all_out). " (".$packingjob->ps_parameters->result->total_pieces.")" ;
             echo "</tr>";
         }
     }
diff --git a/sources/getCheckOutTable.php b/sources/getCheckOutTable.php
index 1051fcb..c6f5cb8 100644
--- a/sources/getCheckOutTable.php
+++ b/sources/getCheckOutTable.php
@@ -91,6 +91,17 @@ foreach ($data_output as $packingjob) {
             } else {
                 echo "<td>" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . "</td>";
             }
+            echo "<td>";
+            
+            if ($packingjob->is_all_out == 0) {
+                echo "<span class='badge badge-success'>";
+            } else {
+                echo '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: '.(($packingjob->ps_parameters->result->total_pieces - abs($packingjob->is_all_out))/$packingjob->ps_parameters->result->total_pieces)*100 .'%" aria-valuenow="' . ($packingjob->ps_parameters->result->total_pieces - abs($packingjob->is_all_out)) . '" aria-valuemin="0" aria-valuemax="' . $packingjob->ps_parameters->result->total_pieces . '"></div></div>';
+
+                echo "<span class='badge badge-info'>";
+            }
+            echo ($packingjob->ps_parameters->result->total_pieces - abs($packingjob->is_all_out)) . "/" . $packingjob->ps_parameters->result->total_pieces;
+            echo "</span><td>";
             echo "</tr>";
         }
     }