Skip to content

Commit

Permalink
LEAF 4047 get rc updates and resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
aerinkayne committed Feb 1, 2024
2 parents 64a2f56 + 8dae01b commit 4e1d6e7
Show file tree
Hide file tree
Showing 155 changed files with 3,039 additions and 3,688 deletions.
2 changes: 1 addition & 1 deletion LEAF_Nexus/admin/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
$action = isset($_GET['a']) ? $_GET['a'] : '';

// HQ logo
$main->assign('logo', '<img src="../images/VA_icon_small.png" style="width: 80px" alt="VA logo" />');
$main->assign('logo', '<img src="../images/VA_icon_small.png" style="width: 80px" alt="VA logo and Seal, U.S. Department of Veterans Affairs" />');
$main->assign('app_js_path', APP_JS_PATH);
$main->assign('app_css_path', APP_CSS_PATH);

Expand Down
2 changes: 1 addition & 1 deletion LEAF_Nexus/admin/templates/admin_refresh_directory.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div style="width: 99%;margin: 12px">
<div id="info_refresh_container">
<img id="info_refresh_icon"src="../dynicons/?img=emblem-notice.svg&w=64" style="float:left;margin-right: 12px"/>
<img id="info_refresh_icon"src="../dynicons/?img=emblem-notice.svg&w=64" style="float:left;margin-right: 12px" alt="" />
<span id="info_refresh_message" style="font-size: 18px; font-weight: bold">The system is updating employees in the background. <br />Please feel free to navigate away from this page.<br />Individual employee information can be updated by searching for their name, and clicking on &quot;Refresh Employee&quot;.</span>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions LEAF_Nexus/admin/templates/admin_update_database.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<div id="editdialog1" style="visibility: hidden">
<div>
<div id="editxhr" style="width: 500px; height: 400px; overflow: auto">
<div style="position: absolute; left: 10px"><button id="button_cancelchange"><img src="../dynicons/?img=process-stop.svg&amp;w=16" alt="cancel" /> Cancel</button></div>
<div style="border-bottom: 2px solid black; text-align: right"><br /><br />&nbsp;<!--<button id="button_save"><img src="../dynicons/?img=list-add.svg&amp;w=16" alt="save" /> Add user</button>--></div><br />
<span>Search: </span><input id="query" type="text" /><div id="loadIndicator" style="visibility: hidden; float: right"><img src="../images/indicator.gif" alt="loading..." /></div>
<div style="position: absolute; left: 10px"><button id="button_cancelchange"><img src="../dynicons/?img=process-stop.svg&amp;w=16" alt="" /> Cancel</button></div>
<div style="border-bottom: 2px solid black; text-align: right"><br /><br />&nbsp;<!--<button id="button_save"><img src="../dynicons/?img=list-add.svg&amp;w=16" alt="" /> Add user</button>--></div><br />
<label for="query">Search: </label><input id="query" type="text" /><div id="loadIndicator" style="visibility: hidden; float: right"><img src="../images/indicator.gif" alt="loading..." /></div>
<br /><div id="results"></div>
</div>
</div>
Expand All @@ -22,7 +22,7 @@
/* <![CDATA[ */
$(function() {
$('#groupList').html('<div style="border: 2px solid black; text-align: center; font-size: 24px; font-weight: bold; background: white; padding: 16px; width: 95%">Loading... <img src="../images/largespinner.gif" alt="loading..." /></div>');
$('#groupList').html('<div style="border: 2px solid black; text-align: center; font-size: 24px; font-weight: bold; background: white; padding: 16px; width: 95%">Loading... <img src="../images/largespinner.gif" alt="" /></div>');
$.ajax({
url: "../scripts/updateDatabase.php",
Expand Down
4 changes: 2 additions & 2 deletions LEAF_Nexus/admin/templates/main.tpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<script>
if(navigator.userAgent.indexOf("Trident") != -1) {
Expand Down Expand Up @@ -54,7 +54,7 @@
</span>
<span id="headerLogin"></span>
<span id="headerTab">{$emergency}{$tabText}</span>
<span id="headerTabImg"><img src="../images/tab.png" alt="tab" /></span>
<span id="headerTabImg"><img src="../images/tab.png" alt="" /></span>
<span id="headerMenu">{$menu}</span>
</div>
<div id="body">
Expand Down
6 changes: 3 additions & 3 deletions LEAF_Nexus/admin/templates/menu.tpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<a href="../" class="buttonNorm"><img src="../dynicons/?img=go-home.svg&amp;w=16" alt="Main Page" title="Main Page" />Main Page</a>
<a href="../" class="buttonNorm"><img src="../dynicons/?img=go-home.svg&amp;w=16" alt="" title="Main Page" />Main Page</a>
<div id="headerMenuHelp_container" style="display: inline-block">
<a id="button_showHelp" tabindex="0" class="buttonNorm" alt="Help Popup" title="Help" aria-haspopup="true" aria-expanded="false" role="button"><img style="vertical-align: sub;" src="../dynicons/?img=help-browser.svg&amp;w=16">&nbsp;Help</a>
<a id="button_showHelp" tabindex="0" class="buttonNorm" title="Help" aria-haspopup="true" aria-expanded="false" role="button"><img style="vertical-align: sub;" src="../dynicons/?img=help-browser.svg&amp;w=16" alt="" />&nbsp;Help</a>
<div id="headerMenu_help" tabindex="0">
For Help contact your primary admin:
<div id="help-primary-admin" style="font-weight:bold;">
Expand Down Expand Up @@ -32,7 +32,7 @@
</div>
</div>
{if isset($isAdmin)}
<a href="./" class="buttonNorm"><img src="../dynicons/?img=applications-system.svg&amp;w=16" alt="Admin Panel" title="Admin Panel" />OC Admin Panel</a>
<a href="./" class="buttonNorm"><img src="../dynicons/?img=applications-system.svg&amp;w=16" alt="" title="Admin Panel" />OC Admin Panel</a>
{/if}
<br />
<noscript class="alert"><span>Javascript must be enabled for this version of software to work!</span></noscript>
11 changes: 5 additions & 6 deletions LEAF_Nexus/admin/templates/mod_templates_reports.tpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div id="fileBrowser" style="float: left; width: 200px; margin: 4px">
<button class="buttonNorm" onclick="newReport();" style="float: left; width: 200px; margin: 4px;"><img src="../dynicons/?img=document-new.svg&w=32" alt="New File" /> New File</button><br />
<button class="buttonNorm" onclick="newReport();" style="float: left; width: 200px; margin: 4px;"><img src="../dynicons/?img=document-new.svg&w=32" alt="" /> New File</button><br />
<b>Files:</b>
<div id="fileList"></div>
</div>
Expand All @@ -10,10 +10,10 @@
</div>
</div>
<div id="controls" style="float: right; width: 170px; visibility: hidden">
<div id="saveButton" class="buttonNorm" onclick="save();"><img id="saveIndicator" src="../dynicons/?img=media-floppy.svg&w=32" alt="Save" /> Save Changes</div><br /><br /><br />
<div class="buttonNorm" onclick="runReport();"><img id="saveIndicator" src="../dynicons/?img=x-office-spreadsheet.svg&w=32" alt="Open Report" /> Open Report</div>
<div id="saveButton" class="buttonNorm" onclick="save();"><img id="saveIndicator" src="../dynicons/?img=media-floppy.svg&w=32" alt="" /> Save Changes</div><br /><br /><br />
<div class="buttonNorm" onclick="runReport();"><img id="saveIndicator" src="../dynicons/?img=x-office-spreadsheet.svg&w=32" alt="" /> Open Report</div>
<br /><br /><br /><br /><br /><br />
<div id="deleteButton" class="buttonNorm" onclick="deleteReport();"><img src="../dynicons/?img=process-stop.svg&w=32" alt="Delete Report" /> Delete Report</div>
<div id="deleteButton" class="buttonNorm" onclick="deleteReport();"><img src="../dynicons/?img=process-stop.svg&w=32" alt="" /> Delete Report</div>
</div>

<!--{include file="site_elements/generic_xhrDialog.tpl"}-->
Expand All @@ -40,10 +40,9 @@ function save() {
function newReport() {
dialog.setTitle('New File');
dialog.setContent('Filename: <input type="text" id="newFilename"></input>');
dialog.setContent('<label for="newFilename">Filename: </label><input type="text" id="newFilename" />');
dialog.setSaveHandler(function() {
console.log($('#newFile').val());
var file = $('#newFilename').val();
$.ajax({
type: 'POST',
Expand Down
4 changes: 2 additions & 2 deletions LEAF_Nexus/admin/templates/orgChart_import.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -583,13 +583,13 @@
<div class="grid-row">
<div class="grid-col-12">
<h2>Step 1: Select Spreadsheet for Import</h2>
<h2><label for="import-fileInput">Step 1: Select Spreadsheet for Import</label></h2>
<p>Select a file to import and click Continue. The first row of the spreadsheet must contain the headers of the columns.</p>
<div>
<span class="usa-error-message leaf-content-hide" id="input-error-message1" role="alert">No file selected, select a file to continue.</span>
</div>
<div class="leaf-grey-box leaf-width50pct">
<input type="file" id="import-fileInput" accept=".xlsx">
<input type="file" id="import-fileInput" accept=".xlsx"/>
</div>
</div>
</div>
Expand Down
24 changes: 12 additions & 12 deletions LEAF_Nexus/admin/templates/setup_medical_center.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function createDirectorGroup() {
dialog.setTitle('Create Group for Leadership Team');
dialog.setContent('<table>\
<tr>\
<td>Name of Service: </td>\
<td><label for="serviceName">Name of Service: </label></td>\
<td><input id="serviceName" type="text" value="Office of the Director" /></td>\
</tr>\
</table>');
Expand Down Expand Up @@ -163,17 +163,17 @@ function createGroup() {
dialog.setTitle('Create Group for Leadership Team');
dialog.setContent('<table>\
<tr>\
<td>Name of Service: </td>\
<td><label for="serviceName">Name of Service: </label></td>\
<td><input id="serviceName" type="text" /> eg: "Office of the Chief of Staff"</td>\
</tr>\
<tr>\
<td>Position Title: </td>\
<td><label for="positionTitle">Position Title: </label></td>\
<td><input id="positionTitle" type="text" /> eg: "Chief of Staff"</td>\
</tr>\
<tr>\
<td>Employee: </td>\
<td><label for="employee">Employee: </label></td>\
<td><div id="employee"></div>\
<br /><input id="isActing" type="checkbox"> Acting for vacant position\
<br /><input id="isActing" type="checkbox" /><label for="isActing">Acting for vacant position</label>\
</td>\
</tr>\
</table>');
Expand Down Expand Up @@ -286,7 +286,7 @@ function setupLeadership() {
$('.step').removeClass('buttonNormSelected');
$('#menu_leadership').addClass('buttonNormSelected');
$('#setupContainer').html('<div id="leaderHeader"><div class="buttonNorm" onclick="createGroup();" style="float: right; width: 150px; font-size: 120%"><img src="../dynicons/?img=list-add.svg&w=32" alt="Create Group" /> Create <span id="leadershipNomenclature" style="font-size: 14px">Group</span></div><br style="clear: both" /></div>\
$('#setupContainer').html('<div id="leaderHeader"><div class="buttonNorm" onclick="createGroup();" style="float: right; width: 150px; font-size: 120%"><img src="../dynicons/?img=list-add.svg&w=32" alt="" /> Create <span id="leadershipNomenclature" style="font-size: 14px">Group</span></div><br style="clear: both" /></div>\
<div id="leaders"></div>');
var leadershipNomenclature = '';
Expand Down Expand Up @@ -365,17 +365,17 @@ function createService(parentGroupID) {
dialog.setTitle('Create Service');
dialog.setContent('<table>\
<tr>\
<td>Name of Service: </td>\
<td><label for="serviceName">Name of Service: </label></td>\
<td><input id="serviceName" type="text" /> eg: "Fiscal Service"</td>\
</tr>\
<tr>\
<td>Position Title: </td>\
<td><label for="positionTitle">Position Title: </label></td>\
<td><input id="positionTitle" type="text" /> eg: "Chief, Fiscal Service"</td>\
</tr>\
<tr>\
<td>Employee: </td>\
<td><label for="employee">Employee: </label></td>\
<td><div id="employee"></div>\
<br /><input id="isActing" type="checkbox"> Acting for vacant position</div>\
<br /><input id="isActing" type="checkbox"/><label for="isActing">Acting for vacant position</label></div>\
</td>\
</tr>\
</table>');
Expand Down Expand Up @@ -520,9 +520,9 @@ function setupServices() {
leadershipNomenclature = leadershipName;
var buffer = '<ul style="font-size: 140%">';
for(var i in res) {
buffer += '<li>'+ res[i].groupTitle +'<ul id="group_'+ res[i].groupID +'">\
buffer += '<li>'+ res[i].groupTitle +'<ul id="group_'+ res[i].groupID +'" style="margin-bottom: 1rem;">\
<li style="padding: 8px"><span class="buttonNorm" onclick="createService('+ res[i].groupID +');">Add Service</span></li>\
</ul></li><br />';
</ul></li>';
}
buffer += '</ul>';
$('#leaders').html(buffer);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div id="confirm_xhrDialog" style="visibility: hidden">
<form id="confirm_record" enctype="multipart/form-data" action="javascript:void(0);">
<div style="background-color: #feffd1; border: 1px solid black">
<div id="confirm_loadIndicator" style="visibility: hidden; position: absolute; text-align: center; font-size: 24px; font-weight: bold; background: white; padding: 16px; height: 100px; width: 360px">Loading... <img src="../images/largespinner.gif" alt="loading..." title="loading..." /></div>
<div id="confirm_loadIndicator" style="visibility: hidden; position: absolute; text-align: center; font-size: 24px; font-weight: bold; background: white; padding: 16px; height: 100px; width: 360px">Loading... <img src="../images/largespinner.gif" alt="" title="loading..." /></div>
<div id="confirm_xhr" style="width: 400px; height: 120px; padding: 16px; overflow: auto"></div>
<div style="position: absolute; left: 10px; font-size: 140%"><button class="buttonNorm" id="confirm_button_cancelchange"><img src="../dynicons/?img=edit-undo.svg&amp;w=32" alt="No" title="No" /> No</button></div>
<div style="text-align: right; padding-right: 6px"><button class="buttonNorm" id="confirm_button_save"><img src="../dynicons/?img=media-floppy.svg&amp;w=32" alt="Yes" title="Yes" /><span id="confirm_saveBtnText"> Yes</span></button></div><br />
<div style="position: absolute; left: 10px; font-size: 140%"><button class="buttonNorm" id="confirm_button_cancelchange"><img src="../dynicons/?img=edit-undo.svg&amp;w=32" alt="" title="No" /> No</button></div>
<div style="text-align: right; padding-right: 6px"><button class="buttonNorm" id="confirm_button_save"><img src="../dynicons/?img=media-floppy.svg&amp;w=32" alt="" title="Yes" /><span id="confirm_saveBtnText"> Yes</span></button></div><br />
</div>
</form>
</div>
20 changes: 10 additions & 10 deletions LEAF_Nexus/admin/templates/view_admin.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@

<a href="../?a=browse_group" tabindex="-1">
<span class="menuButton" style="background-color: #cb9ed7" tabindex="0">
<img class="menuIcon" src="../dynicons/?img=preferences-desktop-theme.svg&amp;w=96" style="position: relative" alt="Group Search" title="Group Search" />
<span class="menuText">Groups</span><br />
<img class="menuIcon" src="../dynicons/?img=preferences-desktop-theme.svg&amp;w=96" style="position: relative" alt="" />
<span class="menuText">Search Groups</span><br />
<span class="menuDesc">View groups such as services, sub-sections, etc.</span>
</span>
</a>

<a href="?a=admin_refresh_directory" tabindex="-1">
<span class="menuButton" style="background-color: #ffefa5" tabindex="0">
<img class="menuIcon" src="../dynicons/?img=system-software-update.svg&amp;w=96" style="position: relative" alt="Directory Update" title="Directory Update" />
<img class="menuIcon" src="../dynicons/?img=system-software-update.svg&amp;w=96" style="position: relative" alt="" />
<span class="menuText">Refresh Directory</span><br />
<span class="menuDesc">Update account list from Active Directory</span>
</span>
</a>

<a href="?a=setup_medical_center" tabindex="-1">
<span class="menuButton" style="background-color: #c6ffbe" tabindex="0">
<img class="menuIcon" src="../dynicons/?img=preferences-system.svg&amp;w=96" style="position: relative" alt="Bookmarks" title="Bookmarks" />
<img class="menuIcon" src="../dynicons/?img=preferences-system.svg&amp;w=96" style="position: relative" alt="" />
<span class="menuText">Setup Wizard</span><br />
<span class="menuDesc">Initial setup for VA Medical Centers</span>
</span>
</a>

<a href="?a=mod_templates_reports" tabindex="-1">
<span class="menuButton" style="background-color: black" tabindex="0">
<img class="menuIcon" src="../dynicons/?img=utilities-terminal.svg&amp;w=76" style="position: relative" alt="Bookmarks" title="Bookmarks" />
<img class="menuIcon" src="../dynicons/?img=utilities-terminal.svg&amp;w=76" style="position: relative" alt="" />
<span class="menuText" style="color: white">Report Programmer</span><br />
<span class="menuDesc" style="color: white">Advanced Reports and Custom Pages</span>
</span>
Expand All @@ -46,31 +46,31 @@ Programmer Options:<br />

<a href="../?a=browse_search" tabindex="-1">
<span class="menuButtonSmall" style="background-color: #414141" tabindex="0">
<img class="menuIconSmall" src="../dynicons/?img=system-search.svg&amp;w=72" style="position: relative" alt="Search" title="Search" />
<img class="menuIconSmall" src="../dynicons/?img=system-search.svg&amp;w=72" style="position: relative" alt="" />
<span class="menuTextSmall" style="color: white">Search</span><br />
<span class="menuDescSmall" style="color: white">All-in-one search</span>
</span>
</a>

<a href="#" onclick="newEmployee()" tabindex="-1">
<span class="menuButtonSmall" style="background-color: #414141" tabindex="0">
<img class="menuIconSmall" src="../dynicons/?img=list-add.svg&amp;w=72" style="position: relative" alt="Search" title="Search" />
<img class="menuIconSmall" src="../dynicons/?img=list-add.svg&amp;w=72" style="position: relative" alt="" />
<span class="menuTextSmall" style="color: white">Import Employee</span><br />
<span class="menuDescSmall" style="color: white">Old tool to import employees into the database</span>
</span>
</a>

<a href="?a=import_employees_from_spreadsheet" tabindex="-1">
<span class="menuButtonSmall" style="background-color: black" tabindex="0">
<img class="menuIconSmall" src="../dynicons/?img=list-add.svg&amp;w=72" style="position: relative" alt="Bookmarks" title="Bookmarks" />
<img class="menuIconSmall" src="../dynicons/?img=list-add.svg&amp;w=72" style="position: relative" alt="" />
<span class="menuTextSmall" style="color: white">Spreadsheet Import</span><br />
<span class="menuDescSmall" style="color: white">Batch add employees from spreadsheet</span>
</span>
</a>

<a href="?a=mod_system" tabindex="-1">
<span class="menuButtonSmall" style="background-color: black" tabindex="0">
<img class="menuIconSmall" src="../dynicons/?img=preferences-desktop.svg&amp;w=72" style="position: relative" alt="Bookmarks" title="Bookmarks" />
<img class="menuIconSmall" src="../dynicons/?img=preferences-desktop.svg&amp;w=72" style="position: relative" alt="" />
<span class="menuTextSmall" style="color: white">Change Site Name</span><br />
<span class="menuDescSmall" style="color: white">Edit site name and other parameters</span>
</span>
Expand All @@ -80,7 +80,7 @@ Programmer Options:<br />

<a href="?a=admin_update_database" tabindex="-1">
<span class="menuButton" style="background-color: #ffefa5" tabindex="0">
<img class="menuIcon" src="../dynicons/?img=application-x-executable.svg&amp;w=96" style="position: relative" alt="Database Update" title="Database Update" />
<img class="menuIcon" src="../dynicons/?img=application-x-executable.svg&amp;w=96" style="position: relative" alt="" />
<span class="menuText">Update Database</span><br />
<span class="menuDesc">Updates the system database, if available</span>
</span>
Expand Down
Loading

0 comments on commit 4e1d6e7

Please sign in to comment.