From 93e45dc7c4ef6ef70ab6211668a5889a7bb4ba34 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 25 May 2022 16:09:20 -0400 Subject: [PATCH] Added Client Asset Status functionality need to work on the names --- client_asset_add_modal.php | 15 +++++++++++++++ client_asset_copy_modal.php | 14 ++++++++++++++ client_asset_edit_modal.php | 14 ++++++++++++++ client_assets.php | 3 +++ get_settings.php | 8 +++++++- post.php | 6 ++++-- 6 files changed, 57 insertions(+), 3 deletions(-) diff --git a/client_asset_add_modal.php b/client_asset_add_modal.php index 505b928b..5bc43e08 100644 --- a/client_asset_add_modal.php +++ b/client_asset_add_modal.php @@ -162,6 +162,21 @@ +
+ +
+
+ +
+ +
+
+
diff --git a/client_asset_copy_modal.php b/client_asset_copy_modal.php index b22c9269..166e0d17 100644 --- a/client_asset_copy_modal.php +++ b/client_asset_copy_modal.php @@ -160,6 +160,20 @@
+
+ +
+
+ +
+ +
+
+
diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php index fa1e46a6..fdd4cb2e 100644 --- a/client_asset_edit_modal.php +++ b/client_asset_edit_modal.php @@ -161,6 +161,20 @@
+
+ +
+
+ +
+ +
+
+
diff --git a/client_assets.php b/client_assets.php index 6ea717c2..dddf55b3 100644 --- a/client_assets.php +++ b/client_assets.php @@ -154,6 +154,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); Assigned To Location + Status Action @@ -185,6 +186,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $asset_ip_display = "$asset_ip"; } $asset_mac = $row['asset_mac']; + $asset_status = $row['asset_status']; $asset_purchase_date = $row['asset_purchase_date']; $asset_warranty_expire = $row['asset_warranty_expire']; $asset_install_date = $row['asset_install_date']; @@ -318,6 +320,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); +
diff --git a/get_settings.php b/get_settings.php index 19bcf837..555a0353 100644 --- a/get_settings.php +++ b/get_settings.php @@ -86,7 +86,6 @@ $config_currency_format = "US_en"; // Theme $config_enable_dark_mode = "dark_mode"; - $colors_array = array( 'green', 'olive', @@ -921,4 +920,11 @@ $document_types_array = array( '2'=>'Global Template' ); +$asset_status_array = array( + 'In Storage', + 'In Use', + 'In Service', + 'Retired' +); + ?> \ No newline at end of file diff --git a/post.php b/post.php index b5f018eb..2de1c171 100644 --- a/post.php +++ b/post.php @@ -4993,6 +4993,7 @@ if(isset($_POST['add_asset'])){ $os = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['os']))); $ip = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['ip']))); $mac = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['mac']))); + $status = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['status']))); $location = intval($_POST['location']); $vendor = intval($_POST['vendor']); $contact = intval($_POST['contact']); @@ -5011,7 +5012,7 @@ if(isset($_POST['add_asset'])){ } $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes']))); - mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_ip = '$ip', asset_mac = '$mac', asset_location_id = $location, asset_vendor_id = $vendor, asset_contact_id = $contact, asset_purchase_date = '$purchase_date', asset_warranty_expire = '$warranty_expire', asset_install_date = '$install_date', asset_notes = '$notes', asset_network_id = $network, asset_client_id = $client_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_ip = '$ip', asset_mac = '$mac', asset_location_id = $location, asset_vendor_id = $vendor, asset_contact_id = $contact, asset_status = '$status', asset_purchase_date = '$purchase_date', asset_warranty_expire = '$warranty_expire', asset_install_date = '$install_date', asset_notes = '$notes', asset_network_id = $network, asset_client_id = $client_id, company_id = $session_company_id"); if(!empty($_POST['username'])) { $asset_id = mysqli_insert_id($mysqli); @@ -5046,6 +5047,7 @@ if(isset($_POST['edit_asset'])){ $os = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['os']))); $ip = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['ip']))); $mac = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['mac']))); + $status = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['status']))); $location = intval($_POST['location']); $vendor = intval($_POST['vendor']); $contact = intval($_POST['contact']); @@ -5066,7 +5068,7 @@ if(isset($_POST['edit_asset'])){ $username = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['username']))); $password = trim(mysqli_real_escape_string($mysqli,encryptLoginEntry($_POST['password']))); - mysqli_query($mysqli,"UPDATE assets SET asset_name = '$name', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_ip = '$ip', asset_mac = '$mac', asset_location_id = $location, asset_vendor_id = $vendor, asset_contact_id = $contact, asset_purchase_date = '$purchase_date', asset_warranty_expire = '$warranty_expire', asset_install_date = '$install_date', asset_notes = '$notes', asset_network_id = $network WHERE asset_id = $asset_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE assets SET asset_name = '$name', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_ip = '$ip', asset_mac = '$mac', asset_location_id = $location, asset_vendor_id = $vendor, asset_contact_id = $contact, asset_status = '$status', asset_purchase_date = '$purchase_date', asset_warranty_expire = '$warranty_expire', asset_install_date = '$install_date', asset_notes = '$notes', asset_network_id = $network WHERE asset_id = $asset_id AND company_id = $session_company_id"); //If login exists then update the login if($login_id > 0){