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

Feature: Packdatum/Vorbereitungsdatum wird Grün und nicht mehr überfällig wenn alle Geräte ausgecheckt wurden

Browse Source
This commit is contained in:
Leopold Strobl
2025-10-23 09:51:02 +02:00
parent 20805c11db
commit 345d22958f
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
nbproject/private/private.xml
View File

@@ -3,22 +3,33 @@
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group> <group>
<file>file:/C:/xampp/htdocs/EpiWebview/sources/getCheckOutCards.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/dist/index.html</file>
<file>file:/C:/xampp/htdocs/EpiWebview/.git/config</file> <file>file:/C:/xampp/htdocs/EpiWebview/.git/config</file>
<file>file:/C:/xampp/htdocs/EpiWebview/PackAufgabenMonitor.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/sources/getSidenav.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/dist/index.php</file> <file>file:/C:/xampp/htdocs/EpiWebview/dist/index.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/sources/getOrderDetails.php</file> <file>file:/C:/xampp/htdocs/EpiWebview/sources/getOrderDetails.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/config.php</file> <file>file:/C:/xampp/htdocs/EpiWebview/dist/css/styles.css</file>
<file>file:/C:/xampp/htdocs/EpiWebview/EpiApi.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/sources/getOrders.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/Aufgabenmonitor.php</file> <file>file:/C:/xampp/htdocs/EpiWebview/Aufgabenmonitor.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/dist/editconfig.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/composer.json</file> <file>file:/C:/xampp/htdocs/EpiWebview/composer.json</file>
<file>file:/C:/xampp/htdocs/EpiWebview/sources/getCheckInTable.php</file> <file>file:/C:/xampp/htdocs/EpiWebview/sources/getCheckInTable.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/CrewbrainApi.php</file> <file>file:/C:/xampp/htdocs/EpiWebview/CrewbrainApi.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/example.config.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/composer.lock</file> <file>file:/C:/xampp/htdocs/EpiWebview/composer.lock</file>
<file>file:/C:/xampp/htdocs/EpiWebview/info.php</file> <file>file:/C:/xampp/htdocs/EpiWebview/info.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/Packmonitor.php</file> <file>file:/C:/xampp/htdocs/EpiWebview/Packmonitor.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/index.php</file> <file>file:/C:/xampp/htdocs/EpiWebview/index.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/.gitignore</file>
<file>file:/C:/xampp/htdocs/EpiWebview/PackAufgabenMonitor.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/sources/getSidenav.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/README.MD</file>
<file>file:/C:/xampp/htdocs/EpiWebview/config.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/EpiApi.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/sources/getOrders.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/sources/getCheckInCards.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/dist/orders.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/LICENSE.MD</file>
<file>file:/C:/xampp/htdocs/EpiWebview/vendor/autoload.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/sources/getAufgabenTable.php</file> <file>file:/C:/xampp/htdocs/EpiWebview/sources/getAufgabenTable.php</file>
<file>file:/C:/xampp/htdocs/EpiWebview/sources/getCheckOutTable.php</file> <file>file:/C:/xampp/htdocs/EpiWebview/sources/getCheckOutTable.php</file>
</group> </group>

19
sources/getCheckOutTable.php
View File

@@ -175,13 +175,30 @@ if (
if (ShowCheckoutTimeOnCheckout) { if (ShowCheckoutTimeOnCheckout) {
echo "<br>"; echo "<br>";
} }
echoMarkedTimeLine($VorbereitungsTimeDetail->date_start, (int) $VorbereitungsTimeDetail->time_start, $today, ShowTimesOnCheckout);
if($packingjob->is_all_out != 0){
echoMarkedTimeLine($VorbereitungsTimeDetail->date_start, (int) $VorbereitungsTimeDetail->time_start, $today, ShowTimesOnCheckout);
}else{
echo "<span class='bg-success text-light'>";
echo date_format(new \DateTime($VorbereitungsTimeDetail->date_start), 'd.m.Y');
if($VorbereitungsTimeDetail->time_start){echo " ".getTimeFromSeconds((string) $VorbereitungsTimeDetail->time_start);}
echo "</span>";
}
} }
if (ShowPackagingTimeOnCheckout && $PackingNoteDetail && $PackingNoteDetail->date_packing != null) { if (ShowPackagingTimeOnCheckout && $PackingNoteDetail && $PackingNoteDetail->date_packing != null) {
if (ShowCheckoutTimeOnCheckout || ShowVorbereitungTimeOnCheckout) { if (ShowCheckoutTimeOnCheckout || ShowVorbereitungTimeOnCheckout) {
echo "<br>"; echo "<br>";
} }
if($packingjob->is_all_out != 0){
echoMarkedTimeLine($PackingNoteDetail->date_packing, (int) $PackingNoteDetail->time_packing, $today, ShowTimesOnCheckout); echoMarkedTimeLine($PackingNoteDetail->date_packing, (int) $PackingNoteDetail->time_packing, $today, ShowTimesOnCheckout);
}else{
echo "<span class='bg-success text-light'>";
echo date_format(new \DateTime($PackingNoteDetail->date_packing), 'd.m.Y');
if($PackingNoteDetail->time_packing){echo " ".getTimeFromSeconds((string) $PackingNoteDetail->time_packing);}
echo "</span>";
}
} }
if (ShowDeliveryTimeOnCheckout && $PackingNoteDetail && $PackingNoteDetail->date_delivery != null) { if (ShowDeliveryTimeOnCheckout && $PackingNoteDetail && $PackingNoteDetail->date_delivery != null) {
if (ShowCheckoutTimeOnCheckout || ShowVorbereitungTimeOnCheckout || ShowPackagingTimeOnCheckout) { if (ShowCheckoutTimeOnCheckout || ShowVorbereitungTimeOnCheckout || ShowPackagingTimeOnCheckout) {