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

v1.3.0

Browse Source 
Feature: Filter, wie viele Tage zukünftig Check In / Check Out Angezeigt werden soll
This commit is contained in:
Leopold Strobl
2024-02-29 11:48:04 +01:00
parent 3bc9208c65
commit 8e4bbf130f
4 changed files with 120 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Packmonitor.php
View File

@@ -1,11 +1,9 @@
<?php <?php
require('config.php'); require('config.php');
require('EpiApi.php'); require('EpiApi.php');
require('vendor/autoload.php'); require('vendor/autoload.php');
$Epi = new Epirent(); $Epi = new Epirent();
?> ?>
@@ -30,25 +28,25 @@ $Epi = new Epirent();
<![endif]--> <![endif]-->
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function () {
refreshCheckOutTable(); refreshCheckOutTable();
refreshCheckInTable(); refreshCheckInTable();
}); });
function refreshCheckOutTable(){ function refreshCheckOutTable() {
$('#getCheckOutTableHolder').load('sources/getCheckOutTable.php', function(){ $('#getCheckOutTableHolder').load('sources/getCheckOutTable.php', function () {
setTimeout(refreshCheckOutTable, 5000); setTimeout(refreshCheckOutTable, 5000);
}); });
} }
function refreshCheckInTable(){ function refreshCheckInTable() {
$('#getCheckInTableHolder').load('sources/getCheckInTable.php', function(){ $('#getCheckInTableHolder').load('sources/getCheckInTable.php', function () {
setTimeout(refreshCheckInTable, 5000); setTimeout(refreshCheckInTable, 5000);
}); });
} }
</script> </script>
</head> </head>
<body style="background-color: black;"> <body style="background-color: black;">
@@ -56,7 +54,12 @@ $Epi = new Epirent();
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-lg"> <div class="col-lg">
<h2 class="text-light">Check-Out</h2> <h2 class="text-light">Check-Out
<?php
if (CheckOut_FutureDays != -1) {
echo "in den nächsten " . CheckOut_FutureDays . " Tagen";
}
?></h2>
<table class="table table-dark"> <table class="table table-dark">
<thead> <thead>
<tr> <tr>
@@ -77,7 +80,12 @@ $Epi = new Epirent();
</div> </div>
<div class="col-lg"> <div class="col-lg">
<h2 class="text-light">Check-In</h2> <h2 class="text-light">Check-In
<?php
if (CheckIn_FutureDays != -1) {
echo "in den nächsten " . CheckIn_FutureDays . " Tagen";
}
?></h2>
<table class="table table-dark"> <table class="table table-dark">
<thead> <thead>
<tr> <tr>

25
config.php
View File

@@ -1,20 +1,29 @@
<?php <?php
//EPIRENT CONNECTION EINSTELLUNGEN//
define('Epirent_Server', '10.10.18.12'); define('Epirent_Server', '10.10.18.12');
define('Epirent_Connectionprotocol', 'http'); define('Epirent_Connectionprotocol', 'http');
define('Epirent_Port', '8080'); define('Epirent_Port', '8080');
define('Epirent_Token', 'BCEF15F4DC1F2F448BA07E5364EDDAE3'); define('Epirent_Token', 'BCEF15F4DC1F2F448BA07E5364EDDAE3');
define('Epirent_Mandant', '2'); define('Epirent_Mandant', '2'); //NORMALERWEISE 0
//CREWBRAIN CONNECTION EINSTELLUNGEN-NUR AUSFÜLLEN WENN GEWÜNSCHT//
define('CrewBrain_Username', 'l.strobl'); define('CrewBrain_Username', 'l.strobl');
define('CrewBrain_password', '14032015'); define('CrewBrain_password', '14032015');
define('CrewBrain_Server', 'vt-media.crewbrain.com'); define('CrewBrain_Server', 'vt-media.crewbrain.com');
define('CrewBrain_Connectionprotocol', 'https'); define('CrewBrain_Connectionprotocol', 'https');
define('CrewBrain_TaskListID', 6); define('CrewBrain_TaskListID', 6);
//CREWBRAIN SPEZIFISCHE EINSTELLUNGEN (AUFGABENLISTE)//
define('Enable_QR_Code_CrewBrainAufgaben', true); define('Enable_QR_Code_CrewBrainAufgaben', true);
define('Enable_QR_Code_CheckOut', true);
define('Enable_QR_Code_CheckIn', true); //EPIRENT SPEZIFISCHE EINSTELLUNGEN (CHECK IN & CHECK OUT)
define('Vorbereitungs_Zeitvariable', 'Vorbereitung'); define('Enable_QR_Code_CheckOut', true); //Zeigt statt der Packscheinnummer einen Scanbaren QR Code für den CheckOut an
define('Rueckpacken_Zeitvariable', 'Rückpacken'); define('Enable_QR_Code_CheckIn', true); //Zeigt statt der Packscheinnummer einen Scanbaren QR Code für den CheckIn an
define('CheckOut_UseDispoStartForRowMarking', true); //else: Use Same Variable as "Vorbereitung Zeitvariable" define('Vorbereitungs_Zeitvariable', 'Vorbereitung'); //Name des zu verwendenden Zeitabschnitts, der Zusätzlich zur DispoZeit beim Check Out Angezeigt werden soll
define('CheckIn_UseDispoEndForRowMarking', true); //else: Use Same Variable as "Rueckpacken Zeitvariable" define('Rueckpacken_Zeitvariable', 'Rückpacken'); //Name des zu verwendenden Zeitabschnitts, der Zusätzlich zur DispoZeit beim Check In Angezeigt werden soll
define('CheckOut_UseDispoStartForRowMarking', true); //else: Use Same Variable as "Vorbereitung Zeitvariable" | Konfiguration, welche Zeit für die Zeilenmarkierung beim CheckOut Verwendet werden soll
define('CheckIn_UseDispoEndForRowMarking', true); //else: Use Same Variable as "Rueckpacken Zeitvariable" | Konfiguration, welche Zeit für die Zeilenmarkierung beim Check In Verwendet werden soll
define('CheckOut_FutureDays', -1); // Konfiguration, wie viele Tage in der Zukunft der CheckOut angezeigt werden soll. '-1' zeigt alle an. Abhängig von der Variablen CheckOut_UseDispoStartForRowMarking
define('CheckIn_FutureDays', -1); // Konfiguration, wie viele Tage in der Zukunft der CheckIn angezeigt werden soll. '-1' zeigt alle an. Abhängig von der Variablen CheckIn_UseDispoEndForRowMarking
?> ?>

