Update view_log.php
This commit is contained in:
@@ -25,8 +25,8 @@ $loglevel = htmlspecialchars(isset($_GET["loglevel"]) ? $_GET["loglevel"] : "");
|
|||||||
$logtext = htmlspecialchars(isset($_GET["logtext"]) ? $_GET["logtext"] : "");
|
$logtext = htmlspecialchars(isset($_GET["logtext"]) ? $_GET["logtext"] : "");
|
||||||
$machine_id = htmlspecialchars(isset($_GET["machine_id"]) ? $_GET["machine_id"] : "");
|
$machine_id = htmlspecialchars(isset($_GET["machine_id"]) ? $_GET["machine_id"] : "");
|
||||||
$time = htmlspecialchars(isset($_GET["time"]) ? $_GET["time"] : "");
|
$time = htmlspecialchars(isset($_GET["time"]) ? $_GET["time"] : "");
|
||||||
//$location = htmlspecialchars(isset($_GET["time"]) ? $_GET["time"] : "");
|
$location = htmlspecialchars(isset($_GET["machine_location"]) ? $_GET["machine_location"] : "");
|
||||||
$filter_query = "&loglevel=$loglevel&logtext=$logtext&machine_id=$machine_id&time=$time";
|
$filter_query = "&loglevel=$loglevel&logtext=$logtext&machine_id=$machine_id&time=$time&machine_location=$machine_location";
|
||||||
|
|
||||||
include "../../../config.php";
|
include "../../../config.php";
|
||||||
//get data for pie chart
|
//get data for pie chart
|
||||||
@@ -182,13 +182,14 @@ $conn->close();
|
|||||||
if ($conn->connect_error) {
|
if ($conn->connect_error) {
|
||||||
die("Connection failed: " . $conn->connect_error);
|
die("Connection failed: " . $conn->connect_error);
|
||||||
}
|
}
|
||||||
$sql = "SELECT count(*) AS log_count FROM log WHERE loglevel LIKE ? AND logtext LIKE ? AND machine_id LIKE ? AND time LIKE ?";
|
$sql = "SELECT count(*) AS log_count FROM log WHERE machine_location LIKE ? AND loglevel LIKE ? AND logtext LIKE ? AND machine_id LIKE ? AND time LIKE ?";
|
||||||
$stmt = $conn->prepare($sql);
|
$stmt = $conn->prepare($sql);
|
||||||
$loglevel = "%" . $loglevel . "%";
|
$loglevel = "%" . $loglevel . "%";
|
||||||
$logtext = "%" . $logtext . "%";
|
$logtext = "%" . $logtext . "%";
|
||||||
$machine_id = "%" . $machine_id . "%";
|
$machine_id = "%" . $machine_id . "%";
|
||||||
|
$machine_location = "%" . $machine_location . "%";
|
||||||
$time = "%" . $time . "%";
|
$time = "%" . $time . "%";
|
||||||
$stmt->bind_param("ssss", $loglevel, $logtext, $machine_id, $time);
|
$stmt->bind_param("sssss",$machine_location, $loglevel, $logtext, $machine_id, $time);
|
||||||
$stmt->execute();
|
$stmt->execute();
|
||||||
$result = $stmt->get_result();
|
$result = $stmt->get_result();
|
||||||
$row = $result->fetch_assoc();
|
$row = $result->fetch_assoc();
|
||||||
@@ -198,13 +199,13 @@ $conn->close();
|
|||||||
$total_pages = ceil($total_entries / $page_size);
|
$total_pages = ceil($total_entries / $page_size);
|
||||||
|
|
||||||
// Query log entries for the current page with filters
|
// Query log entries for the current page with filters
|
||||||
$sql = "SELECT * FROM machines,log WHERE loglevel LIKE ? AND logtext LIKE ? AND machine_id LIKE ? AND time LIKE ? AND machine_name=machine_id ORDER BY log.id DESC LIMIT ?, ?";
|
$sql = "SELECT * FROM machines,log WHERE machine_location LIKE ? AND loglevel LIKE ? AND logtext LIKE ? AND machine_id LIKE ? AND time LIKE ? AND machine_name=machine_id ORDER BY log.id DESC LIMIT ?, ?";
|
||||||
$stmt = $conn->prepare($sql);
|
$stmt = $conn->prepare($sql);
|
||||||
$loglevel = "%" . $loglevel . "%";
|
$loglevel = "%" . $loglevel . "%";
|
||||||
$logtext = "%" . $logtext . "%";
|
$logtext = "%" . $logtext . "%";
|
||||||
$machine_id = "%" . $machine_id . "%";
|
$machine_id = "%" . $machine_id . "%";
|
||||||
$time = "%" . $time . "%";
|
$time = "%" . $time . "%";
|
||||||
$stmt->bind_param("ssssii", $loglevel, $logtext, $machine_id, $time, $offset, $page_size);
|
$stmt->bind_param("ssssii", $machine_location, $loglevel, $logtext, $machine_id, $time, $offset, $page_size);
|
||||||
$stmt->execute();
|
$stmt->execute();
|
||||||
$result = $stmt->get_result();
|
$result = $stmt->get_result();
|
||||||
if($current_page==1){
|
if($current_page==1){
|
||||||
@@ -228,7 +229,7 @@ $conn->close();
|
|||||||
echo '<td><input type="text" class="form-control" name="loglevel" placeholder="' . str_replace("%","",$loglevel) . '"></td>';
|
echo '<td><input type="text" class="form-control" name="loglevel" placeholder="' . str_replace("%","",$loglevel) . '"></td>';
|
||||||
echo '<td><input type="text" class="form-control" name="logtext" placeholder="' . str_replace("%","",$logtext) . '"></td>';
|
echo '<td><input type="text" class="form-control" name="logtext" placeholder="' . str_replace("%","",$logtext) . '"></td>';
|
||||||
echo '<td><input type="text" class="form-control" name="machine_id" placeholder="' . str_replace("%","",$machine_id) . '"></td>';
|
echo '<td><input type="text" class="form-control" name="machine_id" placeholder="' . str_replace("%","",$machine_id) . '"></td>';
|
||||||
echo '<td><input type="text" class="form-control" name="machine_location" placeholder="machine_location" disabled></td>';
|
echo '<td><input type="text" class="form-control" name="machine_location" placeholder="' . str_replace("%","",$machine_location) . '"></td>';
|
||||||
echo '<td><input type="text" class="form-control" name="time" placeholder="' . str_replace("%","",$time) . '"></td>';
|
echo '<td><input type="text" class="form-control" name="time" placeholder="' . str_replace("%","",$time) . '"></td>';
|
||||||
echo '<td><button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#delete_all">Delete log</button></td>';
|
echo '<td><button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#delete_all">Delete log</button></td>';
|
||||||
echo '</form>';
|
echo '</form>';
|
||||||
|
|||||||
Reference in New Issue
Block a user