From bb787cdc704045d61567a7444312ddc237083211 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Wed, 29 Jan 2025 11:01:53 -0300 Subject: [PATCH 01/23] tickets initial idea of views Kanban view Compact view --- tickets.php | 362 +++++++++----------------------------------- tickets_compact.php | 280 ++++++++++++++++++++++++++++++++++ tickets_kanban.php | 305 +++++++++++++++++++++++++++++++++++++ tickets_list.php | 290 +++++++++++++++++++++++++++++++++++ 4 files changed, 948 insertions(+), 289 deletions(-) create mode 100644 tickets_compact.php create mode 100644 tickets_kanban.php create mode 100644 tickets_list.php diff --git a/tickets.php b/tickets.php index b1d4f494..842a8f1c 100644 --- a/tickets.php +++ b/tickets.php @@ -36,6 +36,17 @@ if (isset($_GET['status']) && is_array($_GET['status']) && !empty($_GET['status' } } +if (isset($_GET['category'])) { + if ($_GET['category'] == 'empty') { + $category_snippet = "AND ticket_category = 0 "; + } elseif ($_GET['category'] == 'all') { + $category_snippet = ""; + } else { + $category_snippet = "AND ticket_category = " . $_GET['category']; + } +} + + // Ticket assignment status filter // Default - any $ticket_assigned_query = ''; @@ -48,7 +59,7 @@ if (isset($_GET['assigned']) & !empty($_GET['assigned'])) { $ticket_assigned_query = 'AND ticket_assigned_to = ' . intval($_GET['assigned']); $ticket_assigned_filter_id = intval($_GET['assigned']); } -} +} //Rebuild URL $url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $sort, 'order' => $order, 'status' => $status, 'assigned' => $ticket_assigned_filter_id))); @@ -70,7 +81,9 @@ $sql = mysqli_query( LEFT JOIN locations ON ticket_location_id = location_id LEFT JOIN vendors ON ticket_vendor_id = vendor_id LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + LEFT JOIN categories ON ticket_category = category_id WHERE $ticket_status_snippet " . $ticket_assigned_query . " + $category_snippet AND DATE(ticket_created_at) BETWEEN '$dtf' AND '$dtt' AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR client_name LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status_name 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%') $ticket_permission_snippet @@ -99,6 +112,15 @@ $sql_total_tickets_assigned = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS $row = mysqli_fetch_array($sql_total_tickets_assigned); $user_active_assigned_tickets = intval($row['total_tickets_assigned']); +$sql_categories = mysqli_query( + $mysqli, + "SELECT * FROM categories + WHERE category_type = 'Ticket' + ORDER BY category_name" +); + + + ?> + + +id = $id; + $statuses[$id]->name = $name; + $statuses[$id]->tickets = []; + $statuses[$id]->order = $kanban_order; // Store the order +} + +// Fetch tickets and merge into statuses +$sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM tickets + LEFT JOIN clients ON ticket_client_id = client_id + LEFT JOIN contacts ON ticket_contact_id = contact_id + LEFT JOIN users ON ticket_assigned_to = user_id + LEFT JOIN assets ON ticket_asset_id = asset_id + LEFT JOIN locations ON ticket_location_id = location_id + LEFT JOIN vendors ON ticket_vendor_id = vendor_id + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + LEFT JOIN categories ON ticket_category = category_id + WHERE $ticket_status_snippet " . $ticket_assigned_query . " + $category_snippet + AND DATE(ticket_created_at) BETWEEN '$dtf' AND '$dtt' + AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR client_name LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status_name 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%') + $ticket_permission_snippet + ORDER BY $sort $order" +); + +while ($row = mysqli_fetch_array($sql)) { + $id = $row['ticket_status_id']; + $ticket_order = $row['ticket_kanban']; + $row['ticket_order'] = $ticket_order; // Store the ticket order + + if (isset($statuses[$id])) { + $statuses[$id]->tickets[] = $row; + } +} + +// Convert associative array to indexed array for sorting +$kanban_array = array_values($statuses); + +// Sort the array by the 'order' field, moving null values to the end +usort($kanban_array, function($a, $b) { + if ($a->order === null) return 1; + if ($b->order === null) return -1; + return $a->order - $b->order; +}); + +// Sort tickets within each column by 'ticket_kanban' +foreach ($kanban_array as $kanban_column) { + usort($kanban_column->tickets, function($a, $b) { + return $a['ticket_order'] - $b['ticket_order']; + }); +} + +// Re-index the sorted array back to associative array if needed +$ordered_kanban = []; +foreach ($kanban_array as $item) { + $ordered_kanban[$item->id] = $item; +} + +$kanban = $ordered_kanban; + + + + + + +?> + +
+ +
+
name); ?>
+
+ tickets as $item){ + if ($item['ticket_priority'] == "High") { + $ticket_priority_color = "danger"; + } elseif ($item['ticket_priority'] == "Medium") { + $ticket_priority_color = "warning"; + } else { + $ticket_priority_color = "info"; + } + ?> + +
+ + + + + + +
+ + + + +
+ + +
+ + +
+ +
+ + + +
+ + +
+
+ +
+ + + + + + + + + + + + + diff --git a/tickets_list.php b/tickets_list.php new file mode 100644 index 00000000..6ed456c7 --- /dev/null +++ b/tickets_list.php @@ -0,0 +1,290 @@ +
+
+
+ + +
+ + "> + + + + + + + = 2) { ?> + + + + + + + + + + + + Never

"; + } else { + $ticket_updated_at_display = "

Never

"; + } + } else { + $ticket_updated_at_display = "$ticket_updated_at_time_ago
$ticket_updated_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']); + $contact_email = nullable_htmlentities($row['contact_email']); + + if ($ticket_priority == "High") { + $ticket_priority_color = "danger"; + } elseif ($ticket_priority == "Medium") { + $ticket_priority_color = "warning"; + } else { + $ticket_priority_color = "info"; + } + + $ticket_assigned_to = intval($row['ticket_assigned_to']); + if (empty($ticket_assigned_to)) { + if (!empty($ticket_closed_at)) { + $ticket_assigned_to_display = "

Not Assigned

"; + } else { + $ticket_assigned_to_display = "

Not Assigned

"; + } + } else { + $ticket_assigned_to_display = nullable_htmlentities($row['user_name']); + } + + if (empty($contact_name)) { + $contact_display = "-"; + } else { + $contact_display = "$contact_name
$contact_email"; + } + + // Get who last updated the ticket - to be shown in the last Response column + + // Defaults to prevent undefined errors + $ticket_reply_created_at = ""; + $ticket_reply_created_at_time_ago = "Never"; + $ticket_reply_by_display = ""; + $ticket_reply_type = "Client"; // Default to client for un-replied tickets + + $sql_ticket_reply = mysqli_query($mysqli, + "SELECT ticket_reply_type, ticket_reply_created_at, 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']); + } + $ticket_reply_created_at = nullable_htmlentities($row['ticket_reply_created_at']); + $ticket_reply_created_at_time_ago = timeAgo($ticket_reply_created_at); + } + + + // Get Tasks + $sql_tasks = mysqli_query( $mysqli, "SELECT * FROM tasks WHERE task_ticket_id = $ticket_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 tasks + WHERE task_ticket_id = $ticket_id + AND task_completed_at IS NOT NULL" + ); + $completed_task_count = mysqli_num_rows($sql_tasks_completed); + + // Tasks Completed Percent + if($task_count) { + $tasks_completed_percent = round(($completed_task_count / $task_count) * 100); + } + + ?> + + "> + + + + + + + + + + + + + + + = 2) { ?> + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ 		+ + Ticket + + + + Subject / Tasks + + + + Client / Contact + + + + Billable + + + + Priority + + + + Status + + + + Assigned + + + + Last Response + + + + Created + +
+ +
+ +
+ + 		+ + + + + + + 0) { ?> +
+
+
+ + +
+

+
+ + 		+ + +
+ 		+ + Yes"; + } else { + echo "No"; + } + ?> + + + + + $ticket_scheduled_for "; } ?> + + + +
+ +
+
+ 		+ +
+
+ + + + + + +
+ +
+
+ From 3aa26226e5ea1968ae36fe8c52a1bb2dc5113a3c Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Wed, 29 Jan 2025 11:08:42 -0300 Subject: [PATCH 02/23] kanban post actions --- post/user/ticket_kanban.php | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 post/user/ticket_kanban.php diff --git a/post/user/ticket_kanban.php b/post/user/ticket_kanban.php new file mode 100644 index 00000000..a591ae16 --- /dev/null +++ b/post/user/ticket_kanban.php @@ -0,0 +1,51 @@ + 'success']); + exit; +} + +if (isset($_POST['update_kanban_ticket'])) { + // Update ticket kanban order and status + enforceUserPermission('module_support', 2); + + $positions = $_POST['positions']; + + foreach ($positions as $position) { + $ticket_id = intval($position['ticket_id']); + $kanban = intval($position['ticket_kanban']); // ticket kanban position + $status = intval($position['ticket_status']); // ticket statuses + + // Exit if status is null + if ($status === null) { + //echo json_encode(['status' => 'error', 'message' => 'Ticket status is null']); + continue; + } + + mysqli_query($mysqli, "UPDATE tickets SET ticket_kanban = $kanban, ticket_status = $status WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + } + + // return a response + echo json_encode(['status' => 'success','payload' => $positions]); + exit; +} From 3e0e72dedc07b9b7d3c69dbccb8b17e9f2f6199f Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Wed, 29 Jan 2025 11:39:54 -0300 Subject: [PATCH 03/23] database update for kanban --- database_updates.php | 16 +++++++++++++--- db.sql | 2 ++ includes/database_version.php | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/database_updates.php b/database_updates.php index 8ee3abf5..bac093b9 100644 --- a/database_updates.php +++ b/database_updates.php @@ -2469,10 +2469,20 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.0'"); } - // if (CURRENT_DATABASE_VERSION == '1.8.0') { - // // Insert queries here required to update to DB version 1.8.1 + if (CURRENT_DATABASE_VERSION == '1.8.0') { + + + mysqli_query($mysqli, "ALTER TABLE `ticket_statuses` ADD `ticket_status_kanban` int(11)"); + + mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_kanban` int(11);"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.1'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.8.1') { + // // Insert queries here required to update to DB version 1.8.2 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.1'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.2'"); // } } else { diff --git a/db.sql b/db.sql index 31f409e0..b8236e31 100644 --- a/db.sql +++ b/db.sql @@ -2019,6 +2019,7 @@ CREATE TABLE `ticket_statuses` ( `ticket_status_name` varchar(200) NOT NULL, `ticket_status_color` varchar(200) NOT NULL, `ticket_status_active` tinyint(1) NOT NULL DEFAULT 1, + `ticket_status_kanban` int(11), PRIMARY KEY (`ticket_status_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2113,6 +2114,7 @@ CREATE TABLE `tickets` ( `ticket_asset_id` int(11) NOT NULL DEFAULT 0, `ticket_invoice_id` int(11) NOT NULL DEFAULT 0, `ticket_project_id` int(11) NOT NULL DEFAULT 0, + `ticket_kanban` int(11), PRIMARY KEY (`ticket_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/includes/database_version.php b/includes/database_version.php index c1d450cd..292483e0 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.8.0"); +DEFINE("LATEST_DATABASE_VERSION", "1.8.1"); From ed5aa9a0c2475efa76e00e00589bb192da803a2e Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Wed, 29 Jan 2025 12:00:52 -0300 Subject: [PATCH 04/23] sync last changes sync last changes on days 27 and 28 --- tickets_list.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tickets_list.php b/tickets_list.php index 6ed456c7..0c9d39e6 100644 --- a/tickets_list.php +++ b/tickets_list.php @@ -1,5 +1,5 @@
-
+
@@ -19,12 +19,12 @@ - Subject / Tasks + Subject - Client / Contact + Client / Contact @@ -121,7 +121,7 @@ if (empty($contact_name)) { $contact_display = "-"; } else { - $contact_display = "$contact_name
$contact_email"; + $contact_display = "$contact_name"; } // Get who last updated the ticket - to be shown in the last Response column From c02b267d4481c204a2f99d022f2f2586b3e4113e Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Wed, 29 Jan 2025 15:55:58 -0300 Subject: [PATCH 05/23] update tickets.php --- tickets.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tickets.php b/tickets.php index 842a8f1c..378185a9 100644 --- a/tickets.php +++ b/tickets.php @@ -37,12 +37,13 @@ if (isset($_GET['status']) && is_array($_GET['status']) && !empty($_GET['status' } if (isset($_GET['category'])) { - if ($_GET['category'] == 'empty') { + $category = sanitizeInput($_GET['category']); + if ($category == 'empty') { $category_snippet = "AND ticket_category = 0 "; - } elseif ($_GET['category'] == 'all') { + } elseif ($category == 'all') { $category_snippet = ""; } else { - $category_snippet = "AND ticket_category = " . $_GET['category']; + $category_snippet = "AND ticket_category = " . $category; } } From 1fb243df11ceed368093c8ce1fb75364f655bf2e Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Wed, 29 Jan 2025 16:03:24 -0300 Subject: [PATCH 06/23] update compact list --- tickets_compact.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tickets_compact.php b/tickets_compact.php index aa0107e5..b484ce87 100644 --- a/tickets_compact.php +++ b/tickets_compact.php @@ -24,7 +24,7 @@ - = 2) { ?> + = 2) { ?> Billable From dec91d116a18b9ec1e38f535f1aa2b2eaccb081a Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Wed, 29 Jan 2025 16:10:40 -0300 Subject: [PATCH 07/23] update tickets_compact.php --- tickets_compact.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tickets_compact.php b/tickets_compact.php index b484ce87..04e47f20 100644 --- a/tickets_compact.php +++ b/tickets_compact.php @@ -9,35 +9,35 @@
- +
- + Ticket - + Client = 2) { ?> - + Billable - + Status - + Assigned @@ -187,7 +187,7 @@ - $ticket_subject"; } else { @@ -198,14 +198,14 @@ 0) { ?> -
+
-
+

@@ -221,7 +221,7 @@ - = 2) { ?> + = 2) { ?> Date: Wed, 29 Jan 2025 16:12:32 -0300 Subject: [PATCH 08/23] update ticket_kanban.php --- post/user/ticket_kanban.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/post/user/ticket_kanban.php b/post/user/ticket_kanban.php index a591ae16..e427fdd1 100644 --- a/post/user/ticket_kanban.php +++ b/post/user/ticket_kanban.php @@ -14,7 +14,7 @@ if (isset($_POST['update_kanban_status_position'])) { foreach ($positions as $position) { $status_id = intval($position['status_id']); - $kanban = intval($position['status_kanban']); + $kanban = intval($position['status_kanban']); mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_kanban = $kanban WHERE ticket_status_id = $status_id"); } @@ -35,9 +35,8 @@ if (isset($_POST['update_kanban_ticket'])) { $kanban = intval($position['ticket_kanban']); // ticket kanban position $status = intval($position['ticket_status']); // ticket statuses - // Exit if status is null + // Continue if status is null if ($status === null) { - //echo json_encode(['status' => 'error', 'message' => 'Ticket status is null']); continue; } From 04fac54987300a6246d498b30acf1c3391e8b25f Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Wed, 29 Jan 2025 16:17:29 -0300 Subject: [PATCH 09/23] update tickets_list.php --- tickets_list.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tickets_list.php b/tickets_list.php index 0c9d39e6..e80687f8 100644 --- a/tickets_list.php +++ b/tickets_list.php @@ -9,7 +9,7 @@
- +
@@ -195,12 +195,12 @@ 0) { ?> -
+
-
+

@@ -262,12 +262,12 @@ // Edit actions, for open tickets if (empty($ticket_closed_at)) { - require "modals/ticket_assign_modal.php"; + require_once "modals/ticket_assign_modal.php"; - require "modals/ticket_edit_priority_modal.php"; + require_once "modals/ticket_edit_priority_modal.php"; if ($config_module_enable_accounting) { - require "modals/ticket_edit_billable_modal.php"; + require_once "modals/ticket_edit_billable_modal.php"; } } } From b6e0990a780e288e2c922824645523a6acc7ce67 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Wed, 29 Jan 2025 16:21:08 -0300 Subject: [PATCH 10/23] update tickets.php --- tickets.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tickets.php b/tickets.php index 378185a9..e70d7b29 100644 --- a/tickets.php +++ b/tickets.php @@ -177,13 +177,13 @@ $sql_categories = mysqli_query(
All
- - +
No Category From e498cc6036aad6b82f42715183d240bd4dc63fbb Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Wed, 29 Jan 2025 16:27:53 -0300 Subject: [PATCH 11/23] update tickets_kanban.php --- tickets_kanban.php | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/tickets_kanban.php b/tickets_kanban.php index ec30e364..159f412a 100644 --- a/tickets_kanban.php +++ b/tickets_kanban.php @@ -6,9 +6,9 @@ #kanban-board { display: flex; box-sizing: border-box; - overflow-x: auto; + overflow-x: auto; min-width: 400px; - height: calc(100vh - 210px); + height: calc(100vh - 210px); } .kanban-column { @@ -19,8 +19,8 @@ background: #f4f4f4; padding: 10px; border: 1px solid #ccc; - min-height: calc(100vh - 230px); - max-height: calc(100vh - 230px); + min-height: calc(100vh - 230px); + max-height: calc(100vh - 230px); box-sizing: border-box; } @@ -92,8 +92,12 @@ $kanban_array = array_values($statuses); // Sort the array by the 'order' field, moving null values to the end usort($kanban_array, function($a, $b) { - if ($a->order === null) return 1; - if ($b->order === null) return -1; + if ($a->order === null) { + return 1; + } + if ($b->order === null) { + return -1; + } return $a->order - $b->order; }); @@ -138,7 +142,7 @@ $kanban = $ordered_kanban; } ?> -
- Date: Wed, 29 Jan 2025 16:30:04 -0300 Subject: [PATCH 12/23] update --- tickets_kanban.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tickets_kanban.php b/tickets_kanban.php index 159f412a..6970e869 100644 --- a/tickets_kanban.php +++ b/tickets_kanban.php @@ -131,7 +131,7 @@ $kanban = $ordered_kanban;
name); ?>
- tickets as $item){ if ($item['ticket_priority'] == "High") { $ticket_priority_color = "danger"; From 9ee159c458fd34d9fc30b0bd0b1df870cd5f8a44 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Wed, 29 Jan 2025 16:52:12 -0300 Subject: [PATCH 13/23] fix card move, after qualitygate changes --- tickets_kanban.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tickets_kanban.php b/tickets_kanban.php index 6970e869..13f0c0b6 100644 --- a/tickets_kanban.php +++ b/tickets_kanban.php @@ -131,7 +131,7 @@ $kanban = $ordered_kanban;
name); ?>
- tickets as $item){ if ($item['ticket_priority'] == "High") { $ticket_priority_color = "danger"; @@ -273,6 +273,7 @@ $kanban = $ordered_kanban; //update the status id of the card if needed if (statusId != columnId) { $(card).data('ticket-status-id', columnId); + statusId = columnId; } positions.push({ ticket_id: ticketId, From f4eaba4384a254b2a3b602bdc152e0ea50f854bf Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Wed, 29 Jan 2025 16:53:52 -0300 Subject: [PATCH 14/23] fix whitespace qualitygate --- tickets_kanban.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tickets_kanban.php b/tickets_kanban.php index 13f0c0b6..8d576846 100644 --- a/tickets_kanban.php +++ b/tickets_kanban.php @@ -131,7 +131,7 @@ $kanban = $ordered_kanban;
name); ?>
- tickets as $item){ if ($item['ticket_priority'] == "High") { $ticket_priority_color = "danger"; From e3ae8df4d87033132a21c28953fbf6bc75657619 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Fri, 31 Jan 2025 11:50:06 -0300 Subject: [PATCH 15/23] new changes --- ajax.php | 77 +++++++++++++++++++++++++++++++++ database_updates.php | 2 +- db.sql | 2 +- plugins/dragula/dragula.min.css | 1 + plugins/dragula/dragula.min.js | 1 + post/user/ticket_kanban.php | 50 --------------------- tickets.php | 10 +++-- tickets_kanban.php | 36 +++++++-------- 8 files changed, 107 insertions(+), 72 deletions(-) create mode 100644 plugins/dragula/dragula.min.css create mode 100644 plugins/dragula/dragula.min.js delete mode 100644 post/user/ticket_kanban.php diff --git a/ajax.php b/ajax.php index 36b232db..59ce8bf9 100644 --- a/ajax.php +++ b/ajax.php @@ -529,3 +529,80 @@ if (isset($_GET['get_totp_token_via_id'])) { if (isset($_GET['get_readable_pass'])) { echo json_encode(GenerateReadablePassword(4)); } + +/* + * ITFlow - POST request handler for client tickets + */ +if (isset($_POST['update_kanban_status_position'])) { + // Update multiple ticket status kanban orders + enforceUserPermission('module_support', 2); + + $positions = $_POST['positions']; + + foreach ($positions as $position) { + $status_id = intval($position['status_id']); + $kanban = intval($position['status_kanban']); + + mysqli_query($mysqli, "UPDATE ticket_statuses SET ticket_status_order = $kanban WHERE ticket_status_id = $status_id"); + } + + // return a response + echo json_encode(['status' => 'success']); + exit; +} + +if (isset($_POST['update_kanban_ticket'])) { + // Update ticket kanban order and status + enforceUserPermission('module_support', 2); + + + // have to do new logic, to update only one dragged ticket + $positions = $_POST['positions']; //old and new position + + + + + // old logic that updated all tickets on the column + $positions = $_POST['positions']; + + foreach ($positions as $position) { + $ticket_id = intval($position['ticket_id']); + $kanban = intval($position['ticket_kanban']); // ticket kanban position + $status = intval($position['ticket_status']); // ticket statuses + $oldStatus = intval($position['ticket_oldStatus']); // ticket old status if moved + + $statuses['Closed'] = 5; + $statuses['Resolved'] = 4; + + // Continue if status is null / Closed + if ($status === null || $status === $statuses['Closed']) { + continue; + } + + + if ($oldStatus === false) { + // if ticket was not moved, just uptdate the order on kanban + mysqli_query($mysqli, "UPDATE tickets SET ticket_kanban = $kanban WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + } else { + // If the ticket was moved from a resolved status to another status, we need to update ticket_resolved_at + if ($oldStatus === $statuses['Resolved']) { + mysqli_query($mysqli, "UPDATE tickets SET ticket_kanban = $kanban, ticket_status = $status, ticket_resolved_at = NULL WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + } elseif ($status === $statuses['Resolved']) { + // If the ticket was moved to a resolved status, we need to update ticket_resolved_at + mysqli_query($mysqli, "UPDATE tickets SET ticket_kanban = $kanban, ticket_status = $status, ticket_resolved_at = NOW() WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + } else { + // If the ticket was moved from any status to another status + mysqli_query($mysqli, "UPDATE tickets SET ticket_kanban = $kanban, ticket_status = $status WHERE ticket_id = $ticket_id"); + customAction('ticket_update', $ticket_id); + } + } + + } + + // return a response + echo json_encode(['status' => 'success','payload' => $positions]); + exit; +} \ No newline at end of file diff --git a/database_updates.php b/database_updates.php index bac093b9..d0610d0a 100644 --- a/database_updates.php +++ b/database_updates.php @@ -2472,7 +2472,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { if (CURRENT_DATABASE_VERSION == '1.8.0') { - mysqli_query($mysqli, "ALTER TABLE `ticket_statuses` ADD `ticket_status_kanban` int(11)"); + mysqli_query($mysqli, "ALTER TABLE `ticket_statuses` ADD `ticket_status_order` int(11)"); mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_kanban` int(11);"); diff --git a/db.sql b/db.sql index b8236e31..c1c4ea8d 100644 --- a/db.sql +++ b/db.sql @@ -2019,7 +2019,7 @@ CREATE TABLE `ticket_statuses` ( `ticket_status_name` varchar(200) NOT NULL, `ticket_status_color` varchar(200) NOT NULL, `ticket_status_active` tinyint(1) NOT NULL DEFAULT 1, - `ticket_status_kanban` int(11), + `ticket_status_order` int(11), PRIMARY KEY (`ticket_status_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/plugins/dragula/dragula.min.css b/plugins/dragula/dragula.min.css new file mode 100644 index 00000000..a080100e --- /dev/null +++ b/plugins/dragula/dragula.min.css @@ -0,0 +1 @@ +.gu-mirror{position:fixed!important;margin:0!important;z-index:9999!important;opacity:.8}.gu-hide{display:none!important}.gu-unselectable{-webkit-user-select:none!important;-moz-user-select:none!important;-ms-user-select:none!important;user-select:none!important}.gu-transit{opacity:.2} \ No newline at end of file diff --git a/plugins/dragula/dragula.min.js b/plugins/dragula/dragula.min.js new file mode 100644 index 00000000..dd61cd87 --- /dev/null +++ b/plugins/dragula/dragula.min.js @@ -0,0 +1 @@ +!function(e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).dragula=e()}(function(){return function o(r,i,u){function c(t,e){if(!i[t]){if(!r[t]){var n="function"==typeof require&&require;if(!e&&n)return n(t,!0);if(a)return a(t,!0);throw(n=new Error("Cannot find module '"+t+"'")).code="MODULE_NOT_FOUND",n}n=i[t]={exports:{}},r[t][0].call(n.exports,function(e){return c(r[t][1][e]||e)},n,n.exports,o,r,i,u)}return i[t].exports}for(var a="function"==typeof require&&require,e=0;ee.left+G(e)/2);return n(u>e.top+J(e)/2)}:function(){var e,t,n,o=r.children.length;for(e=0;ei)return t;if(!c&&n.top+n.height/2>u)return t}return null})();function n(e){return e?Z(t):t}}}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./classes":1,"contra/emitter":5,crossvent:6}],3:[function(e,t,n){t.exports=function(e,t){return Array.prototype.slice.call(e,t)}},{}],4:[function(e,t,n){"use strict";var o=e("ticky");t.exports=function(e,t,n){e&&o(function(){e.apply(n||null,t||[])})}},{ticky:10}],5:[function(e,t,n){"use strict";var c=e("atoa"),a=e("./debounce");t.exports=function(r,e){var i=e||{},u={};return void 0===r&&(r={}),r.on=function(e,t){return u[e]?u[e].push(t):u[e]=[t],r},r.once=function(e,t){return t._once=!0,r.on(e,t),r},r.off=function(e,t){var n=arguments.length;if(1===n)delete u[e];else if(0===n)u={};else{e=u[e];if(!e)return r;e.splice(e.indexOf(t),1)}return r},r.emit=function(){var e=c(arguments);return r.emitterSnapshot(e.shift()).apply(this,e)},r.emitterSnapshot=function(o){var e=(u[o]||[]).slice(0);return function(){var t=c(arguments),n=this||r;if("error"===o&&!1!==i.throws&&!e.length)throw 1===t.length?t[0]:t;return e.forEach(function(e){i.async?a(e,t,n):e.apply(n,t),e._once&&r.off(o,e)}),r}},r}},{"./debounce":4,atoa:3}],6:[function(n,o,e){(function(r){"use strict";var i=n("custom-event"),u=n("./eventmap"),c=r.document,e=function(e,t,n,o){return e.addEventListener(t,n,o)},t=function(e,t,n,o){return e.removeEventListener(t,n,o)},a=[];function l(e,t,n){t=function(e,t,n){var o,r;for(o=0;o 'success']); - exit; -} - -if (isset($_POST['update_kanban_ticket'])) { - // Update ticket kanban order and status - enforceUserPermission('module_support', 2); - - $positions = $_POST['positions']; - - foreach ($positions as $position) { - $ticket_id = intval($position['ticket_id']); - $kanban = intval($position['ticket_kanban']); // ticket kanban position - $status = intval($position['ticket_status']); // ticket statuses - - // Continue if status is null - if ($status === null) { - continue; - } - - mysqli_query($mysqli, "UPDATE tickets SET ticket_kanban = $kanban, ticket_status = $status WHERE ticket_id = $ticket_id"); - customAction('ticket_update', $ticket_id); - } - - // return a response - echo json_encode(['status' => 'success','payload' => $positions]); - exit; -} diff --git a/tickets.php b/tickets.php index e70d7b29..d7d8fd24 100644 --- a/tickets.php +++ b/tickets.php @@ -41,10 +41,12 @@ if (isset($_GET['category'])) { if ($category == 'empty') { $category_snippet = "AND ticket_category = 0 "; } elseif ($category == 'all') { - $category_snippet = ""; + $category_snippet = ''; } else { $category_snippet = "AND ticket_category = " . $category; } +} else { + $category_snippet = ''; } @@ -166,8 +168,10 @@ $sql_categories = mysqli_query( List
Compact List +
Kanban +
@@ -353,9 +357,9 @@ $sql_categories = mysqli_query(
- + - +
name); ?>
-
+
tickets as $item){ if ($item['ticket_priority'] == "High") { @@ -193,120 +156,4 @@ $kanban = $ordered_kanban; - - \ No newline at end of file + \ No newline at end of file From c7b9c95d0daa142280dd6a4594a4ddf10ca316e6 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Tue, 4 Feb 2025 09:59:45 -0300 Subject: [PATCH 18/23] missing tickets_kanban.css --- css/tickets_kanban.css | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 css/tickets_kanban.css diff --git a/css/tickets_kanban.css b/css/tickets_kanban.css new file mode 100644 index 00000000..d4a78cbe --- /dev/null +++ b/css/tickets_kanban.css @@ -0,0 +1,35 @@ +.popover { + max-width: 600px; +} +#kanban-board { + display: flex; + box-sizing: border-box; + overflow-x: auto; + min-width: 400px; + height: calc(100vh - 210px); +} + +.kanban-column { + flex: 1; /* Allows columns to grow equally */ + margin: 0 10px; /* Space between columns */ + min-width: 300px; + max-width: 300px; + background: #f4f4f4; + padding: 10px; + border: 1px solid #ccc; + min-height: calc(100vh - 230px); + max-height: calc(100vh - 230px); + box-sizing: border-box; +} + +.kanban-column div { + max-height: calc(100vh - 280px); /* Set your desired max height */ + overflow-y: auto; /* Adds a scrollbar when content exceeds max height */ +} + +.task { + background: #fff; + margin: 5px 0; + padding: 10px; + border: 1px solid #ddd; +} \ No newline at end of file From 17cd1fd0c1cf7896e2b802aceddba1a67ce163ba Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Tue, 4 Feb 2025 10:16:52 -0300 Subject: [PATCH 19/23] ajax cleanup --- ajax.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ajax.php b/ajax.php index 59ce8bf9..1d795222 100644 --- a/ajax.php +++ b/ajax.php @@ -554,15 +554,8 @@ if (isset($_POST['update_kanban_status_position'])) { if (isset($_POST['update_kanban_ticket'])) { // Update ticket kanban order and status enforceUserPermission('module_support', 2); - - // have to do new logic, to update only one dragged ticket - $positions = $_POST['positions']; //old and new position - - - - - // old logic that updated all tickets on the column + // all tickets on the column $positions = $_POST['positions']; foreach ($positions as $position) { From 3de97fcd15c7fc82712f943a02e30f2c13faec17 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Tue, 4 Feb 2025 10:47:23 -0300 Subject: [PATCH 20/23] nullable_htmlentities --- tickets_kanban.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tickets_kanban.php b/tickets_kanban.php index 8bb2eea4..058d4c00 100644 --- a/tickets_kanban.php +++ b/tickets_kanban.php @@ -10,7 +10,7 @@ $status_sql = mysqli_query($mysqli, "SELECT * FROM ticket_statuses where ticket_ $statuses = []; while ($status_row = mysqli_fetch_array($status_sql)) { $id = $status_row['ticket_status_id']; - $name = $status_row['ticket_status_name']; + $name = nullable_htmlentities($status_row['ticket_status_name']); $kanban_order = $status_row['ticket_status_order']; $statuses[$id] = new stdClass(); @@ -45,6 +45,13 @@ while ($row = mysqli_fetch_array($sql)) { $ticket_order = $row['ticket_kanban']; $row['ticket_order'] = $ticket_order; // Store the ticket order + // Loop over all items in $row to apply nullable_htmlentities only if the content is a string + foreach ($row as $key => $value) { + if (is_string($value)) { + $row[$key] = nullable_htmlentities($value); + } + } + if (isset($statuses[$id])) { $statuses[$id]->tickets[] = $row; } From 65bb1b4007660ad07020e8bed8851c1e71678bdc Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Tue, 4 Feb 2025 13:35:28 -0300 Subject: [PATCH 21/23] alter ticket_kanban to ticket_order --- ajax.php | 10 +++++----- database_updates.php | 2 +- db.sql | 2 +- js/tickets_kanban.js | 2 +- tickets_kanban.php | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ajax.php b/ajax.php index 1d795222..34d9d2eb 100644 --- a/ajax.php +++ b/ajax.php @@ -560,7 +560,7 @@ if (isset($_POST['update_kanban_ticket'])) { foreach ($positions as $position) { $ticket_id = intval($position['ticket_id']); - $kanban = intval($position['ticket_kanban']); // ticket kanban position + $kanban = intval($position['ticket_order']); // ticket kanban position $status = intval($position['ticket_status']); // ticket statuses $oldStatus = intval($position['ticket_oldStatus']); // ticket old status if moved @@ -575,20 +575,20 @@ if (isset($_POST['update_kanban_ticket'])) { if ($oldStatus === false) { // if ticket was not moved, just uptdate the order on kanban - mysqli_query($mysqli, "UPDATE tickets SET ticket_kanban = $kanban WHERE ticket_id = $ticket_id"); + mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban WHERE ticket_id = $ticket_id"); customAction('ticket_update', $ticket_id); } else { // If the ticket was moved from a resolved status to another status, we need to update ticket_resolved_at if ($oldStatus === $statuses['Resolved']) { - mysqli_query($mysqli, "UPDATE tickets SET ticket_kanban = $kanban, ticket_status = $status, ticket_resolved_at = NULL WHERE ticket_id = $ticket_id"); + mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban, ticket_status = $status, ticket_resolved_at = NULL WHERE ticket_id = $ticket_id"); customAction('ticket_update', $ticket_id); } elseif ($status === $statuses['Resolved']) { // If the ticket was moved to a resolved status, we need to update ticket_resolved_at - mysqli_query($mysqli, "UPDATE tickets SET ticket_kanban = $kanban, ticket_status = $status, ticket_resolved_at = NOW() WHERE ticket_id = $ticket_id"); + mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban, ticket_status = $status, ticket_resolved_at = NOW() WHERE ticket_id = $ticket_id"); customAction('ticket_update', $ticket_id); } else { // If the ticket was moved from any status to another status - mysqli_query($mysqli, "UPDATE tickets SET ticket_kanban = $kanban, ticket_status = $status WHERE ticket_id = $ticket_id"); + mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban, ticket_status = $status WHERE ticket_id = $ticket_id"); customAction('ticket_update', $ticket_id); } } diff --git a/database_updates.php b/database_updates.php index 9304c7c9..20d9433f 100644 --- a/database_updates.php +++ b/database_updates.php @@ -2474,7 +2474,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "ALTER TABLE `ticket_statuses` ADD `ticket_status_order` int(11) NOT NULL DEFAULT 0"); - mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_kanban` int(11) NOT NULL DEFAULT 0"); + mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_order` int(11) NOT NULL DEFAULT 0"); mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.1'"); } diff --git a/db.sql b/db.sql index 7ccb5c63..dad2b9a7 100644 --- a/db.sql +++ b/db.sql @@ -2114,7 +2114,7 @@ CREATE TABLE `tickets` ( `ticket_asset_id` int(11) NOT NULL DEFAULT 0, `ticket_invoice_id` int(11) NOT NULL DEFAULT 0, `ticket_project_id` int(11) NOT NULL DEFAULT 0, - `ticket_kanban` int(11) NOT NULL DEFAULT 0, + `ticket_order` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`ticket_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/js/tickets_kanban.js b/js/tickets_kanban.js index 9158e1d0..5d3b2df4 100644 --- a/js/tickets_kanban.js +++ b/js/tickets_kanban.js @@ -82,7 +82,7 @@ $(document).ready(function() { } positions.push({ ticket_id: ticketId, - ticket_kanban: index, + ticket_order: index, ticket_oldStatus: oldStatus, ticket_status: statusId ?? null// Get the new status ID from the target column }); diff --git a/tickets_kanban.php b/tickets_kanban.php index 058d4c00..01f48b97 100644 --- a/tickets_kanban.php +++ b/tickets_kanban.php @@ -42,7 +42,7 @@ $sql = mysqli_query( while ($row = mysqli_fetch_array($sql)) { $id = $row['ticket_status_id']; - $ticket_order = $row['ticket_kanban']; + $ticket_order = $row['ticket_order']; $row['ticket_order'] = $ticket_order; // Store the ticket order // Loop over all items in $row to apply nullable_htmlentities only if the content is a string @@ -71,7 +71,7 @@ usort($kanban_array, function($a, $b) { return $a->order - $b->order; }); -// Sort tickets within each column by 'ticket_kanban' +// Sort tickets within each column by 'ticket_order' foreach ($kanban_array as $kanban_column) { usort($kanban_column->tickets, function($a, $b) { return $a['ticket_order'] - $b['ticket_order']; From ee2e4b671d88082d37579f45b2e738af6cb63e6a Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Tue, 4 Feb 2025 17:07:42 -0300 Subject: [PATCH 22/23] ticket kanban settings --- database_updates.php | 4 ++ db.sql | 3 ++ get_settings.php | 3 ++ js/tickets_kanban.js | 14 ++++++- post/admin/admin_settings_ticket.php | 9 +++-- tickets.php | 12 +++++- tickets_kanban.php | 56 +++++++++++----------------- 7 files changed, 59 insertions(+), 42 deletions(-) diff --git a/database_updates.php b/database_updates.php index 20d9433f..b4cc80cb 100644 --- a/database_updates.php +++ b/database_updates.php @@ -2476,6 +2476,10 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_order` int(11) NOT NULL DEFAULT 0"); + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_default_view` tinyint(1) NOT NULL DEFAULT 0"); + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_ordering` tinyint(1) NOT NULL DEFAULT 0"); + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_moving_columns` tinyint(1) NOT NULL DEFAULT 1"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.1'"); } diff --git a/db.sql b/db.sql index dad2b9a7..0399a3e4 100644 --- a/db.sql +++ b/db.sql @@ -1704,6 +1704,9 @@ CREATE TABLE `settings` ( `config_ticket_autoclose_hours` int(5) NOT NULL DEFAULT 72, `config_ticket_new_ticket_notification_email` varchar(200) DEFAULT NULL, `config_ticket_default_billable` tinyint(1) NOT NULL DEFAULT 0, + `config_ticket_default_view` tinyint(1) NOT NULL DEFAULT 0, + `config_ticket_moving_columns` tinyint(1) NOT NULL DEFAULT 1, + `config_ticket_ordering` tinyint(1) NOT NULL DEFAULT 0, `config_enable_cron` tinyint(1) NOT NULL DEFAULT 0, `config_recurring_auto_send_invoice` tinyint(1) NOT NULL DEFAULT 1, `config_enable_alert_domain_expire` tinyint(1) NOT NULL DEFAULT 1, diff --git a/get_settings.php b/get_settings.php index 0ccf34ef..e560078e 100644 --- a/get_settings.php +++ b/get_settings.php @@ -75,6 +75,9 @@ $config_ticket_client_general_notifications = intval($row['config_ticket_client_ $config_ticket_autoclose_hours = intval($row['config_ticket_autoclose_hours']); $config_ticket_new_ticket_notification_email = $row['config_ticket_new_ticket_notification_email']; $config_ticket_default_billable = intval($row['config_ticket_default_billable']); +$config_ticket_default_view = intval($row['config_ticket_default_view']); +$config_ticket_moving_columns = intval($row['config_ticket_moving_columns']); +$config_ticket_ordering = intval($row['config_ticket_ordering']); // Cron $config_enable_cron = intval($row['config_enable_cron']); diff --git a/js/tickets_kanban.js b/js/tickets_kanban.js index 5d3b2df4..706ca9f9 100644 --- a/js/tickets_kanban.js +++ b/js/tickets_kanban.js @@ -1,20 +1,25 @@ $(document).ready(function() { + console.log('CONFIG_TICKET_MOVING_COLUMNS: ' + CONFIG_TICKET_MOVING_COLUMNS); + console.log('CONFIG_TICKET_ORDERING: ' + CONFIG_TICKET_ORDERING); // Initialize Dragula for the Kanban board let boardDrake = dragula([ document.querySelector('#kanban-board') ], { moves: function(el, container, handle) { return handle.classList.contains('panel-title'); + }, + accepts: function(el, target, source, sibling) { + return CONFIG_TICKET_MOVING_COLUMNS === 1; } }); // Log the event of moving the column panel-title boardDrake.on('drag', function(el) { - console.log('Dragging column:', el.querySelector('.panel-title').innerText); + //console.log('Dragging column:', el.querySelector('.panel-title').innerText); }); boardDrake.on('drop', function(el, target, source, sibling) { - console.log('Dropped column:', el.querySelector('.panel-title').innerText); + //console.log('Dropped column:', el.querySelector('.panel-title').innerText); // Get all columns and their positions let columns = document.querySelectorAll('#kanban-board .kanban-column'); @@ -55,6 +60,11 @@ $(document).ready(function() { drake.on('drop', function (el, target, source, sibling) { // Log the target ID to the console //console.log('Dropped into:', target.getAttribute('data-column-name')); + + if (CONFIG_TICKET_ORDERING === 0 && source == target) { + drake.cancel(true); // Move the card back to its original position + return; + } // Get all cards in the target column and their positions let cards = $(target).children('.task'); diff --git a/post/admin/admin_settings_ticket.php b/post/admin/admin_settings_ticket.php index 34561fd6..bc75e518 100644 --- a/post/admin/admin_settings_ticket.php +++ b/post/admin/admin_settings_ticket.php @@ -14,8 +14,11 @@ if (isset($_POST['edit_ticket_settings'])) { if (filter_var($_POST['config_ticket_new_ticket_notification_email'], FILTER_VALIDATE_EMAIL)) { $config_ticket_new_ticket_notification_email = sanitizeInput($_POST['config_ticket_new_ticket_notification_email']); } - - mysqli_query($mysqli,"UPDATE settings SET config_ticket_prefix = '$config_ticket_prefix', config_ticket_next_number = $config_ticket_next_number, config_ticket_email_parse = $config_ticket_email_parse, config_ticket_email_parse_unknown_senders = $config_ticket_email_parse_unknown_senders, config_ticket_autoclose_hours = $config_ticket_autoclose_hours, config_ticket_new_ticket_notification_email = '$config_ticket_new_ticket_notification_email', config_ticket_default_billable = $config_ticket_default_billable WHERE company_id = 1"); + $config_ticket_default_view = intval($_POST['config_ticket_default_view']); + $config_ticket_moving_columns = intval($_POST['config_ticket_moving_columns']); + $config_ticket_ordering = intval($_POST['config_ticket_ordering']); + + mysqli_query($mysqli,"UPDATE settings SET config_ticket_prefix = '$config_ticket_prefix', config_ticket_next_number = $config_ticket_next_number, config_ticket_email_parse = $config_ticket_email_parse, config_ticket_email_parse_unknown_senders = $config_ticket_email_parse_unknown_senders, config_ticket_autoclose_hours = $config_ticket_autoclose_hours, config_ticket_new_ticket_notification_email = '$config_ticket_new_ticket_notification_email', config_ticket_default_billable = $config_ticket_default_billable, config_ticket_default_view = $config_ticket_default_view, config_ticket_moving_columns = $config_ticket_moving_columns, config_ticket_ordering = $config_ticket_ordering WHERE company_id = 1"); // Logging logAction("Settings", "Edit", "$session_name edited ticket settings"); @@ -24,4 +27,4 @@ if (isset($_POST['edit_ticket_settings'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); -} +} \ No newline at end of file diff --git a/tickets.php b/tickets.php index d7d8fd24..a1605de9 100644 --- a/tickets.php +++ b/tickets.php @@ -357,7 +357,7 @@ $sql_categories = mysqli_query(
- diff --git a/tickets_kanban.php b/tickets_kanban.php index 01f48b97..feda8644 100644 --- a/tickets_kanban.php +++ b/tickets_kanban.php @@ -20,6 +20,19 @@ while ($status_row = mysqli_fetch_array($status_sql)) { $statuses[$id]->order = $kanban_order; // Store the order } +$ordering_snippet = "ORDER BY + CASE + WHEN ticket_priority = 'High' THEN 1 + WHEN ticket_priority = 'Medium' THEN 2 + WHEN ticket_priority = 'Low' THEN 3 + ELSE 4 + END, + ticket_id DESC"; + +if ($config_ticket_ordering === 1) { + $ordering_snippet = "ORDER BY ticket_order ASC"; +} + // Fetch tickets and merge into statuses $sql = mysqli_query( $mysqli, @@ -37,13 +50,12 @@ $sql = mysqli_query( AND DATE(ticket_created_at) BETWEEN '$dtf' AND '$dtt' AND (CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR client_name LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status_name 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%') $ticket_permission_snippet - ORDER BY $sort $order" + $ordering_snippet" ); while ($row = mysqli_fetch_array($sql)) { $id = $row['ticket_status_id']; $ticket_order = $row['ticket_order']; - $row['ticket_order'] = $ticket_order; // Store the ticket order // Loop over all items in $row to apply nullable_htmlentities only if the content is a string foreach ($row as $key => $value) { @@ -58,38 +70,7 @@ while ($row = mysqli_fetch_array($sql)) { } // Convert associative array to indexed array for sorting -$kanban_array = array_values($statuses); - -// Sort the array by the 'order' field, moving null values to the end -usort($kanban_array, function($a, $b) { - if ($a->order === null) { - return 1; - } - if ($b->order === null) { - return -1; - } - return $a->order - $b->order; -}); - -// Sort tickets within each column by 'ticket_order' -foreach ($kanban_array as $kanban_column) { - usort($kanban_column->tickets, function($a, $b) { - return $a['ticket_order'] - $b['ticket_order']; - }); -} - -// Re-index the sorted array back to associative array if needed -$ordered_kanban = []; -foreach ($kanban_array as $item) { - $ordered_kanban[$item->id] = $item; -} - -$kanban = $ordered_kanban; - - - - - +$kanban = array_values($statuses); ?> @@ -161,6 +142,11 @@ $kanban = $ordered_kanban;
- +"; +echo "const CONFIG_TICKET_MOVING_COLUMNS = " . json_encode($config_ticket_moving_columns) . ";"; +echo "const CONFIG_TICKET_ORDERING = " . json_encode($config_ticket_ordering) . ";"; +echo ""; +?> \ No newline at end of file From 11203f1ad20d439f181bc1a0ead96fa99a7d0f96 Mon Sep 17 00:00:00 2001 From: Hugo Sampaio Date: Tue, 4 Feb 2025 17:27:41 -0300 Subject: [PATCH 23/23] notification when resolved --- ajax.php | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/ajax.php b/ajax.php index 34d9d2eb..358ff327 100644 --- a/ajax.php +++ b/ajax.php @@ -586,6 +586,82 @@ if (isset($_POST['update_kanban_ticket'])) { // If the ticket was moved to a resolved status, we need to update ticket_resolved_at mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban, ticket_status = $status, ticket_resolved_at = NOW() WHERE ticket_id = $ticket_id"); customAction('ticket_update', $ticket_id); + + // Client notification email + if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1) { + + // Get details + $ticket_sql = mysqli_query($mysqli, "SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_subject, ticket_status_name, ticket_assigned_to, ticket_url_key, ticket_client_id FROM tickets + LEFT JOIN clients ON ticket_client_id = client_id + LEFT JOIN contacts ON ticket_contact_id = contact_id + LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id + WHERE ticket_id = $ticket_id + "); + $row = mysqli_fetch_array($ticket_sql); + + $contact_name = sanitizeInput($row['contact_name']); + $contact_email = sanitizeInput($row['contact_email']); + $ticket_prefix = sanitizeInput($row['ticket_prefix']); + $ticket_number = intval($row['ticket_number']); + $ticket_subject = sanitizeInput($row['ticket_subject']); + $client_id = intval($row['ticket_client_id']); + $ticket_assigned_to = intval($row['ticket_assigned_to']); + $ticket_status = sanitizeInput($row['ticket_status_name']); + $url_key = sanitizeInput($row['ticket_url_key']); + + // Sanitize Config vars from get_settings.php + $config_ticket_from_name = sanitizeInput($config_ticket_from_name); + $config_ticket_from_email = sanitizeInput($config_ticket_from_email); + $config_base_url = sanitizeInput($config_base_url); + + // Get Company Info + $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1"); + $row = mysqli_fetch_array($sql); + $company_name = sanitizeInput($row['company_name']); + $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'])); + + // EMAIL + $subject = "Ticket resolved - [$ticket_prefix$ticket_number] - $ticket_subject | (pending closure)"; + $body = "##- Please type your reply above this line -##

Hello $contact_name,

Your ticket regarding $ticket_subject has been marked as solved and is pending closure.

If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or re-open to let us know!

Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Status: $ticket_status
Portal: View ticket

--
$company_name - Support
$config_ticket_from_email
$company_phone"; + + // Check email valid + if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) { + + $data = []; + + // Email Ticket Contact + // Queue Mail + + $data[] = [ + 'from' => $config_ticket_from_email, + 'from_name' => $config_ticket_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body + ]; + } + + // Also Email all the watchers + $sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id"); + $body .= "

----------------------------------------
YOU ARE A COLLABORATOR ON THIS TICKET"; + while ($row = mysqli_fetch_array($sql_watchers)) { + $watcher_email = sanitizeInput($row['watcher_email']); + + // Queue Mail + $data[] = [ + 'from' => $config_ticket_from_email, + 'from_name' => $config_ticket_from_name, + 'recipient' => $watcher_email, + 'recipient_name' => $watcher_email, + 'subject' => $subject, + 'body' => $body + ]; + } + addToMailQueue($data); + } + //End Mail IF + } else { // If the ticket was moved from any status to another status mysqli_query($mysqli, "UPDATE tickets SET ticket_order = $kanban, ticket_status = $status WHERE ticket_id = $ticket_id"); @@ -598,4 +674,23 @@ if (isset($_POST['update_kanban_ticket'])) { // return a response echo json_encode(['status' => 'success','payload' => $positions]); exit; +} + +if (isset($_POST['update_ticket_tasks_order'])) { + // Update multiple ticket tasks order + enforceUserPermission('module_support', 2); + + $positions = $_POST['positions']; + $ticket_id = intval($_POST['ticket_id']); + + foreach ($positions as $position) { + $id = intval($position['id']); + $order = intval($position['order']); + + mysqli_query($mysqli, "UPDATE tasks SET task_order = $order WHERE task_ticket_id = $ticket_id AND task_id = $id"); + } + + // return a response + echo json_encode(['status' => 'success']); + exit; } \ No newline at end of file