From 8d5c71f0432317621e8c8ac91c4202c7b7416369 Mon Sep 17 00:00:00 2001
From: Marcus Hill <bcf8c9f2@opayq.com>
Date: Sat, 4 May 2024 21:32:03 +0100
Subject: [PATCH] Add total time worked to 'Tickets by client' report

---
 report_ticket_by_client.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/report_ticket_by_client.php b/report_ticket_by_client.php
index 96b967e4b..6f7879ada 100644
--- a/report_ticket_by_client.php
+++ b/report_ticket_by_client.php
@@ -50,7 +50,7 @@ function secondsToTime($inputSeconds) {
 
 $sql_ticket_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(ticket_created_at) AS ticket_year FROM tickets ORDER BY ticket_year DESC");
 
-$sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC");
+$sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
 
 ?>
 
@@ -79,6 +79,7 @@ function secondsToTime($inputSeconds) {
                         <th>Client</th>
                         <th class="text-right">Tickets raised</th>
                         <th class="text-right">Tickets closed</th>
+                        <th class="text-right">Time worked <i>(H:M:S)</i></th>
                         <th class="text-right">Avg time to close</th>
                     </tr>
                     </thead>
@@ -101,6 +102,11 @@ function secondsToTime($inputSeconds) {
                         // Used to calculate average time to close tickets that were raised in period specified
                         $sql_tickets = mysqli_query($mysqli, "SELECT ticket_created_at, ticket_closed_at FROM tickets WHERE YEAR(ticket_created_at) = $year AND ticket_client_id = $client_id AND ticket_closed_at IS NOT NULL");
 
+                        // Calculate total time tracked towards tickets in the period
+                        $sql_time = mysqli_query($mysqli, "SELECT SEC_TO_TIME(SUM(TIME_TO_SEC(ticket_reply_time_worked))) as total_time FROM ticket_replies LEFT JOIN tickets ON tickets.ticket_id = ticket_replies.ticket_reply_ticket_id WHERE YEAR(ticket_created_at) = $year AND ticket_client_id = $client_id AND ticket_reply_time_worked IS NOT NULL");
+                        $row = mysqli_fetch_array($sql_time);
+                        $ticket_total_time_worked = nullable_htmlentities($row['total_time']);
+
                         if ($ticket_raised_count > 0) {
 
                             // Calculate average time to solve
@@ -120,6 +126,7 @@ function secondsToTime($inputSeconds) {
                                 <td><?php echo $client_name; ?></td>
                                 <td class="text-right"><?php echo $ticket_raised_count; ?></td>
                                 <td class="text-right"><?php echo $ticket_closed_count; ?></td>
+                                <td class="text-right"><?php echo $ticket_total_time_worked; ?></td>
                                 <td class="text-right"><?php echo secondsToTime($total); ?></td>
                             </tr>
                             <?php