From fc00b5e78f4b6ca253e38aece75817b7bf8613c3 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 20 Feb 2025 16:25:07 -0500 Subject: [PATCH] Added Location to Global View, updated links and fixed password pop over moving you to the top of the page when clicked in asset and conact details --- asset_details.php | 5 +- contact_details.php | 25 +++++----- credentials.php | 3 +- includes/client_overview_side_nav.php | 6 +++ includes/client_side_nav.php | 2 +- client_locations.php => locations.php | 46 ++++++++++++++----- ...modal.php => contact_link_asset_modal.php} | 0 ....php => contact_link_credential_modal.php} | 0 ...al.php => contact_link_document_modal.php} | 0 ..._modal.php => contact_link_file_modal.php} | 0 ...dal.php => contact_link_service_modal.php} | 0 ...al.php => contact_link_software_modal.php} | 0 ...n_add_modal.php => location_add_modal.php} | 31 ++++++++++++- ...hp => location_bulk_assign_tags_modal.php} | 0 ...rt_modal.php => location_export_modal.php} | 4 +- ...rt_modal.php => location_import_modal.php} | 6 ++- post/user/location.php | 34 ++++++-------- 17 files changed, 106 insertions(+), 56 deletions(-) rename client_locations.php => locations.php (89%) rename modals/{client_contact_link_asset_modal.php => contact_link_asset_modal.php} (100%) rename modals/{client_contact_link_credential_modal.php => contact_link_credential_modal.php} (100%) rename modals/{client_contact_link_document_modal.php => contact_link_document_modal.php} (100%) rename modals/{client_contact_link_file_modal.php => contact_link_file_modal.php} (100%) rename modals/{client_contact_link_service_modal.php => contact_link_service_modal.php} (100%) rename modals/{client_contact_link_software_modal.php => contact_link_software_modal.php} (100%) rename modals/{client_location_add_modal.php => location_add_modal.php} (87%) rename modals/{client_location_bulk_assign_tags_modal.php => location_bulk_assign_tags_modal.php} (100%) rename modals/{client_location_export_modal.php => location_export_modal.php} (79%) rename modals/{client_location_import_modal.php => location_import_modal.php} (80%) diff --git a/asset_details.php b/asset_details.php index 8c09d235..cb020ec9 100644 --- a/asset_details.php +++ b/asset_details.php @@ -592,7 +592,7 @@ if (isset($_GET['asset_id'])) { - + @@ -1080,9 +1080,8 @@ if (isset($_GET['asset_id'])) { }); - - + - - + + +
@@ -544,7 +541,7 @@ if (isset($_GET['contact_id'])) { - + @@ -1173,17 +1170,17 @@ if (isset($_GET['contact_id'])) { - + $login_tag_name"; + $login_tag_name_display_array[] = "$login_tag_name"; } $login_tags_display = implode('', $login_tag_name_display_array); @@ -457,6 +457,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + diff --git a/includes/client_overview_side_nav.php b/includes/client_overview_side_nav.php index 952831a0..eb721e0c 100644 --- a/includes/client_overview_side_nav.php +++ b/includes/client_overview_side_nav.php @@ -22,6 +22,12 @@

ALL Contacts

+
  • + "> + +

    ALL Locations

    +     +
  • "> diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php index a24a83a8..848bb025 100644 --- a/includes/client_side_nav.php +++ b/includes/client_side_nav.php @@ -39,7 +39,7 @@
  • - "> + ">

    Locations diff --git a/client_locations.php b/locations.php similarity index 89% rename from client_locations.php rename to locations.php index b0874c12..9c10745d 100644 --- a/client_locations.php +++ b/locations.php @@ -4,7 +4,16 @@ $sort = "location_name"; $order = "ASC"; -require_once "includes/inc_all_client.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND location_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_client_overview_all.php"; + $client_query = ''; + $client_url = ''; +} // Tags Filter if (isset($_GET['tags']) && is_array($_GET['tags']) && !empty($_GET['tags'])) { @@ -27,13 +36,14 @@ $url_query_strings_sort = http_build_query($get_copy); $sql = mysqli_query( $mysqli, - "SELECT SQL_CALC_FOUND_ROWS locations.*, GROUP_CONCAT(tag_name) FROM locations + "SELECT SQL_CALC_FOUND_ROWS locations.*, clients.*, GROUP_CONCAT(tag_name) FROM locations + LEFT JOIN clients ON client_id = location_client_id LEFT JOIN location_tags ON location_tags.location_id = locations.location_id LEFT JOIN tags ON tags.tag_id = location_tags.tag_id - WHERE location_client_id = $client_id + WHERE location_$archive_query $tag_query - AND location_$archive_query - AND (location_name LIKE '%$q%' OR location_description LIKE '%$q%' OR location_address LIKE '%$q%' OR location_phone LIKE '%$phone_query%' OR tag_name LIKE '%$q%') + AND (location_name LIKE '%$q%' OR location_description LIKE '%$q%' OR location_address LIKE '%$q%' OR location_phone LIKE '%$phone_query%' OR tag_name LIKE '%$q%' OR client_name LIKE '%$q%') + $client_query GROUP BY location_id ORDER BY location_primary DESC, $sort $order LIMIT $record_from, $record_to" ); @@ -67,7 +77,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));

    + +
    @@ -97,7 +109,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - "> Archived @@ -167,6 +179,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Hours + + + + Client + + + Action @@ -174,6 +193,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $location_tag_name"; + $location_tag_name_display_array[] = "$location_tag_name"; } $location_tags_display = implode('', $location_tag_name_display_array); @@ -270,6 +291,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + +
    - + @@ -324,7 +348,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -33,6 +32,33 @@
    + + + + + +
    + +
    +
    + +
    + +
    +
    + +
    @@ -126,7 +152,7 @@
    - +
    @@ -148,6 +174,7 @@
    +
    diff --git a/modals/client_location_bulk_assign_tags_modal.php b/modals/location_bulk_assign_tags_modal.php similarity index 100% rename from modals/client_location_bulk_assign_tags_modal.php rename to modals/location_bulk_assign_tags_modal.php diff --git a/modals/client_location_export_modal.php b/modals/location_export_modal.php similarity index 79% rename from modals/client_location_export_modal.php rename to modals/location_export_modal.php index 42f2699c..b9bda966 100644 --- a/modals/client_location_export_modal.php +++ b/modals/location_export_modal.php @@ -8,12 +8,14 @@
    + +
    - +
    diff --git a/modals/client_location_import_modal.php b/modals/location_import_modal.php similarity index 80% rename from modals/client_location_import_modal.php rename to modals/location_import_modal.php index 579d82b9..bbc14fa3 100644 --- a/modals/client_location_import_modal.php +++ b/modals/location_import_modal.php @@ -8,7 +8,9 @@
    + +

    Format csv file with headings & data:
    Name, Description, Address, City, State, Postal Code, Phone, Hours

    @@ -16,10 +18,10 @@
    - +
    - +
    diff --git a/post/user/location.php b/post/user/location.php index 7e880615..6f44d167 100644 --- a/post/user/location.php +++ b/post/user/location.php @@ -368,23 +368,22 @@ if (isset($_POST['bulk_delete_locations'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } -if(isset($_POST['export_client_locations_csv'])){ - $client_id = intval($_POST['client_id']); - - //get records from database - $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); - - $client_name = sanitizeInput($row['client_name']); +if(isset($_POST['export_locations_csv'])){ + if (isset($_POST['client_id'])) { + $client_id = intval($_POST['client_id']); + $client_query = "AND location_client_id = $client_id"; + } else { + $client_query = ''; + } //Locations - $sql = mysqli_query($mysqli,"SELECT * FROM locations WHERE location_client_id = $client_id AND location_archived_at IS NULL ORDER BY location_name ASC"); + $sql = mysqli_query($mysqli,"SELECT * FROM locations WHERE location_archived_at IS NULL $client_query ORDER BY location_name ASC"); $num_rows = mysqli_num_rows($sql); if($num_rows > 0) { $delimiter = ","; - $filename = strtoAZaz09($client_name) . "-Locations-" . date('Y-m-d') . ".csv"; + $filename = "Locations-" . date('Y-m-d') . ".csv"; //create a file pointer $f = fopen('php://memory', 'w'); @@ -411,13 +410,13 @@ if(isset($_POST['export_client_locations_csv'])){ } // Logging - logAction("Location", "Export", "$session_name exported $num_rows location(s) to a CSV file", $client_id); + logAction("Location", "Export", "$session_name exported $num_rows location(s) to a CSV file"); exit; } -if(isset($_POST["import_client_locations_csv"])){ +if(isset($_POST["import_locations_csv"])){ enforceUserPermission('module_client', 2); @@ -515,17 +514,10 @@ if(isset($_POST["import_client_locations_csv"])){ } } -if(isset($_GET['download_client_locations_csv_template'])){ - $client_id = intval($_GET['download_client_locations_csv_template']); - - //get records from database - $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); - - $client_name = $row['client_name']; +if(isset($_GET['download_locations_csv_template'])){ $delimiter = ","; - $filename = strtoAZaz09($client_name) . "-Locations-Template.csv"; + $filename = "Locations-Template.csv"; //create a file pointer $f = fopen('php://memory', 'w');