Merge pull request #822 from wrongecho/client-tickets-default-open

Ticketing updates
This commit is contained in:
Johnny
2023-11-25 13:33:55 -05:00
committed by GitHub
4 changed files with 331 additions and 295 deletions
+32 -1
View File
@@ -6,6 +6,16 @@ $order = "DESC";
require_once "inc_all_client.php";
if (isset($_GET['status']) && ($_GET['status']) == 'Open') {
$status = 'Open';
$ticket_status_snippet = "ticket_status != 'Closed'";
} elseif (isset($_GET['status']) && ($_GET['status']) == 'Closed') {
$status = 'Closed';
$ticket_status_snippet = "ticket_status = 'Closed'";
} else {
$status = 'Open';
$ticket_status_snippet = "ticket_status != 'Closed'";
}
//Rebuild URL
$url_query_strings_sort = http_build_query($get_copy);
@@ -19,17 +29,33 @@ $sql = mysqli_query(
LEFT JOIN locations ON ticket_location_id = location_id
LEFT JOIN vendors ON ticket_vendor_id = vendor_id
WHERE ticket_client_id = $client_id
AND $ticket_status_snippet
AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status LIKE '%$q%' OR ticket_priority LIKE '%$q%' OR user_name LIKE '%$q%' OR contact_name LIKE '%$q%' OR asset_name LIKE '%$q%' OR vendor_name LIKE '%$q%' OR ticket_vendor_ticket_number LIKE '%q%')
ORDER BY $sort $order LIMIT $record_from, $record_to"
);
$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
//Get Total tickets open
$sql_total_tickets_open = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS total_tickets_open FROM tickets WHERE ticket_client_id = $client_id AND ticket_status != 'Closed'");
$row = mysqli_fetch_array($sql_total_tickets_open);
$total_tickets_open = intval($row['total_tickets_open']);
//Get Total tickets closed
$sql_total_tickets_closed = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS total_tickets_closed FROM tickets WHERE ticket_client_id = $client_id AND ticket_status = 'Closed'");
$row = mysqli_fetch_array($sql_total_tickets_closed);
$total_tickets_closed = intval($row['total_tickets_closed']);
?>
<div class="card card-dark">
<div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fa fa-fw fa-life-ring mr-2"></i>Tickets</h3>
<h3 class="card-title mt-2"><i class="fa fa-fw fa-life-ring mr-2"></i>Tickets
<small class="ml-3">
<a href="?client_id=<?php echo $client_id?>&status=Open" class="text-white"><strong><?php echo $total_tickets_open; ?></strong> Open</a> |
<a href="?client_id=<?php echo $client_id?>&status=Closed" class="text-white"><strong><?php echo $total_tickets_closed; ?></strong> Closed</a>
</small>
</h3>
<div class="card-tools">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal">
@@ -204,6 +230,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<?php
if ($ticket_status !== "Closed") {
// Temp performance boost for closed tickets, until we move to dynamic modals
require "ticket_edit_modal.php";
require "ticket_assign_modal.php";
@@ -214,6 +243,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
}
}
?>
</tbody>
+1 -1
View File
@@ -41,4 +41,4 @@
//$time_end = microtime(true);
//$execution_time = ($time_end - $time_start);
//echo 'Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds';
//echo '<h2>Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds</h2>';
+1 -1
View File
@@ -2,7 +2,7 @@
// Calculate Execution time start
// uncomment for test
//$time_start = microtime(true);
// $time_start = microtime(true);
header("X-Frame-Options: DENY");
+9 -4
View File
@@ -88,12 +88,12 @@ $row = mysqli_fetch_array($sql_total_tickets_assigned);
$user_active_assigned_tickets = intval($row['total_tickets_assigned']);
?>
<style>
<style>
.popover {
max-width: 600px;
}
</style>
<div class="card card-dark">
</style>
<div class="card card-dark">
<div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fa fa-fw fa-life-ring mr-2"></i>Support Tickets
<small class="ml-3">
@@ -387,6 +387,9 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
</div>
<?php }
if ($ticket_status !== "Closed") {
// Temp performance boost for closed tickets, until we move to dynamic modals
require "ticket_edit_modal.php";
require "ticket_assign_modal.php";
@@ -395,6 +398,8 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
require "ticket_edit_contact_modal.php";
}
?>
</td>
@@ -412,7 +417,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
<?php require_once "pagination.php";
?>
</div>
</div>
</div>
<?php
require_once "ticket_add_modal.php";