From e42c5bc2f5c5ca59e05e58347a7b1163a4d82e95 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 27 Mar 2024 22:27:56 -0400 Subject: [PATCH] Major UI Updates to projects, created project details which display project stats tickets and tasks, tickets can be linked to a project, soon will add all users who contributed to a project and some more stats along with a nice timeline from created to deadline --- client_tickets.php | 3 + post/ticket.php | 6 +- project_add_modal.php | 25 +++ project_details.php | 345 ++++++++++++++++++++++++++++++++++++++++++ projects.php | 79 +++++++--- ticket.php | 2 + ticket_add_modal.php | 28 ++++ ticket_edit_modal.php | 28 ++++ tickets.php | 1 + 9 files changed, 496 insertions(+), 21 deletions(-) create mode 100644 project_details.php diff --git a/client_tickets.php b/client_tickets.php index a10de9c5..b5d6bbce 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -181,6 +181,9 @@ $total_scheduled_tickets = intval($row['total_scheduled_tickets']); } else { $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); } + + $project_id = intval($row['ticket_project_id']); + $contact_name = nullable_htmlentities($row['contact_name']); $contact_email = nullable_htmlentities($row['contact_email']); $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); diff --git a/post/ticket.php b/post/ticket.php index 1ac2f621..d0ea42d4 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -23,6 +23,7 @@ if (isset($_POST['add_ticket'])) { $vendor_id = intval($_POST['vendor']); $asset_id = intval($_POST['asset']); $location_id = intval($_POST['location']); + $project_id = intval($_POST['project']); $use_primary_contact = intval($_POST['use_primary_contact']); @@ -51,7 +52,7 @@ if (isset($_POST['add_ticket'])) { mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1"); - mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = '$billable', ticket_status = '$ticket_status', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_client_id = $client_id, ticket_invoice_id = 0"); + mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = '$billable', ticket_status = '$ticket_status', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_client_id = $client_id, ticket_invoice_id = 0, ticket_project_id = $project_id"); $ticket_id = mysqli_insert_id($mysqli); @@ -153,10 +154,11 @@ if (isset($_POST['edit_ticket'])) { $vendor_id = intval($_POST['vendor']); $asset_id = intval($_POST['asset']); $location_id = intval($_POST['location']); + $project_id = intval($_POST['project']); $client_id = intval($_POST['client_id']); $ticket_number = intval($_POST['ticket_number']); - mysqli_query($mysqli, "UPDATE tickets SET ticket_subject = '$subject', ticket_priority = '$priority', ticket_billable = $billable, ticket_details = '$details', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_contact_id = $contact_id, ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id WHERE ticket_id = $ticket_id"); + mysqli_query($mysqli, "UPDATE tickets SET ticket_subject = '$subject', ticket_priority = '$priority', ticket_billable = $billable, ticket_details = '$details', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_contact_id = $contact_id, ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_project_id = $project_id WHERE ticket_id = $ticket_id"); //Logging mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Modify', log_description = '$session_name modified ticket $ticket_number - $subject', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $ticket_id"); diff --git a/project_add_modal.php b/project_add_modal.php index 9a754a85..b3a52cab 100644 --- a/project_add_modal.php +++ b/project_add_modal.php @@ -33,6 +33,31 @@ + + +
+ +
+
+ +
+ +
+
+ + +
diff --git a/project_details.php b/project_details.php new file mode 100644 index 00000000..579557f3 --- /dev/null +++ b/project_details.php @@ -0,0 +1,345 @@ +

Nothing to see here