12
sources/getCheckInTable.php
View File

@@ -10,6 +10,8 @@ use chillerlan\QRCode\{
require('../vendor/autoload.php'); require('../vendor/autoload.php');
$options = new QROptions([ $options = new QROptions([
'imageBase64' => false, 'imageBase64' => false,
'qrCodeHeight' => 75, 'qrCodeHeight' => 75,
@@ -50,7 +52,9 @@ foreach ($data_output as $packingjob) {
//End Of get Order Details //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); $date = new DateTime($packingjob->date_end);
} else { } else {
$date = new DateTime($NachbereitungsTimeDetail->date_start); $date = new DateTime($NachbereitungsTimeDetail->date_start);
@@ -58,6 +62,11 @@ foreach ($data_output as $packingjob) {
$date->setTime(0, 0, 0); $date->setTime(0, 0, 0);
$today = new DateTime(); $today = new DateTime();
$today->setTime(0, 0, 0); $today->setTime(0, 0, 0);
$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) { if ($date == $today) {
echo "<tr class='text-dark bg-warning'>"; echo "<tr class='text-dark bg-warning'>";
@@ -85,6 +94,7 @@ foreach ($data_output as $packingjob) {
} }
echo "</tr>"; echo "</tr>";
} }
}
} }
function getTimeFromSeconds(string $timestring) { function getTimeFromSeconds(string $timestring) {

10
sources/getCheckOutTable.php
View File

@@ -49,21 +49,22 @@ foreach ($data_output as $packingjob) {
$VorbereitungsTimeDetail = $scheduledetail; $VorbereitungsTimeDetail = $scheduledetail;
} }
} }
//End Of get Order Details //End Of get Order Details
if (CheckOut_UseDispoStartForRowMarking || ($VorbereitungsTimeDetail->date_start == null)) { if (CheckOut_UseDispoStartForRowMarking || ($VorbereitungsTimeDetail->date_start == null)) {
$date = new DateTime($packingjob->date_start); $date = new DateTime($packingjob->date_start);
} else { } else {
$date = new DateTime($VorbereitungsTimeDetail->date_start); $date = new DateTime($VorbereitungsTimeDetail->date_start);
} }
$date->setTime(0, 0, 0); $date->setTime(0, 0, 0);
$today = new DateTime(); $today = new DateTime();
$today->setTime(0, 0, 0); $today->setTime(0, 0, 0);
$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 ($date == $today) {
echo "<tr class='text-dark bg-warning'>"; echo "<tr class='text-dark bg-warning'>";
@@ -92,6 +93,7 @@ foreach ($data_output as $packingjob) {
} }
echo "</tr>"; echo "</tr>";
} }
}
} }
function getTimeFromSeconds(string $timestring) { function getTimeFromSeconds(string $timestring) {