diff --git a/sys0-code/api/fetch_printer_data.php b/sys0-code/api/fetch_printer_data.php index 8dae215..b0f258f 100644 --- a/sys0-code/api/fetch_printer_data.php +++ b/sys0-code/api/fetch_printer_data.php @@ -71,11 +71,13 @@ while (mysqli_stmt_fetch($stmt)) { $printer["print_status"]="Drucken"; $printer["view"]=1; } + $printer["progress"]=($json["job"]["progress"]["printTime"]/($json["job"]["progress"]["printTime"]+$json["job"]["progress"]["printTimeLeft"])); }else if($cancel==1){ exec("curl --max-time 10 $url/api/job?apikey=$apikey > /var/www/html/user_files/" . $_SESSION["username"] . "/json.json"); $fg = file_get_contents("/var/www/html/user_files/" . $_SESSION["username"] . "/json.json"); $json = json_decode($fg, true); - $printer["progress"] = (int) $json['progress']['completion']; + //$printer["progress"] = (int) $json['progress']['completion']; + $printer["progress"]=($json["job"]["progress"]["printTime"]/($json["job"]["progress"]["printTime"]+$json["job"]["progress"]["printTimeLeft"])); $printer["file"] = short_path($json["job"]["file"]["name"], 10, 10); $printer["print_time_total"] = seconds_to_time(intval($json["job"]["estimatedPrintTime"])); $printer["print_time_left"] = seconds_to_time(intval($json["progress"]["printTimeLeft"])); @@ -92,7 +94,8 @@ while (mysqli_stmt_fetch($stmt)) { $json = json_decode($fg, true); if($json['state']=="Starting print from SD" or $json['state']=="Printing" or $json['state']=="Printing from SD" or $system_status==99){ $printer["print_status"]="Von anderer Quelle aus gestartet."; - $printer["progress"] = (int) $json['progress']['completion']; + //$printer["progress"] = (int) $json['progress']['completion']; + $printer["progress"]=($json["job"]["progress"]["printTime"]/($json["job"]["progress"]["printTime"]+$json["job"]["progress"]["printTimeLeft"])); $printer["file"] = short_path($json["job"]["file"]["name"], 10, 10); $printer["full_file"]=$json["job"]["file"]["name"]; $printer["print_time_total"] = seconds_to_time(intval($json["job"]["estimatedPrintTime"])); diff --git a/sys0-code/api/uploader/image_preview.php b/sys0-code/api/uploader/image_preview.php new file mode 100644 index 0000000..1d22ad1 --- /dev/null +++ b/sys0-code/api/uploader/image_preview.php @@ -0,0 +1,30 @@ + diff --git a/sys0-code/assets/php/user_page.php b/sys0-code/assets/php/user_page.php index 7950109..e5645d7 100644 --- a/sys0-code/assets/php/user_page.php +++ b/sys0-code/assets/php/user_page.php @@ -113,9 +113,8 @@ session_start(); echo('
-
- +
@@ -128,9 +127,8 @@ '); echo('
-
- +
@@ -145,7 +143,7 @@ echo('
- +
Neuer Admin erstellen
@@ -161,7 +159,7 @@
- +
Benutzer verwalten
@@ -174,7 +172,7 @@ echo('
- +
Account löschen
@@ -188,7 +186,7 @@ echo('
- +
Datenschutzrichtlinie
@@ -202,7 +200,7 @@ echo('
- +
Disclaimer
@@ -218,7 +216,7 @@ echo('
- +
System0 Protokoll ansehen
@@ -233,7 +231,7 @@ echo('
- +
System0 APIkey ansehen
@@ -248,7 +246,7 @@ echo('
- +
Einstellungen & Statistiken
@@ -263,7 +261,7 @@ echo('
- +
Drucker Reservieren
@@ -277,7 +275,7 @@ echo('
- +
Druckschlüssel erstellen
@@ -290,7 +288,7 @@ ?>
- +
" oninput="update_telegram_id();">