From d01024931bc7f0a48a2bc19f1441a64cb823c138 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 29 Jul 2026 17:24:55 -0400 Subject: [PATCH] Retire v1 Ticket and merge into 1 add ticket --- agent/ajax.php | 2 +- agent/includes/inc_client_top_head.php | 2 +- agent/js/tickets_add_modal.js | 54 ++- agent/modals/ticket/ticket_add.php | 433 +++++++++---------------- agent/modals/ticket/ticket_add_v2.php | 350 -------------------- agent/tickets.php | 2 +- 6 files changed, 199 insertions(+), 644 deletions(-) delete mode 100644 agent/modals/ticket/ticket_add_v2.php diff --git a/agent/ajax.php b/agent/ajax.php index 021a38ed..7a9a5e42 100644 --- a/agent/ajax.php +++ b/agent/ajax.php @@ -317,7 +317,7 @@ if (isset($_GET['get_client_contacts'])) { $contact_sql = mysqli_query( $mysqli, - "SELECT contact_id, contact_name, contact_primary, contact_important, contact_technical FROM contacts + "SELECT contact_id, contact_name, contact_title, contact_email, contact_primary, contact_important, contact_technical FROM contacts LEFT JOIN clients on contact_client_id = client_id WHERE contacts.contact_archived_at IS NULL AND contact_client_id = $client_id $access_permission_query diff --git a/agent/includes/inc_client_top_head.php b/agent/includes/inc_client_top_head.php index 7984836f..9bf26df1 100644 --- a/agent/includes/inc_client_top_head.php +++ b/agent/includes/inc_client_top_head.php @@ -14,7 +14,7 @@
= 2) { ?> - + New Ticket diff --git a/agent/js/tickets_add_modal.js b/agent/js/tickets_add_modal.js index 4008d9c9..3ac04623 100644 --- a/agent/js/tickets_add_modal.js +++ b/agent/js/tickets_add_modal.js @@ -87,19 +87,24 @@ function refreshDropdown(dropdown) { } } -// Re-applies the value the modal was opened with (e.g. ticket_add_v2.php?project_id=4), +// Re-applies the value the modal was opened with (e.g. ticket_add.php?project_id=4), // which can only be selected once the options it refers to exist function applyPreselection(dropdown) { - // '0' is the "none selected" value every one of these dropdowns uses, and is - // truthy as a string - so it has to be excluded explicitly - if (!dropdown || !dropdown.dataset.selected || dropdown.dataset.selected === '0') { + if (!hasPreselection(dropdown)) { return; } dropdown.value = dropdown.dataset.selected; } +// True when the modal was opened with a specific value for this dropdown. +// '0' is the "none selected" value every one of these dropdowns uses, and is +// truthy as a string - so it has to be excluded explicitly. +function hasPreselection(dropdown) { + return Boolean(dropdown && dropdown.dataset.selected && dropdown.dataset.selected !== '0'); +} + // Adds an optgroup to a dropdown and returns it, so options can be appended into it function appendOptionGroup(dropdown, label) { @@ -144,10 +149,11 @@ function buildAssetLabel(asset) { return label; } -// Populate client contacts +// Populate client contacts - one request feeds both the contact picker and the +// watchers list, as both are built from the same set of people function populateContactsDropdown(client_id) { - if (!document.getElementById("contactSelect")) { + if (!document.getElementById("contactSelect") && !document.getElementById("watchersSelect")) { return; } @@ -164,22 +170,46 @@ function populateContactsDropdown(client_id) { const contacts = response.contacts || []; // Contacts dropdown - const contactSelectDropdown = resetDropdown("contactSelect", '- Contact -', '0'); + const contactSelectDropdown = resetDropdown("contactSelect", '- No One -', '0'); + + // Watchers is a tags field - any address can be typed in, these are just the handy ones + const watchersDropdown = resetDropdown("watchersSelect", null, null); // Populate dropdown contacts.forEach(contact => { var appendText = ""; - if (contact.contact_primary == "1") { - appendText = " (Primary)"; - } else if (contact.contact_technical == "1") { - appendText = " (Technical)"; + if (contact.contact_title) { + appendText = " - " + contact.contact_title; + } + if (contact.contact_primary == "1") { + appendText = appendText + " (Primary)"; + } else if (contact.contact_technical == "1") { + appendText = appendText + " (Technical)"; + } + + if (contactSelectDropdown) { + contactSelectDropdown[contactSelectDropdown.length] = new Option(contact.contact_name + appendText, contact.contact_id); + } + + if (watchersDropdown && contact.contact_email) { + watchersDropdown[watchersDropdown.length] = new Option(contact.contact_email, contact.contact_email); } - contactSelectDropdown[contactSelectDropdown.length] = new Option(contact.contact_name + appendText, contact.contact_id); }); + // Default to the client's primary contact unless the modal was opened for a + // specific one. Contacts arrive primary-first. + if (contactSelectDropdown && !hasPreselection(contactSelectDropdown)) { + const primaryContact = contacts.find(contact => contact.contact_primary == "1"); + + if (primaryContact) { + contactSelectDropdown.value = primaryContact.contact_id; + } + } + applyPreselection(contactSelectDropdown); refreshDropdown(contactSelectDropdown); + refreshDropdown(watchersDropdown); } ); diff --git a/agent/modals/ticket/ticket_add.php b/agent/modals/ticket/ticket_add.php index b31ec92f..6830f10c 100644 --- a/agent/modals/ticket/ticket_add.php +++ b/agent/modals/ticket/ticket_add.php @@ -4,8 +4,8 @@ require_once '../../../includes/modal_header.php'; $client_id = intval($_GET['client_id'] ?? 0); $contact_id = intval($_GET['contact_id'] ?? 0); -$asset_id = intval($_GET['asset_id'] ?? 0); $project_id = intval($_GET['project_id'] ?? 0); +$asset_id = intval($_GET['asset_id'] ?? 0); if ($client_id) { enforceClientAccess(); @@ -15,72 +15,76 @@ ob_start(); ?>
-
New Ticket (v1)
+
New Ticket
- - - + + + +
- - - -
- - + + +
-
+ +
- - - - -
- -
-
- -
- -
-
- + +
+
+
+ +
+
+
+
- - +
+
+ +
+
+ +
+ +
+
+
+
@@ -91,7 +95,7 @@ ob_start();
@@ -169,7 +173,6 @@ ob_start(); while ($row = mysqli_fetch_assoc($sql_categories)) { $category_id = intval($row['category_id']); $category_name = escapeHtml($row['category_name']); - ?> @@ -177,7 +180,7 @@ ob_start();
@@ -196,21 +199,18 @@ ob_start();
@@ -229,244 +229,114 @@ ob_start();
+
+ +
+
+ +
+ +
+
+
- value="1" id="billableSwitch"> - + value="1" id="billable"> +
- +
-
+
+ +
+
+ +
+ +
+
- +
+ +
+
+ +
+ +
+
-
- -
-
- +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+ +
+
-
-
- -
-
- +
+
+ +
+
+ +
+
-
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
- -
- -
-
- -
- -
-
- -
- -
- -
- -
-
- -
- -
-
- -
- -
- -
- -
-
- -
- -
-
- -
- - +
+
- +
+ @@ -491,6 +361,11 @@ $(document).on('change', '#ticket_template_select', function () { }); + + + + + -
-
New Ticket (v2)
- -
-
- - - - - - - -
- - - - - -
- - -
- - - - - - -
-
-
- -
-
- -
- -
-
-
-
-
- -
-
- -
- -
-
-
-
- - - -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
- -
- -
-
- -
-
- -
- -
-
-
- -
-
- -
-
- -
- -
- -
-
-
-
- -
- -
- -
-
- -
- -
-
- - -
-
- value="1" id="billable"> - -
-
- - -
- -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
-
- -
- -
-
-
- -
-
- -
-
- -
- -
-
-
- -
- -
- -
- -
- -
- - -
- -
- - - - - - - - - -= 2) { ?>
- 0) { ?>