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

fixing design of settings page

Browse Source
This commit is contained in:
Janis Steiner
2024-10-05 10:47:19 +01:00
parent e91de28ef5
commit ae3146c804
2 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
sys0-code/app/debug.php
View File

@@ -31,11 +31,12 @@ function update_input(input,action,id){
} }
function delete_input(input,action,id,row){ async function delete_input(input,action,id,row){
var selector=document.getElementById(input); var selector=document.getElementById(input);
var selector_value=selector.value; var selector_value=selector.value;
fetch("/api/printer_settings.php?action="+action+"&value="+selector.value+"&id="+id); await fetch("/api/printer_settings.php?action="+action+"&value="+selector.value+"&id="+id);
document.getElementById("table1").deleteRow(row); //document.getElementById("table1").deleteRow(row);
location.reload();
} }
</script> </script>
<?php <?php
@@ -48,6 +49,7 @@ function delete_input(input,action,id,row){
<?php <?php
$color=$_SESSION["color"]; $color=$_SESSION["color"];
include "../assets/components.php"; include "../assets/components.php";
$tab=$_GET["show"];
?> ?>
<div id="content"></div> <div id="content"></div>
@@ -59,6 +61,22 @@ function delete_input(input,action,id,row){
<div class="container mt-5" style="min-height: 95vh;"> <div class="container mt-5" style="min-height: 95vh;">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div style="width: 100hh"> <div style="width: 100hh">
<ul class="nav nav-tabs">
<li class="nav-item">
<a class="nav-link" href="debug.php?show=printer_settings" id="printer_settings_tab">Druckereinstellungen</a>
</li>
<li class="nav-item">
<a class="nav-link" href="debug.php?show=camera_settings" id="camera_settings_tab">Kameraeinstellungen</a>
</li>
<li class="nav-item">
<a class="nav-link" href="debug.php?show=class_settings" id="class_settings_tab">Klasseneinstellungen</a>
</li>
<li class="nav-item">
<a class="nav-link" href="debug.php?show=filament_settings" id="filament_settings_tab">Filamenteinstellungen</a>
</li>
</ul>
<div id="printer_settings" style="display:none">
<h1>Druckerfreigabe erzwingen (falls beim freigeben Fehlermeldungen angezeigt werden)</h1> <h1>Druckerfreigabe erzwingen (falls beim freigeben Fehlermeldungen angezeigt werden)</h1>
<?php <?php
if(isset($_POST['free'])) if(isset($_POST['free']))
@@ -128,16 +146,17 @@ function delete_input(input,action,id,row){
mysqli_stmt_fetch($stmt); mysqli_stmt_fetch($stmt);
if($system_status==0) if($system_status==0)
echo("<tr><td>$printer_id</td><td><form method='POST' action='?free=$printer_id'><button type='submit' value='free' name='free' class='btn btn-dark'>Free</button></form></td><td><a href='debug.php?update_status=$printer_id&status=1' class='btn btn-danger'>Status auf kaputt setzen</a></td></tr>"); echo("<tr><td>$printer_id</td><td><form method='POST' action='?free=$printer_id&show=$tab'><button type='submit' value='free' name='free' class='btn btn-dark'>Free</button></form></td><td><a href='debug.php?update_status=$printer_id&status=1&show=$tab' class='btn btn-danger'>Status auf kaputt setzen</a></td></tr>");
else else
echo("<tr><td>$printer_id</td><td><form method='POST' action='?free=$printer_id'><button type='submit' value='free' name='free' class='btn btn-dark'>Free</button></form></td><td><a href='debug.php?update_status=$printer_id&status=0' class='btn btn-success'>Status auf bereit setzen</a></td></tr>"); echo("<tr><td>$printer_id</td><td><form method='POST' action='?free=$printer_id&show=$tab'><button type='submit' value='free' name='free' class='btn btn-dark'>Free</button></form></td><td><a href='debug.php?update_status=$printer_id&status=0&show=$tab' class='btn btn-success'>Status auf bereit setzen</a></td></tr>");
$cnt--; $cnt--;
} }
echo("</tbody></table></div></div></div></div>"); echo("</tbody></table></div></div></div></div>");
?> ?>
<br><br> <br><br>
</div>
<div id="camera_settings" style="display:none">
<!-- Rotation der Druckerkameras: --> <!-- Rotation der Druckerkameras: -->
<h1>Rotation der Druckerkameras</h1> <h1>Rotation der Druckerkameras</h1>
<?php <?php
@@ -177,7 +196,8 @@ function delete_input(input,action,id,row){
} }
echo("</tbody></table></div></div></div>"); echo("</tbody></table></div></div></div>");
?> ?>
<br><br> </div></div>
<div id="class_settings" style="display:none">
<h1>Klassen</h1> <h1>Klassen</h1>
<?php <?php
@@ -194,7 +214,7 @@ function delete_input(input,action,id,row){
echo("<div class='container'><div class='row'><div class='col'><div class='overflow-auto'><table class='table' id='table2'><thead><tr><th>Klasse</th><th>Hinzufügen/Löschen</th></tr></thead><tbody>"); echo("<div class='container'><div class='row'><div class='col'><div class='overflow-auto'><table class='table' id='table2'><thead><tr><th>Klasse</th><th>Hinzufügen/Löschen</th></tr></thead><tbody>");
//form to add a color //form to add a color
echo("<form action='debug.php?action=add_class' method='post'>"); echo("<form action='debug.php?action=add_class&show=$tab' method='post'>");
echo("<td><input type='text' placeholder='Klasse' name='class_name' required></input></td>"); echo("<td><input type='text' placeholder='Klasse' name='class_name' required></input></td>");
echo("<td><button type='submit' value='add' class='btn btn-primary'>Hinzufügen</button></td>"); echo("<td><button type='submit' value='add' class='btn btn-primary'>Hinzufügen</button></td>");
echo("</form>"); echo("</form>");
@@ -226,7 +246,8 @@ function delete_input(input,action,id,row){
echo("</div>"); echo("</div>");
?> ?>
</div>
<div id="filament_settings" style="display:none">
<h1>Filamente</h1> <h1>Filamente</h1>
<?php <?php
//list printers => form => color //list printers => form => color
@@ -243,7 +264,7 @@ function delete_input(input,action,id,row){
echo("<div class='container'><div class='row'><div class='col'><div class='overflow-auto'><table class='table' id='table1'><thead><tr><th>Filamente</th><th>Farbe</th><th>Hinzufügen/Löschen</th></tr></thead><tbody>"); echo("<div class='container'><div class='row'><div class='col'><div class='overflow-auto'><table class='table' id='table1'><thead><tr><th>Filamente</th><th>Farbe</th><th>Hinzufügen/Löschen</th></tr></thead><tbody>");
//form to add a color //form to add a color
echo("<form action='debug.php?action=add_filament' method='post'>"); echo("<form action='debug.php?action=add_filament&show=$tab' method='post'>");
echo("<td><input type='number' placeholder='Filament id' name='filament_id' required></input></td>"); echo("<td><input type='number' placeholder='Filament id' name='filament_id' required></input></td>");
echo("<td><input type='text' placeholder='filament Farbe' name='filament_name' required></input></td>"); echo("<td><input type='text' placeholder='filament Farbe' name='filament_name' required></input></td>");
echo("<td><button type='submit' value='add' class='btn btn-primary'>Hinzufügen</button></td>"); echo("<td><button type='submit' value='add' class='btn btn-primary'>Hinzufügen</button></td>");
@@ -276,6 +297,7 @@ function delete_input(input,action,id,row){
echo("</div>"); echo("</div>");
?> ?>
</div>
<?php <?php
test_queue($link); test_queue($link);
?> ?>
@@ -284,6 +306,18 @@ function delete_input(input,action,id,row){
</div> </div>
</div> </div>
<div id="footer"></div> <div id="footer"></div>
<script>
//decide which div should be shown:
// Get the URL parameters
const queryString = window.location.search;
const urlParams = new URLSearchParams(queryString);
// Get the value of the "show" parameter
const show_div = document.getElementById(urlParams.get('show'));
const nav_tab = document.getElementById(urlParams.get('show')+"_tab");
show_div.style.display="block";
nav_tab.setAttribute('class', 'nav-link active');
</script>
</body> </body>
</html> </html>

8
sys0-code/assets/php/user_page.php
View File

@@ -205,7 +205,7 @@
<i class="fa-solid fa-file fa-6x justify-content-center"></i> <i class="fa-solid fa-file fa-6x justify-content-center"></i>
</div> </div>
<div class="card-body"> <div class="card-body">
<h5 class="card-title">View system0 Log</h5> <h5 class="card-title">System0 Protokoll ansehen</h5>
<p class="card-text">Zeigen Sie das Protokoll der Systemaktivitäten und -ereignisse an.</p> <p class="card-text">Zeigen Sie das Protokoll der Systemaktivitäten und -ereignisse an.</p>
<a href="/app/view_log.php" class="stretched-link"></a> <a href="/app/view_log.php" class="stretched-link"></a>
</div> </div>
@@ -220,7 +220,7 @@
<i class="fa-solid fa-key fa-6x justify-content-center"></i> <i class="fa-solid fa-key fa-6x justify-content-center"></i>
</div> </div>
<div class="card-body"> <div class="card-body">
<h5 class="card-title">View the system0 API Key</h5> <h5 class="card-title">System0 APIkey ansehen</h5>
<p class="card-text">Zeigen Sie den API-Schlüssel an, der für den Zugriff auf die Systemfunktionalitäten verwendet wird.</p> <p class="card-text">Zeigen Sie den API-Schlüssel an, der für den Zugriff auf die Systemfunktionalitäten verwendet wird.</p>
<a href="/app/view_apikey.php" class="stretched-link"></a> <a href="/app/view_apikey.php" class="stretched-link"></a>
</div> </div>
@@ -235,9 +235,9 @@
<i class="fa-solid fa-print fa-6x justify-content-center"></i> <i class="fa-solid fa-print fa-6x justify-content-center"></i>
</div> </div>
<div class="card-body"> <div class="card-body">
<h5 class="card-title">Drucker Einstellungen</h5> <h5 class="card-title">Drucker & allgemeine Einstellungen</h5>
<p class="card-text">Hier findest du das Debug-Tool und die Einstellungen.</p> <p class="card-text">Hier findest du das Debug-Tool und die Einstellungen.</p>
<a href="/app/debug.php" class="stretched-link"></a> <a href="/app/debug.php?show=printer_settings" class="stretched-link"></a>
</div> </div>
</div> </div>