janis/system0-2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing bugs in new overview

Browse Source
This commit is contained in:
Janis Steiner
2024-12-08 12:30:36 +00:00
parent 82ee0186bc
commit d365995ba6
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sys0-code/test/fetch_printer_data.php
View File

@@ -29,11 +29,11 @@ function short_path($filePath, $firstCharsCount, $lastCharsCount) {
} }
$printers = []; $printers = [];
$sql = "SELECT rotation, free, id, printer_url, apikey, cancel, used_by_userid, system_status, color FROM printer"; $sql = "SELECT rotation, free, printer.id, printer_url, apikey, cancel, used_by_userid, system_status, printer.color, COALESCE(name, 'nicht verfügbar') AS real_color, COALESCE(username,'nicht verfügbar') FROM printer LEFT JOIN filament ON printer.color=internal_id LEFT JOIN users ON used_by_userid=users.id";
$stmt = mysqli_prepare($link, $sql); $stmt = mysqli_prepare($link, $sql);
mysqli_stmt_execute($stmt); mysqli_stmt_execute($stmt);
mysqli_stmt_store_result($stmt); mysqli_stmt_store_result($stmt);
mysqli_stmt_bind_result($stmt, $rotation, $is_free, $printer_id, $url, $apikey, $cancel, $userid, $system_status, $filament_color); mysqli_stmt_bind_result($stmt, $rotation, $is_free, $printer_id, $url, $apikey, $cancel, $userid, $system_status, $filament_color,$real_color,$used_by_user);
while (mysqli_stmt_fetch($stmt)) { while (mysqli_stmt_fetch($stmt)) {
$printer = [ $printer = [
@@ -44,7 +44,8 @@ while (mysqli_stmt_fetch($stmt)) {
"cancel" => $cancel, "cancel" => $cancel,
"userid" => $userid, "userid" => $userid,
"system_status" => $system_status, "system_status" => $system_status,
"filament_color" => $filament_color, "filament_color" => $real_color,
"username" => $used_by_user
]; ];
if ($is_free == 0 && $system_status == 0 && $cancel==0) { if ($is_free == 0 && $system_status == 0 && $cancel==0) {

2
sys0-code/test/overview.php
View File

@@ -403,7 +403,7 @@ function getColorByStatus(status) {
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
fetchPrinterData(); fetchPrinterData();
setInterval(fetchPrinterData, 60000); // Refresh every 60 seconds setInterval(fetchPrinterData, 6000); // Refresh every 6 seconds
}); });
</script> </script>