From 76ed7afa18f599f58090b7b97b75dd68a9bb7476 Mon Sep 17 00:00:00 2001 From: "johnny@pittpc.com" Date: Mon, 3 Feb 2020 13:55:21 -0500 Subject: [PATCH] Added category to logins, added OS and MAC to assets, minor UI updates --- add_asset_modal.php | 60 +++++++-- add_client_modal.php | 6 +- add_login_modal.php | 17 ++- client.php | 2 + client_assets.php | 13 +- client_contacts.php | 6 +- client_locations.php | 5 +- client_logins.php | 5 +- client_networks.php | 4 +- client_notes.php | 1 + client_vendors.php | 4 +- db.sql | 33 ++++- edit_asset_modal.php | 53 ++++++-- edit_client_modal.php | 4 +- edit_login_modal.php | 17 ++- footer.php | 1 + header.php | 2 + plugins/toastr/toastr.css | 228 ++++++++++++++++++++++++++++++++++ plugins/toastr/toastr.js.map | 1 + plugins/toastr/toastr.min.css | 1 + plugins/toastr/toastr.min.js | 2 + post.php | 29 +++-- top_nav.php | 2 +- 23 files changed, 438 insertions(+), 58 deletions(-) create mode 100644 plugins/toastr/toastr.css create mode 100644 plugins/toastr/toastr.js.map create mode 100644 plugins/toastr/toastr.min.css create mode 100644 plugins/toastr/toastr.min.js diff --git a/add_asset_modal.php b/add_asset_modal.php index 3b9a7de9..b49c0613 100644 --- a/add_asset_modal.php +++ b/add_asset_modal.php @@ -7,25 +7,34 @@ +
+ +
-
@@ -231,6 +261,7 @@ +
@@ -242,6 +273,15 @@
+ +
+ +
+ +
+ +
+
diff --git a/add_client_modal.php b/add_client_modal.php index b6c41395..dcbc939e 100644 --- a/add_client_modal.php +++ b/add_client_modal.php @@ -146,12 +146,12 @@
- +
- +
@@ -162,7 +162,7 @@
- + diff --git a/add_login_modal.php b/add_login_modal.php index 6ed29322..74d91e0d 100644 --- a/add_login_modal.php +++ b/add_login_modal.php @@ -2,7 +2,7 @@
-
New Login
+
New Login
@@ -33,11 +33,21 @@
- +
+ +
+ +
+
+ +
+ +
+
@@ -153,8 +163,7 @@
- - +
diff --git a/client.php b/client.php index 506e889c..a8726276 100644 --- a/client.php +++ b/client.php @@ -35,6 +35,8 @@ if(isset($_GET['client_id'])){ if($client_net_terms == 0){ $client_net_terms = $config_default_net_terms; } + $client_company_size = $row['client_company_size']; + $client_notes = $row['client_notes']; //Add up all the payments for the invoice and get the total amount paid to the invoice $sql_invoice_amounts = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled'"); diff --git a/client_assets.php b/client_assets.php index d43fa223..1fc3ac79 100644 --- a/client_assets.php +++ b/client_assets.php @@ -89,9 +89,12 @@ $total_pages = ceil($total_found_rows / 10); $asset_make = $row['asset_make']; $asset_model = $row['asset_model']; $asset_serial = $row['asset_serial']; + $asset_os = $row['asset_os']; $asset_ip = $row['asset_ip']; + $asset_mac = $row['asset_mac']; $asset_purchase_date = $row['asset_purchase_date']; $asset_warranty_expire = $row['asset_warranty_expire']; + $asset_notes = $row['asset_notes']; $vendor_id = $row['vendor_id']; $location_id = $row['location_id']; $contact_id = $row['contact_id']; @@ -134,11 +137,11 @@ $total_pages = ceil($total_found_rows / 10); ?> - + - +
@@ -187,10 +190,10 @@ $total_pages = ceil($total_found_rows / 10);
- -
+
Edit Delete
diff --git a/client_contacts.php b/client_contacts.php index 1edd0948..efa89599 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -99,7 +99,7 @@ $total_pages = ceil($total_found_rows / 10); ?> - + @@ -114,9 +114,9 @@ $total_pages = ceil($total_found_rows / 10);
-
+
- + diff --git a/client_locations.php b/client_locations.php index 8f122dc0..2ca5e8eb 100644 --- a/client_locations.php +++ b/client_locations.php @@ -103,7 +103,10 @@ $total_pages = ceil($total_found_rows / 10); ?> - + + + + " target="_blank"> diff --git a/client_logins.php b/client_logins.php index cbc49e06..ebaa8eb0 100644 --- a/client_logins.php +++ b/client_logins.php @@ -42,7 +42,7 @@ if(isset($_GET['o'])){ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS *, AES_DECRYPT(login_password, '$config_aes_key') AS login_password FROM logins WHERE client_id = $client_id - AND (login_name LIKE '%$q%' OR login_username LIKE '%$q%') + AND (login_name LIKE '%$q%' OR login_username LIKE '%$q%' OR login_category LIKE '%$q%' OR login_uri LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); @@ -73,6 +73,7 @@ $total_pages = ceil($total_found_rows / 10); "> Name + Category Username Password Action @@ -84,6 +85,7 @@ $total_pages = ceil($total_found_rows / 10); while($row = mysqli_fetch_array($sql)){ $login_id = $row['login_id']; $login_name = $row['login_name']; + $login_category = $row['login_category']; $login_uri = $row['login_uri']; $login_username = $row['login_username']; $login_password = $row['login_password']; @@ -101,6 +103,7 @@ $total_pages = ceil($total_found_rows / 10); + diff --git a/client_networks.php b/client_networks.php index b90c3f37..33b965e2 100644 --- a/client_networks.php +++ b/client_networks.php @@ -93,7 +93,9 @@ $total_pages = ceil($total_found_rows / 10); ?> - + + + diff --git a/client_notes.php b/client_notes.php index 0fdb4f80..9dee32a0 100644 --- a/client_notes.php +++ b/client_notes.php @@ -68,6 +68,7 @@ $total_pages = ceil($total_found_rows / 10);
+
"> diff --git a/client_vendors.php b/client_vendors.php index f47f23bb..16c84477 100644 --- a/client_vendors.php +++ b/client_vendors.php @@ -108,7 +108,7 @@ $total_pages = ceil($total_found_rows / 10); ?> -
+ - + -