From 8dceff17bb9e45ae4b8ebabd1acd5d9c1f51fe4d Mon Sep 17 00:00:00 2001
From: Connor L Jackson <connor.jackson@uconn.edu>
Date: Tue, 25 Apr 2017 15:42:27 -0400
Subject: [PATCH] Ticket bugs fixed

---
 WebContent/html/webpages/administration/adminApprove.jsp | 2 ++
 src/database/TicketQueries.java                          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WebContent/html/webpages/administration/adminApprove.jsp b/WebContent/html/webpages/administration/adminApprove.jsp
index d6a304e..82bf183 100644
--- 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
index 389b0ad..00db01b 100644
--- 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++;