Go Back"; + + include_once "footer.php"; + exit; + } + + $row = mysqli_fetch_array($sql_project); + + $project_id = intval($row['project_id']); + $project_name = nullable_htmlentities($row['project_name']); + $project_description = nullable_htmlentities($row['project_description']); + $project_created_at = date("Y-m-d", strtotime($row['project_created_at'])); + $project_updated_at = nullable_htmlentities($row['project_updated_at']); + + $client_id = intval($row['client_id']); + $client_name = nullable_htmlentities($row['client_name']); + + // Get Tickets + $sql_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_project_id = $project_id ORDER BY ticket_number DESC"); + $ticket_count = mysqli_num_rows($sql_tickets); + + // Get Closed Ticket Count + $sql_closed_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id AND ticket_status = 'Closed'"); + + $closed_ticket_count = mysqli_num_rows($sql_closed_tickets); + + // Ticket Closed Percent + $tickets_closed_percent = ($closed_ticket_count / $ticket_count) * 100; + + // Get All Tasks + $sql_tasks = mysqli_query($mysqli, + "SELECT * FROM tickets, tasks + WHERE ticket_id = task_ticket_id + AND ticket_project_id = $project_id + ORDER BY task_created_at ASC" + ); + $task_count = mysqli_num_rows($sql_tasks); + + // Get Completed Task Count + $sql_tasks_completed = mysqli_query($mysqli, + "SELECT * FROM tickets, tasks + WHERE ticket_id = task_ticket_id + AND ticket_project_id = $project_id + AND task_completed_at IS NOT NULL" + ); + $completed_task_count = mysqli_num_rows($sql_tasks_completed); + + // Tasks Completed Percent + $tasks_completed_percent = ($completed_task_count / $task_count) * 100; +?> + + +
    +
  1. + Projects +
    2. +
  2. Project Details
    3. +
+ + +
+
+
+
+ +
+

+
+
+
+
+
+
+ +
+

