From fb084ae50468bd337f0bf7ba9544f2893e28743b Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 14 Oct 2026 17:15:17 -0400 Subject: [PATCH] Assets: change status, location and assigned contact in place on the assets list, the asset page and the quick look, using the same quick pickers as tickets (location and contact only offer the asset's own client's); Add/Edit/Copy form split into tabs (Details, Assignment, Network, Purchase, Login or History, Notes) that jumps to a required field left empty on another tab; Printers tab on the assets list with New Printer and a Printers export filter; asset quick look rebuilt as a compact asset page: header with type icon and status, IP/MAC/serial with copy, warranty, location, contact and rack on a few lines, connect buttons, counted tabs showing only what has something in them and reopening on the last one used, open tickets first with a link to the rest, Open asset in the footer. Fixes bulk assign contact/location changing assets of a different client, quick look notes saving the underlying page's asset notes over the connected asset's, and a query per license on the quick look. No DB change --- agent/ajax.php | 46 +- agent/asset.php | 34 +- agent/assets.php | 37 +- agent/modals/asset/asset.php | 1323 ++++++++++----------------- agent/modals/asset/asset_add.php | 2 +- agent/modals/asset/asset_export.php | 1 + agent/modals/asset/asset_form.php | 198 ++-- agent/post/asset.php | 35 +- css/itflow_custom.css | 166 ++++ functions/asset.php | 243 +++++ functions/ticket_fields.php | 13 +- js/quick_pick.js | 51 +- 12 files changed, 1154 insertions(+), 995 deletions(-) diff --git a/agent/ajax.php b/agent/ajax.php index ba6962307..8cd109b15 100644 --- a/agent/ajax.php +++ b/agent/ajax.php @@ -181,8 +181,8 @@ if (isset($_POST['tag_picker_set']) || isset($_POST['tag_picker_create'])) { /* * Quick pickers (js/quick_pick.js) - a ticket's status, priority, assignee - * and billable, a project's manager and a recurring ticket's assignee, - * changed in place instead of through a modal. GET lists the choices; POST makes the change through the same + * and billable, a project's manager, a recurring ticket's assignee and an + * asset's status, location and contact, changed in place instead of through a modal. GET lists the choices; POST makes the change through the same * functions the post.php handlers use (functions/ticket_fields.php) and sends * back the redrawn values. */ @@ -210,6 +210,14 @@ if (isset($_GET['quick_pick_options'])) { $options = quickPickAgents(); } elseif ($field === 'project_manager') { $options = quickPickAgents('No manager'); + } elseif (in_array($field, ASSET_QUICK_FIELDS, true)) { + // Locations and contacts are the asset's client's own - functions/asset.php + $options = assetQuickOptions($field, intval($_GET['scope'] ?? 0)); + if ($options === null) { + http_response_code(403); + echo json_encode(['error' => 'You cannot see that client.']); + exit(); + } } else { http_response_code(400); echo json_encode(['error' => 'Unknown field']); @@ -230,6 +238,40 @@ if (isset($_POST['quick_pick_set'])) { $value = (string) ($_POST['value'] ?? ''); $ticket_ids = array_values(array_unique(array_filter(array_map('intval', (array) ($_POST['ids'] ?? []))))); + // An asset's status, location or contact - assets of clients this agent + // can reach, with the same permission as Edit Asset (functions/asset.php) + if (in_array($field, ASSET_QUICK_FIELDS, true)) { + $asset_ids = $ticket_ids; + $allowed = lookupUserPermission('module_support') >= 2 && $asset_ids; + foreach ($allowed ? $asset_ids : [] as $id) { + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT asset_client_id FROM assets WHERE asset_id = $id")); + if (!$row || !hasClientAccess($row['asset_client_id'])) { + $allowed = false; + break; + } + } + if (!$allowed) { + http_response_code(403); + echo json_encode(['error' => 'You cannot change that on these assets.']); + exit(); + } + + $message = ''; + $response = ['records' => []]; + foreach ($asset_ids as $id) { + [$ok, $message] = assetQuickSet($id, $field, $value); + if (!$ok) { + http_response_code(422); + echo json_encode(['error' => $message]); + exit(); + } + $response['records'][$id] = assetQuickRecord($id, $field); + } + $response['message'] = count($asset_ids) === 1 ? $message : 'Updated ' . count($asset_ids) . ' assets'; + echo json_encode($response); + exit(); + } + // A project's manager or a recurring ticket's assignee - open projects // and recurring tickets of clients this agent can reach, like their edit modals if ($field === 'project_manager' || $field === 'recurring_assignee') { diff --git a/agent/asset.php b/agent/asset.php index 4a68bc74c..a698d806e 100644 --- a/agent/asset.php +++ b/agent/asset.php @@ -29,13 +29,13 @@ enforceUserPermission('module_support'); $asset_id = intval($_GET['asset_id'] ?? 0); -$sql = mysqli_query($mysqli, "SELECT asset_archived_at, asset_contact_id, asset_created_at, asset_description, asset_favorite, asset_id, +$sql = mysqli_query($mysqli, "SELECT asset_archived_at, asset_client_id, asset_contact_id, asset_created_at, asset_description, asset_favorite, asset_id, asset_install_date, asset_location_id, asset_make, asset_model, asset_name, asset_notes, asset_os, asset_photo, asset_physical_location, asset_purchase_date, asset_purchase_reference, asset_serial, asset_status, asset_type, asset_uri, asset_uri_2, asset_uri_client, asset_vendor_id, asset_warranty_expire, client_id, client_name, contact_archived_at, contact_email, contact_extension, contact_mobile, - contact_mobile_country_code, contact_name, contact_phone, contact_phone_country_code, + contact_mobile_country_code, contact_name, contact_phone, contact_phone_country_code, contact_photo, interface_ip, interface_ipv6, interface_mac, interface_nat_ip, interface_network_id, location_archived_at, location_name, network_name, vendor_name FROM assets LEFT JOIN clients ON client_id = asset_client_id @@ -57,6 +57,7 @@ if (mysqli_num_rows($sql) == 0) { } else { $row = mysqli_fetch_assoc($sql); + $asset_row = $row; // raw, for the quick pickers - $row gets reused below $client_id = intval($row['client_id']); $client_name = escapeHtml($row['client_name']); $asset_id = intval($row['asset_id']); @@ -95,10 +96,6 @@ if (mysqli_num_rows($sql) == 0) { $vendor_name = escapeHtml($row['vendor_name']); $contact_name = escapeHtml($row['contact_name']); - $contact_email = escapeHtml($row['contact_email']); - $contact_phone = escapeHtml(formatPhoneNumber($row['contact_phone'], $row['contact_phone_country_code'])); - $contact_extension = escapeHtml($row['contact_extension']); - $contact_mobile = escapeHtml(formatPhoneNumber($row['contact_mobile'], $row['contact_mobile_country_code'])); $contact_archived = !empty($row['contact_archived_at']); $location_name = escapeHtml($row['location_name']); $location_archived = !empty($row['location_archived_at']); @@ -312,7 +309,11 @@ if (mysqli_num_rows($sql) == 0) { Archived - + + + + +
@@ -511,7 +512,9 @@ if (mysqli_num_rows($sql) == 0) {
Location
- + + + > - @@ -526,20 +529,15 @@ if (mysqli_num_rows($sql) == 0) {
Assigned
- + + + > - -
- - -
- - -
- Nobody + +
diff --git a/agent/assets.php b/agent/assets.php index fc3e4ea56..2ea142fda 100644 --- a/agent/assets.php +++ b/agent/assets.php @@ -51,7 +51,8 @@ $asset_type_tabs = [ 'server' => ['label' => 'Servers', 'icon' => 'fa-server', 'query' => "asset_type = 'Server'"], 'virtual' => ['label' => 'Virtual', 'icon' => 'fa-cloud', 'query' => "asset_type = 'Virtual Machine'"], 'network' => ['label' => 'Network', 'icon' => 'fa-network-wired', 'query' => "asset_type IN ('Firewall/Router', 'Switch', 'Access Point')"], - 'other' => ['label' => 'Other', 'icon' => 'fa-tag', 'query' => "asset_type NOT IN ('Desktop', 'Laptop', 'Server', 'Virtual Machine', 'Firewall/Router', 'Switch', 'Access Point')"], + 'printer' => ['label' => 'Printers', 'icon' => 'fa-print', 'query' => "asset_type = 'Printer'"], + 'other' => ['label' => 'Other', 'icon' => 'fa-tag', 'query' => "asset_type NOT IN ('Desktop', 'Laptop', 'Server', 'Virtual Machine', 'Firewall/Router', 'Switch', 'Access Point', 'Printer')"], ]; $type_filter = (isset($_GET['type']) && isset($asset_type_tabs[$_GET['type']])) ? $_GET['type'] : ''; $_GET['type'] = $type_filter; @@ -113,8 +114,8 @@ $show_purchase = in_array('Purchase_Date', $extra_columns, true); $show_install = in_array('Install_Date', $extra_columns, true); $show_warranty = in_array('Warranty_Expire', $extra_columns, true); -// Assigned To only means something for workstations and the like -$show_contact = !in_array($type_filter, ['network', 'server', 'other'], true); +// Assigned To only means something for workstations and the like - printers are shared +$show_contact = !in_array($type_filter, ['network', 'server', 'printer', 'other'], true); $show_model = $type_filter !== 'virtual'; // Only these sort - filter_header.php will hand through any lowercase word, and @@ -138,7 +139,8 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, " SUM(asset_type = 'Server') AS server_count, SUM(asset_type = 'Virtual Machine') AS virtual_count, SUM(asset_type IN ('Firewall/Router', 'Switch', 'Access Point')) AS network_count, - SUM(asset_type NOT IN ('Laptop', 'Desktop', 'Server', 'Virtual Machine', 'Firewall/Router', 'Switch', 'Access Point')) AS other_count + SUM(asset_type = 'Printer') AS printer_count, + SUM(asset_type NOT IN ('Laptop', 'Desktop', 'Server', 'Virtual Machine', 'Firewall/Router', 'Switch', 'Access Point', 'Printer')) AS other_count FROM assets LEFT JOIN clients ON client_id = asset_client_id WHERE $archive_query @@ -152,16 +154,17 @@ $tab_counts = [ 'server' => intval($row['server_count']), 'virtual' => intval($row['virtual_count']), 'network' => intval($row['network_count']), + 'printer' => intval($row['printer_count']), 'other' => intval($row['other_count']), ]; $sql = mysqli_query( $mysqli, - "SELECT SQL_CALC_FOUND_ROWS asset_archived_at, asset_contact_id, asset_description, asset_favorite, - asset_id, asset_install_date, asset_make, asset_model, asset_name, asset_os, asset_physical_location, + "SELECT SQL_CALC_FOUND_ROWS asset_archived_at, asset_client_id, asset_contact_id, asset_description, asset_favorite, + asset_id, asset_install_date, asset_location_id, asset_make, asset_model, asset_name, asset_os, asset_physical_location, asset_purchase_date, asset_serial, asset_status, asset_type, asset_uri, asset_uri_2, asset_uri_client, asset_warranty_expire, client_id, client_name, - contact_archived_at, contact_name, interface_ip, interface_ipv6, interface_mac, + contact_archived_at, contact_name, contact_photo, interface_ip, interface_ipv6, interface_mac, location_archived_at, location_name FROM assets LEFT JOIN clients ON asset_client_id = client_id LEFT JOIN contacts ON asset_contact_id = contact_id @@ -653,7 +656,9 @@ $search_noun = $type_filter ? $asset_type_tabs[$type_filter]['label'] : 'assets' - + + + > - @@ -661,21 +666,29 @@ $search_noun = $type_filter ? $asset_type_tabs[$type_filter]['label'] : 'assets' - + + +
>
- -
+
- + · - -' ?> + + + + + -' ?> + + diff --git a/agent/modals/asset/asset.php b/agent/modals/asset/asset.php index 2684fa00d..0d0f6a661 100644 --- a/agent/modals/asset/asset.php +++ b/agent/modals/asset/asset.php @@ -1,21 +1,29 @@ 'That asset no longer exists.']); + exit; +} -$client_id = intval($row['client_id']); +$client_id = intval($asset_row['asset_client_id']); enforceClientAccess(); -$client_name = escapeHtml($row['client_name']); -$asset_id = intval($row['asset_id']); -$asset_type = escapeHtml($row['asset_type']); -$asset_name = escapeHtml($row['asset_name']); -$asset_description = escapeHtml($row['asset_description']); -$asset_make = escapeHtml($row['asset_make']); -$asset_model = escapeHtml($row['asset_model']); -$asset_serial = escapeHtml($row['asset_serial']); -$asset_os = escapeHtml($row['asset_os']); -$asset_uri = escapeUrl($row['asset_uri']); -$asset_uri_2 = escapeUrl($row['asset_uri_2']); -$asset_uri_client = escapeUrl($row['asset_uri_client']); -$asset_status = escapeHtml($row['asset_status']); -$asset_purchase_reference = escapeHtml($row['asset_purchase_reference']); -$asset_purchase_date = escapeHtml($row['asset_purchase_date']); -$asset_warranty_expire = escapeHtml($row['asset_warranty_expire']); -$asset_install_date = escapeHtml($row['asset_install_date']); -$asset_photo = escapeHtml($row['asset_photo']); -$asset_physical_location = escapeHtml($row['asset_physical_location']); -$asset_notes = escapeHtml($row['asset_notes']); -$asset_favorite = intval($row['asset_favorite']); -$asset_created_at = escapeHtml($row['asset_created_at']); -$asset_vendor_id = intval($row['asset_vendor_id']); -$asset_location_id = intval($row['asset_location_id']); -$asset_contact_id = intval($row['asset_contact_id']); +$can_edit = lookupUserPermission('module_support') >= 2; +$can_credentials = lookupUserPermission('module_credential') >= 1; -$asset_ip = escapeHtml($row['interface_ip']); -$asset_ipv6 = escapeHtml($row['interface_ipv6']); -$asset_nat_ip = escapeHtml($row['interface_nat_ip']); -$asset_mac = escapeHtml($row['interface_mac']); -$asset_network_id = intval($row['interface_network_id']); - -$device_icon = getAssetIcon($asset_type); - -$contact_name = escapeHtml($row['contact_name']); -$contact_email = escapeHtml($row['contact_email']); -$contact_phone_country_code = escapeHtml($row['contact_phone_country_code']); -$contact_phone = escapeHtml(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); -$contact_extension = escapeHtml($row['contact_extension']); -$contact_mobile_country_code = escapeHtml($row['contact_mobile_country_code']); -$contact_mobile = escapeHtml(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); -$contact_archived_at = escapeHtml($row['contact_archived_at']); -if ($contact_archived_at) { - $contact_name_display = "$contact_name"; -} else { - $contact_name_display = $contact_name; -} -$location_name = escapeHtml($row['location_name']); -if (empty($location_name)) { - $location_name = "-"; -} -$location_archived_at = escapeHtml($row['location_archived_at']); -if ($location_archived_at) { - $location_name_display = "$location_name"; -} else { - $location_name_display = $location_name; -} +$asset_name = escapeHtml($asset_row['asset_name']); +$asset_type = escapeHtml($asset_row['asset_type']); +$asset_description = escapeHtml($asset_row['asset_description']); +$asset_make_model = escapeHtml(trim($asset_row['asset_make'] . ' ' . $asset_row['asset_model'])); +$asset_os = escapeHtml($asset_row['asset_os']); +$asset_os_icon = assetOsIcon($asset_row['asset_os']); +$asset_serial = escapeHtml($asset_row['asset_serial']); +$asset_ip = escapeHtml($asset_row['interface_ip']); +$asset_mac = escapeHtml($asset_row['interface_mac']); +$asset_links = assetLinks($asset_row['asset_uri'], $asset_row['asset_uri_2'], $asset_row['asset_uri_client']); +$asset_warranty = assetWarranty($asset_row['asset_warranty_expire']); +$asset_photo = escapeHtml($asset_row['asset_photo']); +$asset_physical_location = escapeHtml($asset_row['asset_physical_location']); +$asset_notes = escapeHtml($asset_row['asset_notes']); +$asset_favorite = intval($asset_row['asset_favorite']); +$asset_archived = !empty($asset_row['asset_archived_at']); +$asset_contact_id = intval($asset_row['asset_contact_id']); +$asset_tone = assetTypeTone($asset_row['asset_type']); +$device_icon = getAssetIcon($asset_row['asset_type']); +$asset_tags_display = tagPills('asset', $asset_id, tagsForRecord('asset', $asset_id), "assets.php?client_id=$client_id&"); // The rack it sits in, if any $asset_rack = rackPositionForAsset($asset_id); -if ($asset_rack) { - $asset_rack_id = intval($asset_rack['rack_id']); - $asset_rack_name = escapeHtml($asset_rack['rack_name']); - $asset_rack_position = rackPositionLabel($asset_rack['unit_start_number'], $asset_rack['unit_end_number']) . ', ' . ($asset_rack['unit_face'] === 'rear' ? 'rear' : 'front'); -} -// Tags - many to many relationship -// Tags - functions/tags.php -$asset_tags_display = tagPills('asset', $asset_id, tagsForRecord('asset', $asset_id), "assets.php?client_id=$client_id&"); - -// Network Interfaces +// Interfaces, primary first, and what each one is plugged into $sql_related_interfaces = mysqli_query($mysqli, " - SELECT - ai.interface_id, - ai.interface_name, - ai.interface_description, - ai.interface_type, - ai.interface_mac, - ai.interface_ip, - ai.interface_nat_ip, - ai.interface_ipv6, - ai.interface_primary, - ai.interface_notes, - n.network_name, - n.network_id, - connected_interfaces.interface_id AS connected_interface_id, + SELECT ai.interface_id, ai.interface_name, ai.interface_mac, ai.interface_ip, ai.interface_primary, connected_interfaces.interface_name AS connected_interface_name, connected_assets.asset_name AS connected_asset_name, connected_assets.asset_id AS connected_asset_id, connected_assets.asset_type AS connected_asset_type FROM asset_interfaces AS ai - LEFT JOIN networks AS n - ON n.network_id = ai.interface_network_id LEFT JOIN asset_interface_links AS ail ON (ail.interface_a_id = ai.interface_id OR ail.interface_b_id = ai.interface_id) LEFT JOIN asset_interfaces AS connected_interfaces @@ -132,849 +86,494 @@ $sql_related_interfaces = mysqli_query($mysqli, " ) LEFT JOIN assets AS connected_assets ON connected_assets.asset_id = connected_interfaces.interface_asset_id - WHERE - ai.interface_asset_id = $asset_id - AND ai.interface_archived_at IS NULL - ORDER BY ai.interface_name ASC + WHERE ai.interface_asset_id = $asset_id + AND ai.interface_archived_at IS NULL + ORDER BY ai.interface_primary DESC, ai.interface_name ASC "); $interface_count = mysqli_num_rows($sql_related_interfaces); -// Related Credentials Query -$sql_related_credentials = mysqli_query($mysqli, " - SELECT - credentials.credential_id AS credential_id, - credentials.credential_name, - credentials.credential_description, - credentials.credential_uri, - credentials.credential_username, - credentials.credential_password, - credentials.credential_otp_secret, - credentials.credential_note, - credentials.credential_favorite, - credentials.credential_contact_id, - credentials.credential_asset_id - FROM credentials - WHERE credential_asset_id = $asset_id - AND credential_archived_at IS NULL - GROUP BY credentials.credential_id - ORDER BY credential_name DESC -"); -// No module_credential, no Credentials tab - the pane below was already gated, the tab wasn't -$credential_count = lookupUserPermission('module_credential') ? mysqli_num_rows($sql_related_credentials) : 0; +// Credentials - only for agents who may see them +$credential_count = 0; +if ($can_credentials) { + $sql_related_credentials = mysqli_query($mysqli, " + SELECT credential_id, credential_name, credential_uri, credential_username, credential_otp_secret + FROM credentials + WHERE credential_asset_id = $asset_id + AND credential_archived_at IS NULL + ORDER BY credential_name ASC + "); + $credential_count = mysqli_num_rows($sql_related_credentials); +} -// Related Tickets Query +// Tickets - open ones first; the most recent few here, the rest on the asset page +$quick_ticket_limit = 8; $sql_related_tickets = mysqli_query($mysqli, " - SELECT tickets.ticket_id, ticket_prefix, ticket_number, ticket_subject, ticket_priority, ticket_created_at, - ticket_updated_at, ticket_closed_at, ticket_assigned_to, user_name, user_avatar, - ticket_status_id, ticket_status_name, ticket_status_color + SELECT tickets.ticket_id, ticket_prefix, ticket_number, ticket_subject, ticket_updated_at, ticket_created_at, + ticket_resolved_at, ticket_closed_at, ticket_assigned_to, user_name, user_avatar, + ticket_status_name, ticket_status_color FROM tickets LEFT JOIN users ON ticket_assigned_to = user_id LEFT JOIN ticket_statuses ON ticket_status_id = ticket_status LEFT JOIN ticket_assets ON tickets.ticket_id = ticket_assets.ticket_id WHERE ticket_asset_id = $asset_id OR ticket_assets.asset_id = $asset_id GROUP BY tickets.ticket_id - ORDER BY ticket_number DESC + ORDER BY (ticket_resolved_at IS NULL AND ticket_closed_at IS NULL) DESC, ticket_number DESC "); $ticket_count = mysqli_num_rows($sql_related_tickets); +$ticket_open_count = 0; +$related_tickets = []; +while ($row = mysqli_fetch_assoc($sql_related_tickets)) { + $is_open = empty($row['ticket_resolved_at']) && empty($row['ticket_closed_at']); + $ticket_open_count += $is_open ? 1 : 0; + if (count($related_tickets) < $quick_ticket_limit) { + $related_tickets[] = $row + ['is_open' => $is_open]; + } +} -// Related Recurring Tickets Query -$sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT recurring_ticket_frequency, recurring_ticket_assets.recurring_ticket_id, - recurring_ticket_next_run, recurring_ticket_priority, recurring_ticket_subject FROM recurring_tickets +// Recurring tickets +$sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT recurring_tickets.recurring_ticket_id, recurring_ticket_subject, + recurring_ticket_frequency, recurring_ticket_next_run + FROM recurring_tickets LEFT JOIN recurring_ticket_assets ON recurring_tickets.recurring_ticket_id = recurring_ticket_assets.recurring_ticket_id WHERE recurring_ticket_asset_id = $asset_id OR recurring_ticket_assets.asset_id = $asset_id GROUP BY recurring_tickets.recurring_ticket_id - ORDER BY recurring_ticket_next_run DESC" + ORDER BY recurring_ticket_next_run ASC" ); $recurring_ticket_count = mysqli_num_rows($sql_related_recurring_tickets); -// Related Documents -$sql_related_documents = mysqli_query($mysqli, "SELECT document_created_at, document_description, documents.document_id, document_name, - document_updated_at, user_name FROM asset_documents - LEFT JOIN documents ON asset_documents.document_id = documents.document_id - LEFT JOIN users ON user_id = document_created_by +// Licenses, with seats in use counted in the same query +$sql_related_software = mysqli_query($mysqli, "SELECT software_assets.software_id, software_name, software_version, software_seats, + (SELECT COUNT(*) FROM software_assets AS sa WHERE sa.software_id = software.software_id) + + (SELECT COUNT(*) FROM software_contacts AS sc WHERE sc.software_id = software.software_id) AS seats_used + FROM software_assets + LEFT JOIN software ON software_assets.software_id = software.software_id + WHERE software_assets.asset_id = $asset_id + AND software_archived_at IS NULL + ORDER BY software_name ASC" +); +$software_count = mysqli_num_rows($sql_related_software); + +// Documents +$sql_related_documents = mysqli_query($mysqli, "SELECT documents.document_id, document_name, document_created_at, document_updated_at + FROM asset_documents + JOIN documents ON asset_documents.document_id = documents.document_id WHERE asset_documents.asset_id = $asset_id - AND document_archived_at IS NULL - ORDER BY document_name DESC" + AND document_archived_at IS NULL + ORDER BY document_name ASC" ); $document_count = mysqli_num_rows($sql_related_documents); -// Related Files -$sql_related_files = mysqli_query($mysqli, "SELECT file_created_at, file_description, file_ext, files.file_id, file_mime_type, file_name FROM asset_files - LEFT JOIN files ON asset_files.file_id = files.file_id +// Files +$sql_related_files = mysqli_query($mysqli, "SELECT files.file_id, file_name, file_ext, file_created_at + FROM asset_files + JOIN files ON asset_files.file_id = files.file_id WHERE asset_files.asset_id = $asset_id - AND file_archived_at IS NULL - ORDER BY file_name DESC" + AND file_archived_at IS NULL + ORDER BY file_name ASC" ); $file_count = mysqli_num_rows($sql_related_files); -// Related Software Query -$sql_related_software = mysqli_query( - $mysqli, - "SELECT software_expire, software_assets.software_id, software_key, software_license_type, - software_name, software_notes, software_purchase, software_seats, software_type, - software_version FROM software_assets - LEFT JOIN software ON software_assets.software_id = software.software_id - WHERE software_assets.asset_id = $asset_id - AND software_archived_at IS NULL - ORDER BY software_name DESC" -); - -$software_count = mysqli_num_rows($sql_related_software); - -// Related Notes +// Notes $sql_related_notes = mysqli_query($mysqli, "SELECT asset_note, asset_note_created_at, asset_note_type, user_name FROM asset_notes LEFT JOIN users ON asset_note_created_by = user_id WHERE asset_note_asset_id = $asset_id - AND asset_note_archived_at IS NULL + AND asset_note_archived_at IS NULL ORDER BY asset_note_created_at DESC" ); $note_count = mysqli_num_rows($sql_related_notes); - -// Note type icons, read from the categories list -$note_type_icons = array(); +$note_type_icons = []; $sql_note_type_icons = mysqli_query($mysqli, "SELECT category_name, category_icon FROM categories WHERE category_type = 'asset_note_type'"); while ($row = mysqli_fetch_assoc($sql_note_type_icons)) { - $note_type_icons[escapeHtml($row['category_name'])] = escapeHtml($row['category_icon']); + $note_type_icons[$row['category_name']] = escapeHtml($row['category_icon']); } -if (isset($_GET['client_id'])) { - $client_url = "client_id=$client_id&"; -} else { - $client_url = ''; -} +// Only the tabs with something in them - same order as the asset page +$quick_tabs = array_filter([ + 'interfaces' => ['label' => 'Interfaces', 'count' => $interface_count], + 'credentials' => ['label' => 'Credentials', 'count' => $credential_count], + 'tickets' => ['label' => 'Tickets', 'count' => $ticket_count, 'badge' => $ticket_open_count], + 'recurring' => ['label' => 'Recurring', 'count' => $recurring_ticket_count], + 'licenses' => ['label' => 'Licenses', 'count' => $software_count], + 'documents' => ['label' => 'Documents', 'count' => $document_count], + 'files' => ['label' => 'Files', 'count' => $file_count], + 'notes' => ['label' => 'Notes', 'count' => $note_count], +], function ($tab) { + return $tab['count'] > 0; +}); +$first_tab = array_key_first($quick_tabs); + +$has_left = $asset_ip || $asset_mac || $asset_serial || $asset_warranty; +$has_right = $can_edit || $asset_row['location_name'] || $asset_row['contact_name'] || $asset_rack; ob_start(); ?> -
-
- - -
- + +
+
+ + " alt=""> + + + +
+
+ + + Archived + + + + + + + +
+
+ + + +
+
+
+
- - -
- -
- -
-
-
-

- -

- - asset_photo"> - - -
+ +
+
+
+
+
+ +
+ + + +
-
- -
- + +
+ + + + +
+ +
+ +
+ +
- -
- -
- -
- -
- -
- -
- -
Warranty (' . escapeHtml($asset_warranty['date']) . ')' : '' ?>
+ +
+ + +
+ + +
+ + +
+ + +
+ + Warranty +
-
- -
-
-
Primary Network Interface
-
-
- -
+ + +
+ +
+ +
+ + + + + +
+
+
- -
- -
- -
- -
+ +
+ +
+ + + + + +
+
- -
Client URI:
+ +
+ + · , +
-
- - -
-
-
Assignment
-
-
- -
- -
·
- -
- -
- -
- -
- -
- - -
-
- -
-
-
Additional Notes
-
- -
- +
+ - + + +
+
    + $tab) { ?> + + +
- -
+
-
- - "> - - - - - - - - - - - - +
+
+
Name / PortTypeNetworkIPMACConnected To
+ + + + + + + + + + + +
PortIPMACConnected to
+ + Primary + -- + + + · + + - + +
+
+
+ - // Prepare display text - $interface_mac_display = $interface_mac ?: '-'; - $interface_ip_display = $interface_ip ?: '-'; - $interface_type_display = $interface_type ?: '-'; - $network_name_display = $network_name - ? "$network_name" - : '-'; + +
+
+ + + + + + + + + + + + +
NameUsernamePasswordOTP
+ + + - + + + + + Hover... + + - + +
+
+
+ + + + - // Connected interface details - $connected_asset_id = intval($row['connected_asset_id']); - $connected_asset_name = escapeHtml($row['connected_asset_name']); - $connected_asset_type = escapeHtml($row['connected_asset_type']); - $connected_asset_icon = getAssetIcon($connected_asset_type); - $connected_interface_name = escapeHtml($row['connected_interface_name']); + +
+
+ + + + + + + + + + + + +
+
+ count($related_tickets)) { ?> +
All tickets on the asset page
+ +
+ + +
+
    + +
  • + + · next +
    • + +
+
+ + + +
+
    + +
  • + + seats +
    • + +
+
+ + + +
+
    + +
  • + + +
    • + +
+
+ + + +
+
    + +
  • + + +
    • + +
+
+ + + +
+
    + +
  • + +
    +
    +
    ·
    +
    +
    • + +
+
+ - // Show either "-" or "AssetName - Port" - if ($connected_asset_name) { - $connected_to_display = " - $connected_asset_name - $connected_interface_name - - "; - } else { - $connected_to_display = "-"; - } - ?> - - - - (Primary)"; } ?> - - - - - -
- - - - - - -
- - - -
-
- - - - - - - - - - - - "; - } - $credential_otp_secret = escapeHtml($row['credential_otp_secret']); - if (empty($credential_otp_secret)) { - $otp_display = "-"; - } else { - $otp_display = " Hover.."; - } - $credential_note = escapeHtml($row['credential_note']); - $credential_favorite = intval($row['credential_favorite']); - $credential_contact_id = intval($row['credential_contact_id']); - $credential_asset_id = intval($row['credential_asset_id']); - - - ?> - - - - - - - - - - - -
NameUsernamePasswordOTPURI
- - - - -
-
-
- - - - - - - -
-
- - - - - - - - - - - - - Never

"; - } else { - $ticket_updated_at_display = "

Never

"; - } - } else { - $ticket_updated_at_display = $ticket_updated_at; - } - $ticket_closed_at = escapeHtml($row['ticket_closed_at']); - - if ($ticket_priority == "Urgent") { - $ticket_priority_display = "$ticket_priority"; - } elseif ($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_display = formatAssignee($row['ticket_assigned_to'], $row['user_name'], $row['user_avatar'], !in_array($ticket_status_id, [4, 5])); - - ?> - - - - - - - - - - - - - -
NumberSubjectPriorityStatusAssignedLast Response
- - - - - -
-
-
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - - -
SubjectPriorityFrequencyNext Run
-
-
- - - -
-
- - - - - - - - - - - - - - - - - - - - - -
SoftwareTypeKeySeats
$software_version" ?>
-
-
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - - -
Document TitleByCreatedUpdated
- - - -
-
-
-
- - - -
-
- - - - - - - - - - - - - - - - - - - -
NameTypeUploaded
- - $file_description" ?> - -
-
-
- - - -
-
- - - - - - - - - - - - - - - - - - - - -
TypeNoteByCreated
-
-
- - -
+
- More Details - - = 2) { ?> - - Edit - + Open asset + +
+ + 'Desktop', 'server' => 'Server', 'virtual' => 'Virtual Machine', 'network' => 'Switch']; +$type_presets = ['workstation' => 'Desktop', 'server' => 'Server', 'virtual' => 'Virtual Machine', 'network' => 'Switch', 'printer' => 'Printer']; $type_param = strtolower((string) ($_GET['type'] ?? '')); $asset_form_mode = 'add'; diff --git a/agent/modals/asset/asset_export.php b/agent/modals/asset/asset_export.php index ad3ba8228..a4030365f 100644 --- a/agent/modals/asset/asset_export.php +++ b/agent/modals/asset/asset_export.php @@ -69,6 +69,7 @@ ob_start(); +
diff --git a/agent/modals/asset/asset_form.php b/agent/modals/asset/asset_form.php index aa9b89e20..1f9fc1fe4 100644 --- a/agent/modals/asset/asset_form.php +++ b/agent/modals/asset/asset_form.php @@ -6,10 +6,12 @@ * empty for a new asset) before including this. Posts the field set * agent/post/asset_model.php reads. * - * One page of sections instead of six tabs. Every field is always in the - * form: fields that came and went with the asset type used to drop out of the - * POST entirely, and the handler then saved them as empty - editing an access - * point wiped its firmware version. + * Tabs like the other add / edit modals: Details, Assignment, Network, + * Purchase, then Login on a new asset or History on an existing one, and + * Notes. Every field is always in the form, whatever the asset type: fields + * that came and went with the type used to drop out of the POST entirely, + * and the handler then saved them as empty - editing an access point wiped + * its firmware version. * * Should not be accessed directly. */ @@ -76,22 +78,40 @@ $asset_ip_is_dhcp = $asset_ip === 'DHCP'; ?> - -
-
-
Basics
-
+ +
+
@@ -101,7 +121,7 @@ $asset_ip_is_dhcp = $asset_ip === 'DHCP'; -
Pick the asset's location, contact, network and vendor from its page once it's saved.
+
Pick the asset's location, contact, network and vendor once it's saved.
@@ -153,8 +173,8 @@ $asset_ip_is_dhcp = $asset_ip === 'DHCP';
-
Hardware
-
+
Hardware
+
@@ -176,8 +196,55 @@ $asset_ip_is_dhcp = $asset_ip === 'DHCP';
-
Network · the primary interface
-
+ +

