Merge branch 'master' of https://github.uconn.edu/arc12012/2017-CSE-S…

…enior-Project-Team-2
arc12012 · Apr 26, 2017 · 6e8b329 · 6e8b329
2 parents faf025c + 8dceff1
commit 6e8b329
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/WebContent/html/webpages/administration/adminApprove.jsp b/WebContent/html/webpages/administration/adminApprove.jsp
@@ -170,6 +170,8 @@ String ticketStr = Ticket.arrayToString(tickets);
 	  $("#permField").val(ticks[id].permanent);
 	  $("#Modal").show();
   }});
+  
+  $(".no-records-found").html("<td colspan='7'>No tickets found!</td>");
 
   /*
   	Params: tickets - array of objects, formatted as tickets.

diff --git a/src/database/TicketQueries.java b/src/database/TicketQueries.java
@@ -359,8 +359,8 @@ public class TicketQueries {
 									results.getLong("Status_Date_Fields"),
 									results.getString("Return_Date"),
 									results.getString("username"),
-									results.getString("locationname"),
 									results.getString("Device_Name"),
+									results.getString("locationname"),
 									results.getInt("Permanent_Order")
 									);
 			i++;