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

v1.4.2: Bugfix Progressbar, Datenquelle weg von der Packingnote, hin zum Job. EpiRent hat auch den "Total Items" Parameter im Packingnote Endpunkt gelöscht

Browse Source
This commit is contained in:
Leopold Strobl
2024-06-06 19:03:22 +02:00
parent 31ae18b8a0
commit b56007aae2
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Packmonitor.php
View File

@@ -1,4 +1,9 @@
<?php
error_reporting(E_ALL);
require('config.php');
require('EpiApi.php');
require('vendor/autoload.php');

13
sources/getCheckInTable.php
View File

@@ -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>";
}
}

13
sources/getCheckOutTable.php
View File

@@ -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>";
}