+
+
+
+
+ +
+
+ +
/
+
+
+ +
/
+
+
+ +
+
+
+ +
+ + Edit + + + Add Ticket + + +
+ + Archive + + + +
+ + Delete + + +
+
+
+
+
+
+ +
+
+ + + 0) { ?> +
+ +
Tickets
+
+ + + + + + + + + + + + + Never

"; + } else { + $ticket_updated_at_display = "

Never

"; + } + } else { + $ticket_updated_at_display = "$ticket_updated_at_time_ago
$ticket_updated_at"; + } + $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']); + + $ticket_status_color = getTicketStatusColor($ticket_status); + + if ($ticket_priority == "High") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "Medium") { + $ticket_priority_display = "$ticket_priority"; + } elseif ($ticket_priority == "Low") { + $ticket_priority_display = "$ticket_priority"; + } else{ + $ticket_priority_display = "-"; + } + + $ticket_assigned_to = intval($row['ticket_assigned_to']); + if (empty($ticket_assigned_to)) { + if ($ticket_status == "Closed") { + $ticket_assigned_to_display = "

Not Assigned

"; + } else { + $ticket_assigned_to_display = "

Not Assigned

"; + } + } else { + $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); + } + + $project_id = intval($row['ticket_project_id']); + + $contact_name = nullable_htmlentities($row['contact_name']); + $contact_email = nullable_htmlentities($row['contact_email']); + $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); + if (empty($contact_archived_at)) { + $contact_archived_display = ""; + } else { + $contact_archived_display = "Archived - "; + } + if (empty($contact_name)) { + $contact_display = "-"; + } else { + $contact_display = "$contact_archived_display$contact_name
$contact_email"; + } + + // Get who last updated the ticket - to be shown in the last Response column + $ticket_reply_type = "Client"; // Default to client for unreplied tickets + $ticket_reply_by_display = ""; // Default none + $sql_ticket_reply = mysqli_query($mysqli, "SELECT ticket_reply_type, contact_name, user_name FROM ticket_replies + LEFT JOIN users ON ticket_reply_by = user_id + LEFT JOIN contacts ON ticket_reply_by = contact_id + WHERE ticket_reply_ticket_id = $ticket_id + AND ticket_reply_archived_at IS NULL + ORDER BY ticket_reply_id DESC LIMIT 1" + ); + $row = mysqli_fetch_array($sql_ticket_reply); + + if ($row) { + $ticket_reply_type = nullable_htmlentities($row['ticket_reply_type']); + if ($ticket_reply_type == "Client") { + $ticket_reply_by_display = nullable_htmlentities($row['contact_name']); + } else { + $ticket_reply_by_display = nullable_htmlentities($row['user_name']); + } + } + + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + +
NumberSubjectPriorityStatusAssignedLast Response
+ + + + + + +
+
+
+
+
+ +
+ +
+ + + 0) { ?> +
+
Tasks
+ + + + +
+ +
+ +
+ + +
+ + + + + + +
+ +
+ + + + +
+ + + +
+ +
+ + + + diff --git a/projects.php b/projects.php index 39cc571a..dff831ee 100644 --- a/projects.php +++ b/projects.php @@ -14,8 +14,7 @@ $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM projects LEFT JOIN clients ON client_id = project_client_id - WHERE project_template = 0 - AND DATE(project_created_at) BETWEEN '$dtf' AND '$dtt' + WHERE DATE(project_created_at) BETWEEN '$dtf' AND '$dtt' AND (project_name LIKE '%$q%' OR project_description LIKE '%$q%') AND project_archived_at IS NULL ORDER BY $sort $order LIMIT $record_from, $record_to" @@ -85,10 +84,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); "> Project - Description - Tickets - Tasks + Tickets / Tasks Due + Client Created Action @@ -100,33 +98,76 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $project_id = intval($row['project_id']); $project_name = nullable_htmlentities($row['project_name']); $project_description = nullable_htmlentities($row['project_description']); - if ($project_description) { - $project_description_display = $project_description; - } else { - - $project_description_display = "-"; - } $project_created_at = date("Y-m-d", strtotime($row['project_created_at'])); $project_updated_at = nullable_htmlentities($row['project_updated_at']); + $client_id = intval($row['client_id']); + $client_name = nullable_htmlentities($row['client_name']); + + // Get Tasks and Tickets Stats + // Get Tickets + $sql_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_project_id = $project_id ORDER BY ticket_number DESC"); + $ticket_count = mysqli_num_rows($sql_tickets); + + // Get Closed Ticket Count + $sql_closed_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id AND ticket_status = 'Closed'"); + + $closed_ticket_count = mysqli_num_rows($sql_closed_tickets); + + // Ticket Closed Percent + $tickets_closed_percent = ($closed_ticket_count / $ticket_count) * 100; + + // Get All Tasks + $sql_tasks = mysqli_query($mysqli, + "SELECT * FROM tickets, tasks + WHERE ticket_id = task_ticket_id + AND ticket_project_id = $project_id + ORDER BY task_created_at ASC" + ); + $task_count = mysqli_num_rows($sql_tasks); + + // Get Completed Task Count + $sql_tasks_completed = mysqli_query($mysqli, + "SELECT * FROM tickets, tasks + WHERE ticket_id = task_ticket_id + AND ticket_project_id = $project_id + AND task_completed_at IS NOT NULL" + ); + $completed_task_count = mysqli_num_rows($sql_tasks_completed); + + // Tasks Completed Percent + $tasks_completed_percent = ($completed_task_count / $task_count) * 100; + ?> - - - - -
-
1 / 2
-
+ +
+ +
+
+
+
+
+
-
7 / 10
+ +
/
+
+
+ +
/
Next Week + + + + +
diff --git a/ticket.php b/ticket.php index 5fd5dc3e..0e753ac6 100644 --- a/ticket.php +++ b/ticket.php @@ -92,6 +92,8 @@ if (isset($_GET['ticket_id'])) { $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); } + $project_id = intval($row['ticket_project_id']); + $contact_id = intval($row['contact_id']); $contact_name = nullable_htmlentities($row['contact_name']); $contact_title = nullable_htmlentities($row['contact_title']); diff --git a/ticket_add_modal.php b/ticket_add_modal.php index f5bac066..23a415aa 100644 --- a/ticket_add_modal.php +++ b/ticket_add_modal.php @@ -27,6 +27,9 @@
  • Vendor
    • +
  • + Project +
    • @@ -291,6 +294,31 @@
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php index 19104829..6404661c 100644 --- a/ticket_edit_modal.php +++ b/ticket_edit_modal.php @@ -29,6 +29,9 @@
  • Vendor
    • +
  • + Project +
    • @@ -222,6 +225,31 @@ +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + diff --git a/tickets.php b/tickets.php index 9766c06f..957baa8e 100644 --- a/tickets.php +++ b/tickets.php @@ -328,6 +328,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); $ticket_updated_at_display = "$ticket_updated_at_time_ago
    $ticket_updated_at"; } $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']); + $project_id = intval($row['ticket_project_id']); $client_id = intval($row['ticket_client_id']); $client_name = nullable_htmlentities($row['client_name']); $contact_name = nullable_htmlentities($row['contact_name']);