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

fixing bugs in reservation system, fixing error messages, checking if print has been started from other location

Browse Source
This commit is contained in:
root
2024-12-22 09:36:46 +00:00
parent 569f72114e
commit ea0c7f08c1
2 changed files with 229 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sys0-code/api/fetch_printer_data.php
View File

@@ -83,9 +83,28 @@ while (mysqli_stmt_fetch($stmt)) {
$printer["print_status"]="Abgebrochen";
$printer["full_file"]=$json["job"]["file"]["name"];
$printer["view"]=2;
}else if($system_status==0){
}/*else if($system_status==0){
$printer["print_status"]="Bereit";
$printer["view"]=3;
}*/else if(($is_free == 1 && $system_status==0) or $system_status==99){ //check if a print has been started from another location
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);
if($json['state']=="Printing" or $system_status==99){
$printer["printer_status"]="Von anderer Quelle aus gestartet.";
$printer["progress"] = (int) $json['progress']['completion'];
$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"]));
$printer["print_time_left"] = seconds_to_time(intval($json["progress"]["printTimeLeft"]));
$printer["print_time"] = seconds_to_time(intval($json["progress"]["printTime"]));
$printer["view"]=0;
//insert into db that this one is printing
$sql="UPDATE printer SET system_status=99 WHERE id = $printer_id";
}else{
$printer["print_status"]="Bereit";
$printer["view"]=3;
}
}else{
$printer["print_status"]="Problem / Nicht betriebsbereit";
$printer["view"]=4;