diff --git a/client_asset_bulk_edit_status_modal.php b/client_asset_bulk_edit_status_modal.php
new file mode 100644
index 00000000..910d953c
--- /dev/null
+++ b/client_asset_bulk_edit_status_modal.php
@@ -0,0 +1,36 @@
+
-
+
-
+
diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php
index f544693f..45a07833 100644
--- a/client_asset_edit_modal.php
+++ b/client_asset_edit_modal.php
@@ -134,20 +134,20 @@
'$asset_created_at' OR network_archived_at IS NULL) AND network_client_id = $client_id ORDER BY network_archived_at ASC, network_name ASC");
+ $sql_networks = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_id = $asset_network_id OR network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
while ($row = mysqli_fetch_array($sql_networks)) {
$network_id_select = intval($row['network_id']);
$network_name_select = nullable_htmlentities($row['network_name']);
$network_select = nullable_htmlentities($row['network']);
$network_archived_at = nullable_htmlentities($row['network_archived_at']);
- if (empty($network_archived_at)) {
- $network_archived_display = "";
+ if ($network_archived_at) {
+ $network_name_select_display = "($network_name_select - $network_select) - ARCHIVED";
} else {
- $network_archived_display = "Archived - ";
+ $network_name_select_display = "$network_name_select - $network_select";
}
?>
-
+
@@ -223,18 +223,18 @@
'$asset_created_at' OR location_archived_at IS NULL) AND location_client_id = $client_id ORDER BY location_archived_at ASC, location_name ASC");
+ $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_id = $asset_location_id OR location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
while ($row = mysqli_fetch_array($sql_locations)) {
$location_id_select = intval($row['location_id']);
$location_name_select = nullable_htmlentities($row['location_name']);
$location_archived_at = nullable_htmlentities($row['location_archived_at']);
- if (empty($location_archived_at)) {
- $location_archived_display = "";
+ if ($location_archived_at) {
+ $location_name_select_display = "($location_name_select) - ARCHIVED";
} else {
- $location_archived_display = "Archived - ";
+ $location_name_select_display = $location_name_select;
}
?>
-
+
@@ -251,19 +251,19 @@
@@ -299,18 +299,18 @@
'$asset_created_at' OR vendor_archived_at IS NULL) AND vendor_client_id = $client_id ORDER BY vendor_archived_at ASC, vendor_name ASC");
+ $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_id = $asset_vendor_id OR vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
while ($row = mysqli_fetch_array($sql_vendors)) {
$vendor_id_select = intval($row['vendor_id']);
$vendor_name_select = nullable_htmlentities($row['vendor_name']);
$vendor_archived_at = nullable_htmlentities($row['vendor_archived_at']);
- if (empty($vendor_archived_at)) {
- $vendor_archived_display = "";
+ if ($vendor_archived_at) {
+ $vendor_name_select_display = "($vendor_name_select) - ARCHIVED";
} else {
- $vendor_archived_display = "Archived - ";
+ $vendor_name_select_display = $vendor_name_select;
}
?>
-
+
diff --git a/client_assets.php b/client_assets.php
index d57b8540..06de5897 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -151,6 +151,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
Assign Location
+
+
+ Set Status
+
@@ -252,10 +256,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
$contact_name = "-";
}
$contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
- if (empty($contact_archived_at)) {
- $contact_archived_display = "";
+ if ($contact_archived_at) {
+ $contact_name_display = "