From 93d61002934a845953670837746c7f5efa6c51b9 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 11 Nov 2025 17:45:34 -0800 Subject: [PATCH] add result count and logic for no results --- files/dashboard/index.php | 31 +++++++++++++++++++------------ tasks/main.yaml | 24 ++++++++++++------------ 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/files/dashboard/index.php b/files/dashboard/index.php index 65819f4..d3c7c1a 100644 --- a/files/dashboard/index.php +++ b/files/dashboard/index.php @@ -45,6 +45,7 @@ if (isset($_GET['group'])) { } curl_close($ch); $data = json_decode($response, true); + $numResults = count($data); // build the group array $gpoMap = []; // will look like: [ 'GPO‑Name' => ['Administrator' => [...], 'vnc_admin' => [...]] ] @@ -74,21 +75,27 @@ if (isset($_GET['group'])) { } } ksort($gpoMap, SORT_STRING | SORT_FLAG_CASE); - echo ''; - echo ''; + if($numResults > 0){ + echo 'Total results: '.$numResults.'
'; + echo '
GPOAdministratorsvnc_admin
'; + echo ''; - foreach ($gpoMap as $gpoName => $cols) { - // Remove duplicates and build comma‑separated lists - $adminGroups = implode('
', array_unique($cols['administrators'])); - $vncGroups = implode('
', array_unique($cols['vnc_admin'])); + foreach ($gpoMap as $gpoName => $cols) { + // Remove duplicates and build comma‑separated lists + $adminGroups = implode('
', array_unique($cols['administrators'])); + $vncGroups = implode('
', array_unique($cols['vnc_admin'])); - echo ''; - echo ""; - echo ""; - echo ""; - echo ''; + echo ''; + echo ""; + echo ""; + echo ""; + echo ''; + } + echo '
GPOAdministratorsvnc_admin
{$gpoName}{$adminGroups}{$vncGroups}
{$gpoName}{$adminGroups}{$vncGroups}
'; + } + else{ + echo 'No results found for query.

'; } - echo ''; } } else { diff --git a/tasks/main.yaml b/tasks/main.yaml index ded3e42..b8c3e7b 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -1,18 +1,18 @@ --- # Mount GPO Share path -- name: Mount GPO Share path - include_role: - name: "cifs_mount" - vars: - smb_username: "{{ ITMFG_USERNAME }}" - smb_password: "{{ ITMFG_PASSWORD }}" - server_path: "//172.23.1.23/gpo" - target_path: "{{ gpo_yaml_share }}" - -# create python gpo service -- name: GPO Site - python api service - include_tasks: api.yaml +#- name: Mount GPO Share path +# include_role: +# name: "cifs_mount" +# vars: +# smb_username: "{{ ITMFG_USERNAME }}" +# smb_password: "{{ ITMFG_PASSWORD }}" +# server_path: "//172.23.1.23/gpo" +# target_path: "{{ gpo_yaml_share }}" +# +## create python gpo service +#- name: GPO Site - python api service +# include_tasks: api.yaml # create python gpo service - name: GPO Site - dashboard container