Merge pull request #2608 from department-of-veterans-affairs/rc/2024-…

…11-26/Sprint-85-c3 Rc/2024 11 26/sprint 85 c3
department-of-veterans-affairs · Nov 26, 2024 · 1840b51 · 1840b51
2 parents 2c7b25c + 5c5429d
commit 1840b51
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 35 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -3,9 +3,11 @@ name: CodeQL
   push:
     branches:
       - master
+      - dev
   pull_request:
     branches:
       - master
+      - dev
   schedule:
     - cron: 1 21 * * 2
   workflow_dispatch: null

diff --git a/LEAF_Request_Portal/admin/index.php b/LEAF_Request_Portal/admin/index.php
@@ -90,6 +90,7 @@ function hasDevConsoleAccess($login, $oc_db)
 $main->assign('logo', '<img src="../images/VA_icon_small.png" alt="VA seal, U.S. Department of Veterans Affairs" />');
 
 $t_login->assign('name', $login->getName());
+$main->assign('display_name', $login->getName());
 
 $qrcodeURL = "https://" . HTTP_HOST . $_SERVER['REQUEST_URI'];
 $main->assign('qrcodeURL', urlencode($qrcodeURL));

diff --git a/LEAF_Request_Portal/admin/templates/main.tpl b/LEAF_Request_Portal/admin/templates/main.tpl
@@ -65,7 +65,7 @@
     {/if}
 
     <header id="header" class="usa-header site-header">
-        <div class="usa-navbar site-header-navbar">
+        <div class="usa-navbar site-header-navbar" style="position:relative;">
             <div class="usa-logo site-logo" id="logo">
                 <em class="usa-logo__text">
                     <a tabindex="0" onclick="window.location='./'" title="Admin Home" class="leaf-cursor-pointer">
@@ -78,6 +78,9 @@
                     <div><img class="print nodisplay" style="width: 72px" src="{$abs_portal_path}/qrcode/?encode={$qrcodeURL}" alt="QR code" /></div>
                 {/if}
             </div>
+            <div style="position:absolute;right:0;top:0;padding:0 0.75rem;font-size:14px;">
+                Welcome, <b>{$display_name|sanitize}</b>! | <a href="../?a=logout" style="color:#00bde3">Sign out</a>
+            </div>
             <div class="leaf-header-right">
                 {$emergency}<!--{$login}-->
                 <nav aria-label="main menu" id="nav">{$menu}</nav>

diff --git a/LEAF_Request_Portal/admin/templates/menu.tpl b/LEAF_Request_Portal/admin/templates/menu.tpl
@@ -98,16 +98,6 @@
 
     </li>
 
-    <li class="leaf-width-4rem leaf-mob-menu lev2">
-        <a href="javascript:void(0);" aria-label="user account menu" aria-expanded="false" role="button"
-            aria-controls="user_account_menu"><i class='fas fa-user-circle leaf-usericon'></i></a>
-        <ul class="leaf-usernavmenu" id="user_account_menu">
-            <li tabindex="0" style="padding-left:0.4rem;">User:<br/><span class="leaf-user-menu-name">{$name}</span></li>
-            <li tabindex="0" style="padding-left:0.4rem;">Primary Admin:<br/><span id="primary-admin" class="leaf-user-menu-name"></span></li>
-            <li><a href="../?a=logout">Sign Out</a></li>
-        </ul>
-    </li>
-
 </ul>
 
 <script>
@@ -221,26 +211,3 @@ $('li:has(ul)').on('mouseover click mouseleave focusout', function(e) {
 
 });
 </script>
-
-<script type="text/javascript">
-    $.ajax({
-        url: "../api/system/primaryadmin",
-        dataType: "json",
-        success: function(response) {
-            const emailString = response['Email'] != '' ? ' - <br><a href="mailto:' + response['Email'] + '" style="padding:0">' + response['Email'] + '</a>' : '';
-            if(response["Fname"] !== undefined)
-            {
-                $('#primary-admin').html(response['Fname'] + " " + response['Lname'] + emailString);
-            }
-            else if(response["userName"] !== undefined)
-            {
-                $('#primary-admin').html(response['userName']);
-            }
-            else
-            {
-                $('#primary-admin').html('Not Set');
-            }
-
-        }
-    });
-</script>
diff --git a/LEAF_Request_Portal/templates/reports/LEAF_Data_Visualizer.tpl b/LEAF_Request_Portal/templates/reports/LEAF_Data_Visualizer.tpl
@@ -621,7 +621,7 @@ async function getDataBuildCharts(categoryID, customSearch) {
                     activeFilters += `<li>${param.id} ${param.operator} ${param.match}</li>`;
                 }
                 else {
-                    query.addDataTerm(param.indicatorID, param.id, param.operator, param.match);
+                    query.addDataTerm(param.id, param.indicatorID, param.operator, param.match);
 					activeFilters += `<li>${param.id}${param.indicatorID} ${param.operator} ${param.match}</li>`;
                 }
             }