diff --git a/includes/client_overview_side_nav.php b/includes/client_overview_side_nav.php index 031dd8e2..a66aa30f 100644 --- a/includes/client_overview_side_nav.php +++ b/includes/client_overview_side_nav.php @@ -64,6 +64,12 @@

ALL Certificates

+
  • + "> + +

    ALL Services

    +     +
    • diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php index 183c799b..52865f0a 100644 --- a/includes/client_side_nav.php +++ b/includes/client_side_nav.php @@ -209,7 +209,7 @@
  • - "> + ">

    Services diff --git a/modals/client_service_add_modal.php b/modals/client_service_add_modal.php deleted file mode 100644 index fcc9edf3..00000000 --- a/modals/client_service_add_modal.php +++ /dev/null @@ -1,214 +0,0 @@ -

     diff --git a/modals/service_add_modal.php b/modals/service_add_modal.php new file mode 100644 index 00000000..5d4e0f6b --- /dev/null +++ b/modals/service_add_modal.php @@ -0,0 +1,247 @@ + diff --git a/networks.php b/networks.php index 0c230ad3..bf2a7564 100644 --- a/networks.php +++ b/networks.php @@ -26,7 +26,7 @@ $sql = mysqli_query( "SELECT SQL_CALC_FOUND_ROWS * FROM networks LEFT JOIN clients ON client_id = network_client_id LEFT JOIN locations ON location_id = network_location_id - WHERE network_archived_at IS NULL + WHERE network_$archive_query AND (network_name LIKE '%$q%' OR network_description LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_subnet LIKE '%$q%' OR network_primary_dns LIKE '%$q%' OR network_secondary_dns LIKE '%$q%' OR network_dhcp_range LIKE '%$q%' OR location_name LIKE '%$q%' OR client_name LIKE '%$q%') $client_query ORDER BY $sort $order LIMIT $record_from, $record_to" diff --git a/client_services.php b/services.php similarity index 69% rename from client_services.php rename to services.php index a7958986..e53c1f6e 100644 --- a/client_services.php +++ b/services.php @@ -4,20 +4,27 @@ $sort = "service_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 service_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_client_overview_all.php"; + $client_query = ''; + $client_url = ''; +} // Perms enforceUserPermission('module_support'); -//Rebuild URL -$url_query_strings_sort = http_build_query($get_copy); - // Overview SQL query $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM services - WHERE service_client_id = '$client_id' - AND (service_name LIKE '%$q%' OR service_description LIKE '%$q%' OR service_category LIKE '%$q%') + LEFT JOIN clients ON client_id = service_client_id + WHERE (service_name LIKE '%$q%' OR service_description LIKE '%$q%' OR service_category LIKE '%$q%' OR client_name LIKE '%$q%') + $client_query ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -37,7 +44,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    + +
    @@ -60,10 +69,33 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); "> - - - - + + + + + + + @@ -71,6 +103,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + +
    NameCategoryImportanceUpdated + + Name + + + + Category + + + + Importance + + + + Updated + + + + Client + + Action
    @@ -144,5 +181,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));