Quick fix

arc12012 · Apr 7, 2017 · 86a6a38 · 86a6a38
1 parent b56d511
commit 86a6a38
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/WebContent/html/webpages/ticketAdminRedirect.jsp b/WebContent/html/webpages/ticketAdminRedirect.jsp
@@ -20,7 +20,7 @@
   <link rel = "stylesheet" type = "text/css" href = "../css/stylesheet.css">
   <link rel = "shortcut icon" href = "../imgs/synchrony-financial-logo-dlpx_1.ico">
   <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-    <%@ include file="navbar.html"%>
+    <%@ include file="navbar.jsp"%>
   </nav>
 </head>
 <body>

diff --git a/src/database/EmployeeQueries.java b/src/database/EmployeeQueries.java
@@ -68,7 +68,7 @@ public static User[] getAllUsers() throws SQLException, ClassNotFoundException{
 
 		//iterate result set
 		while(resultSet.next()){
-			users[counter] = new User(resultSet.getInt("Employee_ID"),resultSet.getInt("Location_ID"),resultSet.getString("Name"),resultSet.getString("Phone_Number"));
+			users[counter] = new User(resultSet.getInt("Employee_ID"),resultSet.getInt("Location_ID"),resultSet.getString("Name"),resultSet.getString("Phone_Number"),resultSet.getString("Email"),resultSet.getInt("Img_Index"));
 			counter++;
 		}