From b56007aae20bda3b2b8dfc2c0e6d4abee0102515 Mon Sep 17 00:00:00 2001
From: Leopold Strobl <leopold.strobl@vt-media.de>
Date: Thu, 6 Jun 2024 19:03:22 +0200
Subject: [PATCH] =?UTF-8?q?v1.4.2:=20Bugfix=20Progressbar,=20Datenquelle?=
 =?UTF-8?q?=20weg=20von=20der=20Packingnote,=20hin=20zum=20Job.=20EpiRent?=
 =?UTF-8?q?=20hat=20auch=20den=20"Total=20Items"=20Parameter=20im=20Packin?=
 =?UTF-8?q?gnote=20Endpunkt=20gel=C3=B6scht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Packmonitor.php              |  5 +++++
 sources/getCheckInTable.php  | 13 ++++++++-----
 sources/getCheckOutTable.php | 13 ++++++++-----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Packmonitor.php b/Packmonitor.php
index b9c2a1a..726a50c 100644
--- a/Packmonitor.php
+++ b/Packmonitor.php
@@ -1,4 +1,9 @@
 <?php
+
+
+error_reporting(E_ALL);
+
+
 require('config.php');
 require('EpiApi.php');
 require('vendor/autoload.php');
diff --git a/sources/getCheckInTable.php b/sources/getCheckInTable.php
index 6bc5a92..a3e86b9 100644
--- a/sources/getCheckInTable.php
+++ b/sources/getCheckInTable.php
@@ -1,5 +1,5 @@
 <?php
-
+error_reporting(E_ALL);
 require('../config.php');
 require('../EpiApi.php');
 
@@ -96,15 +96,18 @@ foreach ($data_output as $packingjob) {
            
             
             
-            if ($packingjob->is_all_in == 0) {
+            if ($orderdetail_output->amount_open_checkin==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 '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: '.(($orderdetail_output->amount_checkout - $orderdetail_output->amount_open_checkin)/$orderdetail_output->amount_checkout) *100 .'%" aria-valuenow="' . ($orderdetail_output->amount_checkout - $orderdetail_output->amount_open_checkin) . '" aria-valuemin="0" aria-valuemax="' . $orderdetail_output->amount_checkout . '"></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 ($orderdetail_output->amount_checkout - $orderdetail_output->amount_open_checkin) . "/" . $orderdetail_output->amount_checkout;
+            echo "</span><td>";
+            
             echo "</tr>";
         }
     }
diff --git a/sources/getCheckOutTable.php b/sources/getCheckOutTable.php
index c6f5cb8..604ce82 100644
--- a/sources/getCheckOutTable.php
+++ b/sources/getCheckOutTable.php
@@ -1,5 +1,5 @@
 <?php
-
+error_reporting(E_ALL);
 require('../config.php');
 require('../EpiApi.php');
 
@@ -92,15 +92,18 @@ foreach ($data_output as $packingjob) {
                 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) {
+        
+
+            if ($orderdetail_output->amount_open_checkout==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 '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: '.(($orderdetail_output->amount_packagingnote - $orderdetail_output->amount_open_checkout)/$orderdetail_output->amount_packagingnote) *100 .'%" aria-valuenow="' . ($orderdetail_output->amount_packagingnote - $orderdetail_output->amount_open_checkout) . '" aria-valuemin="0" aria-valuemax="' . $orderdetail_output->amount_packingnote . '"></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 ($orderdetail_output->amount_packagingnote - $orderdetail_output->amount_open_checkout) . "/" . $orderdetail_output->amount_packagingnote;
             echo "</span><td>";
             echo "</tr>";
         }