- - -
- + +
+
+
+ 
" alt="">
+
+
+
+
+
+
+ + + + Archived + + + + + + + +
+
+
+
+
+
+
-
-
-
- -
- -
-
-
-
-
- ">
-
-
-
+
+
- -
- -
+
+
+
+
+
+
+
+
+
+
-
-
-
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';
?>
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
-
+
+
+
+
+
'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();
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Warranty (' . escapeHtml($asset_warranty['date']) . ')' : '' ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Warranty
+
-
-
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
-
+
+
+
@@ -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 ' . '/' . escapeHtml(rawurlencode($contact_photo)) . ')
';
+ }
+ 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 .= "";
+ }
+ if ($phone) {
+ $html .= "
+
-
+
+
- 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
+
+
-
-
-
-
+
">
@@ -328,16 +372,7 @@ $asset_ip_is_dhcp = $asset_ip === 'DHCP';
-
+
+
+
+
-
-
-
Asset ID
- -';
+ }
+ 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 .= "";
+ }
+ if ($phone) {
+ $html .= "$phone" . ($extension ? " x$extension" : '') . '
';
+ }
+ if ($mobile) {
+ $html .= "$mobile
";
+ }
+ $html .= "";
+
+ 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 '