From f05d3cfe52b2e66b2cd1a3487ffd521a02bb3274 Mon Sep 17 00:00:00 2001
From: root <root@ksw3dserver>
Date: Sun, 22 Dec 2024 09:48:20 +0000
Subject: [PATCH] fixing some display

---
 sys0-code/api/fetch_printer_data.php |  4 +-
 sys0-code/app/overview.php           | 57 +++++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/sys0-code/api/fetch_printer_data.php b/sys0-code/api/fetch_printer_data.php
index e2983d5..b7a88b9 100644
--- a/sys0-code/api/fetch_printer_data.php
+++ b/sys0-code/api/fetch_printer_data.php
@@ -98,9 +98,11 @@ while (mysqli_stmt_fetch($stmt)) {
         	$printer["print_time_total"] = seconds_to_time(intval($json["job"]["estimatedPrintTime"]));
         	$printer["print_time_left"] = seconds_to_time(intval($json["progress"]["printTimeLeft"]));
         	$printer["print_time"] = seconds_to_time(intval($json["progress"]["printTime"]));
-		$printer["view"]=0;
+		$printer["view"]=5;
 		//insert into db that this one is printing
 		$sql="UPDATE printer SET system_status=99 WHERE id = $printer_id";
+		$stmt = mysqli_prepare($link, $sql);
+		mysqli_stmt_execute($stmt);
 	}else{
 		$printer["print_status"]="Bereit";
         	$printer["view"]=3;
diff --git a/sys0-code/app/overview.php b/sys0-code/app/overview.php
index b90d1cf..b097907 100644
--- a/sys0-code/app/overview.php
+++ b/sys0-code/app/overview.php
@@ -252,7 +252,9 @@ function updatePrinterData(data) {
 		printerStatus = 'Bereit';
 	}else if(printer.view==4){
 		printerStatus = 'Problem / Nicht betriebsbereit';
-	}
+	}else if(printer.view==4){
+                printerStatus = 'Von anderer Quelle aus gestartet';
+        }
 
         if(printer.view==0 || printer.view==2){
 		if(own_id==printer.userid || cancel_all=="1"){
@@ -382,6 +384,55 @@ function updatePrinterData(data) {
                                         </table>
                                 </div>
                         `;
+	}else if(printer.view==5){
+		if(cancel_all=="1"){
+                        printerCard.innerHTML = `
+                            <div class="card-body">
+                                <h5 class="card-title">Drucker ${printer.printer_id}</h5>
+                            </div>
+                            <div class="card-body">
+                                <iframe height="230px" scrolling="no" width="100%" src="/app/webcam.php?printer_id=${printer.printer_id}&username=<?php echo($username); ?>&url=${printer.url}"></iframe>
+                                <div class="progress">
+                                    <div class="progress-bar" role="progressbar" style="width: ${printer.progress}%" aria-valuenow="${printer.progress}" aria-valuemin="0" aria-valuemax="100">${printer.progress}%</div>
+                                </div>
+                                <table class="table table-borderless">
+                                    <thead>
+                                        <tr><td>Status</td><td style="color: ${getColorByStatus(printer.view)}">${printerStatus}</td></tr>
+                                        <tr><td>Genutzt von</td><td>Externer Nutzer</td></tr>
+                                        <tr><td>Filamentfarbe</td><td>${printer.filament_color}</td></tr>
+                                        <tr><td>Erwartete Druckzeit</td><td>${printer.print_time_total}</td></tr>
+                                        <tr><td>Verbleibende Druckzeit</td><td>${printer.print_time_left}</td></tr>
+                                        <tr><td>Vergangene Druckzeit</td><td>${printer.print_time}</td></tr>
+                                        <tr><td>Datei</td><td><div class='hover-element'>${printer.file}<div class='description'>${printer.full_file}</div></div></td></tr>
+                                    </thead>
+                                        <tr><td><a class='btn btn-success' href='overview.php?free=${printer.printer_id}&rid=<?php echo($_SESSION["rid"]); ?>'>Freigeben</a></td></tr>
+                                </table>
+                            </div>
+                        `;
+                }else{
+                        printerCard.innerHTML = `
+                                <div class="card-body">
+                                        <h5 class="card-title">Drucker ${printer.printer_id}</h5>
+                                </div>
+                                <div class="card-body">
+                                        <iframe height="230px" scrolling="no" width="100%" src="/app/webcam.php?printer_id=${printer.printer_id}&username=<?php echo($username); ?>&url=${printer.url}"></iframe>
+                                        <div class="progress">
+                                                <div class="progress-bar" role="progressbar" style="width: ${printer.progress}%" aria-valuenow="${printer.progress}" aria-valuemin="0" aria-valuemax="100">${printer.progress}%</div>
+                                        </div>
+                                        <table class="table table-borderless">
+                                                <thead>
+                                                        <tr><td>Status</td><td style="color: ${getColorByStatus(printer.view)}">${printerStatus}</td></tr>
+                                                        <tr><td>Genutzt von</td><td>Externer Nutzer</td></tr>
+                                                        <tr><td>Filamentfarbe</td><td>${printer.filament_color}</td></tr>
+                                                        <tr><td>Erwartete Druckzeit</td><td>${printer.print_time_total}</td></tr>
+                                                        <tr><td>Verbleibende Druckzeit</td><td>${printer.print_time_left}</td></tr>
+                                                        <tr><td>Vergangene Druckzeit</td><td>${printer.print_time}</td></tr>
+                                                        <tr><td>Datei</td><td><div class='hover-element'>${printer.file}<div class='description'>${printer.full_file}</div></div></td></tr>
+                                                </thead>
+                                        </table>
+                                </div>
+                        `;
+                }
 	}
 
         col.appendChild(printerCard);
@@ -403,7 +454,9 @@ function getColorByStatus(status) {
         case 3:
             return 'green';
 	case 4:
-		return 'red';
+	    return 'red';
+	case 5:
+	    return 'orange';
     }
 }