Asset ID

+ +
+ + +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
The location and who it's assigned to come from the client - pick them once it's saved.
+
+
+ +
+ + +
+

The primary interface. Add more ports from the asset's Interfaces tab.

+
@@ -214,6 +281,10 @@ $asset_ip_is_dhcp = $asset_ip === 'DHCP';
+
+ +
Links
+
@@ -228,47 +299,11 @@ $asset_ip_is_dhcp = $asset_ip === 'DHCP';
Shown to the client in their portal.
+
- -
Where & who
-
-
- - -
-
- - -
-
- - -
-
- -
Where
-
-
- - -
-
- - -
Purchase & warranty
-
+ +
+
@@ -298,10 +333,13 @@ $asset_ip_is_dhcp = $asset_ip === 'DHCP';
+
- -
Login · saved as a credential on the asset
-
+ + +
+

Saved as a credential on the asset. Leave it empty to skip.

+
@@ -311,11 +349,17 @@ $asset_ip_is_dhcp = $asset_ip === 'DHCP';
- +
+ -
Photo & notes
+ +
-
+
+ + +
+
Current photo">
@@ -328,16 +372,7 @@ $asset_ip_is_dhcp = $asset_ip === 'DHCP';
-
- - -
- - -

Asset ID

- -
@@ -377,6 +412,23 @@ $asset_ip_is_dhcp = $asset_ip === 'DHCP'; } }); + // A required field on a tab that isn't showing: show that tab and point + // at the field - otherwise the browser just quietly refuses to send + var reported = false; + form.addEventListener('invalid', function (e) { + var pane = e.target.closest('.tab-pane'); + var tab = pane && form.querySelector('[data-bs-toggle="pill"][href="#' + pane.id + '"]'); + if (!tab || pane.classList.contains('active') || reported) { + return; + } + reported = true; + tab.addEventListener('shown.bs.tab', function () { + reported = false; + e.target.reportValidity(); + }, { once: true }); + bootstrap.Tab.getOrCreateInstance(tab).show(); + }, true); + // DHCP means no fixed address to type var dhcp = form.querySelector('#assetFormDhcp'); var ip = form.querySelector('#assetFormIp'); diff --git a/agent/post/asset.php b/agent/post/asset.php index 631b56189..6a8d3195e 100644 --- a/agent/post/asset.php +++ b/agent/post/asset.php @@ -392,14 +392,15 @@ if (isset($_POST['bulk_assign_asset_location'])) { $row = mysqli_fetch_assoc($sql); $location_name = escapeSql($row['location_name']); $client_id = intval($row['location_client_id']); + $location_client_id = $client_id; enforceClientAccess(); // Assign Location to Selected Assets if (isset($_POST['asset_ids'])) { - // Get Selected Asset Count - $asset_count = count($_POST['asset_ids']); + // Only the assets of the location's client are moved + $asset_count = 0; foreach($_POST['asset_ids'] as $asset_id) { $asset_id = intval($asset_id); @@ -407,18 +408,24 @@ if (isset($_POST['bulk_assign_asset_location'])) { // Get Asset Details for Logging $sql = mysqli_query($mysqli,"SELECT asset_name, asset_client_id FROM assets WHERE asset_id = $asset_id"); $row = mysqli_fetch_assoc($sql); - $asset_name = escapeSql($row['asset_name']); - $client_id = intval($row['asset_client_id']); + $asset_name = escapeSql($row['asset_name'] ?? ''); + $client_id = intval($row['asset_client_id'] ?? 0); + + if (!$row || $client_id !== $location_client_id) { + continue; + } enforceClientAccess(); + $asset_count++; + mysqli_query($mysqli,"UPDATE assets SET asset_location_id = $location_id WHERE asset_id = $asset_id"); logAudit("Asset", "Edit", "$session_name assigned asset $asset_name to location $location_name", $client_id, $asset_id); } // End Assign Location Loop - logAudit("Asset", "Bulk Edit", "$session_name assigned $asset_count assets to location $location_name", $client_id); + logAudit("Asset", "Bulk Edit", "$session_name assigned $asset_count assets to location $location_name", $location_client_id); flashAlert("You assigned $asset_count assets to location $location_name"); } @@ -578,16 +585,22 @@ if (isset($_POST['bulk_assign_asset_contact'])) { // Assign Contact to Selected Assets if (isset($_POST['asset_ids'])) { - // Get Selected Contacts Count - $asset_count = count($_POST['asset_ids']); + // Only the assets of the contact's client are assigned + $asset_count = 0; foreach($_POST['asset_ids'] as $asset_id) { $asset_id = intval($asset_id); // Get Asset Details for Logging - $sql = mysqli_query($mysqli,"SELECT asset_name FROM assets WHERE asset_id = $asset_id"); + $sql = mysqli_query($mysqli,"SELECT asset_name, asset_client_id FROM assets WHERE asset_id = $asset_id"); $row = mysqli_fetch_assoc($sql); - $asset_name = escapeSql($row['asset_name']); + $asset_name = escapeSql($row['asset_name'] ?? ''); + + if (!$row || intval($row['asset_client_id']) !== $client_id) { + continue; + } + + $asset_count++; mysqli_query($mysqli,"UPDATE assets SET asset_contact_id = $contact_id WHERE asset_id = $asset_id"); @@ -1344,8 +1357,10 @@ if (isExportRequest('export_assets')) { $type_query = "asset_type = 'Virtual Machine'"; } elseif ($type == 'network') { $type_query = "asset_type = 'Firewall/Router' OR asset_type = 'Switch' OR asset_type = 'Access Point'"; + } elseif ($type == 'printer') { + $type_query = "asset_type = 'Printer'"; } elseif ($type == 'other') { - $type_query = "asset_type NOT LIKE 'laptop' AND asset_type NOT LIKE 'desktop' AND asset_type NOT LIKE 'server' AND asset_type NOT LIKE 'virtual machine' AND asset_type NOT LIKE 'firewall/router' AND asset_type NOT LIKE 'switch' AND asset_type NOT LIKE 'access point'"; + $type_query = "asset_type NOT LIKE 'laptop' AND asset_type NOT LIKE 'desktop' AND asset_type NOT LIKE 'server' AND asset_type NOT LIKE 'virtual machine' AND asset_type NOT LIKE 'firewall/router' AND asset_type NOT LIKE 'switch' AND asset_type NOT LIKE 'access point' AND asset_type NOT LIKE 'printer'"; } else { // Default - any $type = ''; diff --git a/css/itflow_custom.css b/css/itflow_custom.css index cad8ed99c..700ea00da 100644 --- a/css/itflow_custom.css +++ b/css/itflow_custom.css @@ -3745,3 +3745,169 @@ tr:hover .itflow-copy, text-transform: uppercase; color: var(--bs-secondary-color); } + +/* Asset quick pickers - status, location and who it is assigned to, as pills + on the assets list and in the asset page header (functions/asset.php + assetQuickHtml), as lines in the asset page's Where & who card */ +.itflow-asset-pill { + max-width: 15rem; + padding: .35em .7em; + vertical-align: middle; +} +.itflow-asset-pill > .text-truncate { + min-width: 0; +} +.itflow-asset-pill-person { + padding: .2rem .6rem .2rem .2rem; +} +/* Nothing set yet - a dashed slot, so it reads as something to fill in */ +.itflow-asset-pill-empty { + border: 1px dashed var(--bs-border-color); + color: var(--bs-secondary-color); + background: transparent; +} +.itflow-asset-avatar { + display: inline-flex; + flex-shrink: 0; + align-items: center; + justify-content: center; + width: 20px; + height: 20px; + border-radius: 50%; + font-size: .6rem; + font-weight: 600; + color: #fff; + background-color: var(--bs-secondary); +} +/* In the Where & who card, and the quick look's glance lines, the picker is + the whole line: it lights up on hover with a chevron, like the ticket + page's properties. The negative margin keeps its text in line with the + plain values above and below. */ +.itflow-asset-dl .itflow-quick-pick-detail, +.itflow-asset-glance .itflow-quick-pick-detail { + display: flex; + align-items: center; + justify-content: space-between; + gap: .5rem; + width: calc(100% + 1rem); + min-width: 0; + margin: -.3rem -.5rem; + padding: .3rem .5rem; + text-align: left; +} +.itflow-asset-dl .itflow-quick-pick-detail:hover, +.itflow-asset-glance .itflow-quick-pick-detail:hover, +.itflow-asset-dl .itflow-quick-pick-detail:focus-visible, +.itflow-asset-glance .itflow-quick-pick-detail:focus-visible, +.itflow-asset-dl .itflow-quick-pick-detail[aria-expanded="true"], +.itflow-asset-glance .itflow-quick-pick-detail[aria-expanded="true"] { + background-color: var(--bs-tertiary-bg); +} +.itflow-asset-dl .itflow-quick-pick-detail + :not(:empty), +.itflow-asset-glance .itflow-quick-pick-detail + :not(:empty) { + margin-top: .35rem; +} +.itflow-asset-dl .ticket-prop-edit-icon, +.itflow-asset-glance .ticket-prop-edit-icon { + flex: 0 0 auto; + font-size: .7rem; + color: var(--bs-secondary-color); + opacity: 0; + transition: opacity .15s; +} +.itflow-asset-dl .itflow-quick-pick-detail:hover .ticket-prop-edit-icon, +.itflow-asset-glance .itflow-quick-pick-detail:hover .ticket-prop-edit-icon, +.itflow-asset-dl .itflow-quick-pick-detail:focus-visible .ticket-prop-edit-icon, +.itflow-asset-glance .itflow-quick-pick-detail:focus-visible .ticket-prop-edit-icon, +.itflow-asset-dl .itflow-quick-pick-detail[aria-expanded="true"] .ticket-prop-edit-icon, +.itflow-asset-glance .itflow-quick-pick-detail[aria-expanded="true"] .ticket-prop-edit-icon { + opacity: 1; +} +@media (hover: none) { + .itflow-asset-dl .ticket-prop-edit-icon, + .itflow-asset-glance .ticket-prop-edit-icon { + opacity: .6; + } +} +.itflow-asset-dl .itflow-quick-pick-detail.is-saved, +.itflow-asset-glance .itflow-quick-pick-detail.is-saved { + animation: itflowAssetQuickSaved .9s ease-out; +} +@keyframes itflowAssetQuickSaved { + from { background-color: var(--bs-success-bg-subtle); } + to { background-color: transparent; } +} +@media (prefers-reduced-motion: reduce) { + .itflow-asset-dl .itflow-quick-pick-detail.is-saved, + .itflow-asset-glance .itflow-quick-pick-detail.is-saved { + animation: none; + } +} + +/* Asset add / edit tabs - one line, scrolling sideways on a phone */ +.itflow-asset-form-tabs { + gap: .25rem; + scrollbar-width: thin; +} +.itflow-asset-form-tabs .nav-link { + padding-inline: .75rem; + white-space: nowrap; +} + +/* Asset quick look - agent/modals/asset/asset.php. The glance lines under the + header: an icon in place of a label, then the value */ +.itflow-asset-glance { + font-size: .875rem; +} +.itflow-glance-item { + display: flex; + align-items: flex-start; + gap: .6rem; + min-width: 0; + padding: .3rem 0; +} +.itflow-glance-item > .fa-fw:first-child { + flex: 0 0 auto; + margin-top: .2rem; + color: var(--bs-secondary-color); +} +.itflow-glance-item .font-monospace { + font-size: .82rem; +} +.itflow-asset-quicknote { + min-height: 2.6rem; + max-height: 12rem; + field-sizing: content; + border-color: transparent; + background-color: var(--bs-tertiary-bg); + resize: vertical; +} +.itflow-asset-quicknote:focus { + background-color: var(--bs-body-bg); +} +.itflow-asset-quick-related { + padding-top: .75rem; + border-top: 1px solid var(--bs-border-color-translucent); +} +.itflow-asset-quick-related .table, +.itflow-asset-quick-related .list-group { + font-size: .875rem; +} +.itflow-asset-quick-related .table > :not(caption) > * > :first-child { + padding-left: 0; +} +.itflow-asset-quick-related .table > :not(caption) > * > :last-child { + padding-right: 0; +} +.itflow-asset-quick-related .table td:first-child { + min-width: 0; +} +.itflow-asset-quick-related .itflow-asset-pills { + flex-wrap: nowrap; + gap: .15rem; + overflow-x: auto; + scrollbar-width: thin; +} +.itflow-asset-quick-related .itflow-asset-pills .nav-link { + padding: .25rem .55rem; +} diff --git a/functions/asset.php b/functions/asset.php index 65f417d35..af6c9d23c 100644 --- a/functions/asset.php +++ b/functions/asset.php @@ -239,3 +239,246 @@ function assetClientOwnedId($kind, $id, $client_id) { $sql = mysqli_query($mysqli, "SELECT 1 FROM $table WHERE $id_column = $id AND $client_column = $client_id LIMIT 1"); return mysqli_num_rows($sql) ? $id : 0; } + +/* + * Quick pickers (js/quick_pick.js) for an asset's status, location and who it + * is assigned to - changed where they show on the assets list and the asset + * page instead of through Edit. Wrapped in quickPick() (functions/ticket_fields.php) + * with the asset's client as the scope, since locations and contacts are per client. + */ + +/** The asset fields a quick picker can change. */ +const ASSET_QUICK_FIELDS = ['asset_status', 'asset_location', 'asset_contact']; + +/** The asset and what its pickers show, by id - the row assetQuickHtml() and assetContactDetails() draw from. */ +function assetQuickRow($asset_id) { + global $mysqli; + return mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT asset_id, asset_name, asset_status, asset_client_id, + asset_location_id, location_name, location_archived_at, + asset_contact_id, contact_name, contact_photo, contact_archived_at, contact_email, + contact_phone, contact_phone_country_code, contact_extension, contact_mobile, contact_mobile_country_code + FROM assets + LEFT JOIN locations ON location_id = asset_location_id + LEFT JOIN contacts ON contact_id = asset_contact_id + WHERE asset_id = " . intval($asset_id))) ?: null; +} + +/** A contact's picture, or their initials in a circle. 20px, for pills and the picker button. */ +function assetContactAvatar($client_id, $contact_name, $contact_photo) { + $contact_photo = (string) $contact_photo; + if ($contact_photo !== '') { + return ''; + } + return ''; +} + +/** + * What a picker shows for the value it holds now. $style is 'list' (a pill, + * on the assets list and in the asset page header) or 'detail' (a line in the + * asset page's Where & who card). $row is raw, as assetQuickRow() returns it. + */ +function assetQuickHtml($field, $row, $style = 'list') { + $client_id = intval($row['asset_client_id'] ?? 0); + $pill = 'badge rounded-pill fw-normal d-inline-flex align-items-center gap-1 itflow-asset-pill'; + $empty = "$pill itflow-asset-pill-empty"; + + if ($field === 'asset_status') { + return assetStatusPill($row['asset_status'] ?? '') ?: "No status"; + } + + if ($field === 'asset_location') { + if (!intval($row['asset_location_id'] ?? 0) || (string) ($row['location_name'] ?? '') === '') { + return $style === 'detail' + ? 'No location' + : "No location"; + } + $archived = !empty($row['location_archived_at']); + $name = '' . escapeHtml($row['location_name']) . ''; + return $style === 'detail' + ? '$name" + : "$name"; + } + + if ($field === 'asset_contact') { + if (!intval($row['asset_contact_id'] ?? 0) || (string) ($row['contact_name'] ?? '') === '') { + return $style === 'detail' + ? 'Nobody' + : "Nobody"; + } + $archived = !empty($row['contact_archived_at']); + $avatar = assetContactAvatar($client_id, $row['contact_name'], $row['contact_photo'] ?? ''); + $name = '' . escapeHtml($row['contact_name']) . ''; + return $style === 'detail' + ? "$avatar$name" + : "$avatar$name"; + } + + return ''; +} + +/** Under the asset page's Assigned picker: how to reach that person, and a link to them. Redrawn when the contact changes. */ +function assetContactDetails($row) { + $contact_id = intval($row['asset_contact_id'] ?? 0); + if (!$contact_id || (string) ($row['contact_name'] ?? '') === '') { + return ''; + } + $client_id = intval($row['asset_client_id']); + $email = escapeHtml($row['contact_email'] ?? ''); + $phone = escapeHtml(formatPhoneNumber($row['contact_phone'] ?? '', $row['contact_phone_country_code'] ?? '')); + $extension = escapeHtml($row['contact_extension'] ?? ''); + $mobile = escapeHtml(formatPhoneNumber($row['contact_mobile'] ?? '', $row['contact_mobile_country_code'] ?? '')); + + $html = ''; + if ($email) { + $html .= "
$email
"; + } + if ($phone) { + $html .= "
$phone" . ($extension ? " x$extension" : '') . '
'; + } + if ($mobile) { + $html .= "
$mobile
"; + } + $html .= "
Open contact
"; + + return $html; +} + +/** + * The choices a picker offers, in js/quick_pick.js's option shape. Locations + * and contacts are the client's own (null if the agent can't reach that client). + */ +function assetQuickOptions($field, $client_id) { + global $mysqli; + $client_id = intval($client_id); + + if ($field === 'asset_status') { + $options = [['value' => '', 'label' => 'No status', 'icon' => 'fas fa-minus', 'none' => true]]; + $sql = mysqli_query($mysqli, "SELECT category_name, category_color FROM categories + WHERE category_type = 'asset_status' AND category_archived_at IS NULL + ORDER BY category_order ASC, category_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $badge = assetStatusBadge($row['category_name'], $row['category_color']); + $color = $badge['style'] ? trim(substr($badge['style'], strlen('background-color:'))) : "var(--bs-{$badge['class']})"; + $options[] = ['value' => $row['category_name'], 'label' => $row['category_name'], 'color' => $color]; + } + return $options; + } + + if (!$client_id || !hasClientAccess($client_id)) { + return null; + } + + if ($field === 'asset_location') { + $options = [['value' => '0', 'label' => 'No location', 'icon' => 'fas fa-ban', 'none' => true]]; + $sql = mysqli_query($mysqli, "SELECT location_id, location_name, location_primary, location_city, location_state FROM locations + WHERE location_client_id = $client_id AND location_archived_at IS NULL + ORDER BY location_primary DESC, location_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $place = implode(', ', array_filter([trim((string) $row['location_city']), trim((string) $row['location_state'])])); + $description = implode(' ยท ', array_filter([intval($row['location_primary']) ? 'Primary' : '', $place])); + $options[] = ['value' => (string) intval($row['location_id']), 'label' => $row['location_name'], 'icon' => 'fas fa-map-marker-alt', 'description' => $description]; + } + return $options; + } + + if ($field === 'asset_contact') { + $options = [['value' => '0', 'label' => 'Nobody', 'icon' => 'fas fa-user-slash', 'none' => true]]; + $sql = mysqli_query($mysqli, "SELECT contact_id, contact_name, contact_title, contact_photo FROM contacts + WHERE contact_client_id = $client_id AND contact_archived_at IS NULL + ORDER BY contact_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $option = ['value' => (string) intval($row['contact_id']), 'label' => $row['contact_name'], 'description' => (string) $row['contact_title']]; + if ($row['contact_photo']) { + $option['image'] = "/uploads/clients/$client_id/" . rawurlencode($row['contact_photo']); + } else { + $option['initials'] = personInitials($row['contact_name']); + } + $options[] = $option; + } + return $options; + } + + return null; +} + +/** + * Change one field on one asset, as Edit Asset would - audit log and asset + * history included. The caller checks the agent may edit assets of its + * client. Returns [ok, plain-text message]. + */ +function assetQuickSet($asset_id, $field, $value) { + global $mysqli, $session_name; + + $asset_id = intval($asset_id); + $row = assetQuickRow($asset_id); + if (!$row) { + return [false, 'That asset no longer exists.']; + } + $client_id = intval($row['asset_client_id']); + $asset_name = escapeSql($row['asset_name']); + $value = trim((string) $value); + + if ($field === 'asset_status') { + if ($value !== '' && !isset(assetStatusColors()[$value])) { + return [false, 'Pick one of the asset statuses.']; + } + if ($value === (string) $row['asset_status']) { + return [true, '']; + } + $status = escapeSql($value); + mysqli_query($mysqli, "UPDATE assets SET asset_status = '$status' WHERE asset_id = $asset_id"); + $what = $value === '' ? "cleared the status on $asset_name" : "set status to $status on $asset_name"; + $message = $value === '' ? 'Status cleared' : "Status set to $value"; + + } elseif ($field === 'asset_location') { + $location_id = assetClientOwnedId('location', $value, $client_id); + if (intval($value) && !$location_id) { + return [false, 'That location is not one of this client\'s.']; + } + if ($location_id === intval($row['asset_location_id'])) { + return [true, '']; + } + $location_name = $location_id ? (string) mysqli_fetch_row(mysqli_query($mysqli, "SELECT location_name FROM locations WHERE location_id = $location_id"))[0] : ''; + $status = escapeSql($row['asset_status']); + mysqli_query($mysqli, "UPDATE assets SET asset_location_id = $location_id WHERE asset_id = $asset_id"); + $what = $location_id ? "assigned asset $asset_name to location " . escapeSql($location_name) : "removed asset $asset_name from its location"; + $message = $location_id ? "Moved to $location_name" : 'Location removed'; + + } elseif ($field === 'asset_contact') { + $contact_id = assetClientOwnedId('contact', $value, $client_id); + if (intval($value) && !$contact_id) { + return [false, 'That contact is not one of this client\'s.']; + } + if ($contact_id === intval($row['asset_contact_id'])) { + return [true, '']; + } + $contact_name = $contact_id ? (string) mysqli_fetch_row(mysqli_query($mysqli, "SELECT contact_name FROM contacts WHERE contact_id = $contact_id"))[0] : ''; + $status = escapeSql($row['asset_status']); + mysqli_query($mysqli, "UPDATE assets SET asset_contact_id = $contact_id WHERE asset_id = $asset_id"); + $what = $contact_id ? "assigned asset $asset_name to contact " . escapeSql($contact_name) : "unassigned asset $asset_name"; + $message = $contact_id ? "Assigned to $contact_name" : 'Unassigned'; + + } else { + return [false, 'Unknown field.']; + } + + logAudit("Asset", "Edit", "$session_name $what", $client_id, $asset_id); + mysqli_query($mysqli, "INSERT INTO asset_history SET asset_history_status = '$status', asset_history_description = '$session_name $what', asset_history_asset_id = $asset_id"); + + return [true, $message]; +} + +/** What quick_pick.js redraws after a change: the value in both looks, plus the contact details on the asset page. */ +function assetQuickRecord($asset_id, $field) { + $row = assetQuickRow($asset_id); + $current = [ + 'asset_status' => (string) $row['asset_status'], + 'asset_location' => (string) intval($row['asset_location_id']), + 'asset_contact' => (string) intval($row['asset_contact_id']), + ][$field]; + $record = ['current' => $current, 'html' => ['list' => assetQuickHtml($field, $row, 'list'), 'detail' => assetQuickHtml($field, $row, 'detail')]]; + if ($field === 'asset_contact') { + $record['related'] = ['asset-contact-' . intval($asset_id) => assetContactDetails($row)]; + } + return $record; +} diff --git a/functions/ticket_fields.php b/functions/ticket_fields.php index 9e8f0192f..b3d7e2493 100644 --- a/functions/ticket_fields.php +++ b/functions/ticket_fields.php @@ -268,18 +268,21 @@ function ticketStatusHtml($status_name, $status_color, $style = 'list') { /* * The button that opens a quick picker (js/quick_pick.js) for one record's - * field, wrapped round how the value looks now. $id is the ticket, project - * or recurring ticket, depending on the field. + * field, wrapped round how the value looks now. $id is the ticket, project, + * recurring ticket or asset, depending on the field. $scope is the client + * whose choices it offers, for fields where those are per client (an asset's + * location and contact). */ -function quickPick($field, $id, $current, $inner, $style = 'list', $status_id = 0) { +function quickPick($field, $id, $current, $inner, $style = 'list', $status_id = 0, $scope = 0) { $labels = [ 'priority' => 'Change priority', 'assignee' => 'Change who it is assigned to', 'billable' => 'Change billing', 'status' => 'Change status', - 'project_manager' => 'Change the project manager', 'recurring_assignee' => 'Change who it is assigned to' + 'project_manager' => 'Change the project manager', 'recurring_assignee' => 'Change who it is assigned to', + 'asset_status' => 'Change status', 'asset_location' => 'Change location', 'asset_contact' => 'Change who it is assigned to' ]; // On the ticket page it looks like the other editable properties there (agent/css/ticket.css) $class = 'itflow-quick-pick itflow-quick-pick-' . $style . ($style === 'detail' ? ' ticket-prop-edit' : ''); return '