From 7324e4ef99ef393bb8cc7b36bdf02669a98125f4 Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Fri, 7 Apr 2017 00:13:14 -0400 Subject: [PATCH] OK, I lied. THIS is ready for beta. --- WebContent/html/webpages/ticketAdminRedirect.jsp | 2 +- src/database/TicketQueries.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WebContent/html/webpages/ticketAdminRedirect.jsp b/WebContent/html/webpages/ticketAdminRedirect.jsp index 37cb521..caf87c7 100644 --- a/WebContent/html/webpages/ticketAdminRedirect.jsp +++ b/WebContent/html/webpages/ticketAdminRedirect.jsp @@ -38,7 +38,7 @@ int locationid = Integer.parseInt(locationidstr); //add form was submitted if(request.getParameter("approve") != null){ - TicketQueries.acceptTicket(ticketid,deviceid,locationid); + TicketQueries.acceptTicket(ticketid,deviceid,locationid,navsso); } //modify form was submitted if(request.getParameter("reject") != null){ diff --git a/src/database/TicketQueries.java b/src/database/TicketQueries.java index ce71bbf..ca8eff3 100644 --- a/src/database/TicketQueries.java +++ b/src/database/TicketQueries.java @@ -55,13 +55,13 @@ public Ticket[] getTickets() throws SQLException, ClassNotFoundException{ return tickets; } - public static void acceptTicket(int ticketid, int deviceid, int locationid) throws SQLException, ClassNotFoundException{ + public static void acceptTicket(int ticketid, int deviceid, int locationid, int sso) throws SQLException, ClassNotFoundException{ System.getenv("VCAP_SERVICES"); Class.forName("com.mysql.jdbc.Driver"); Connection connect = DriverManager.getConnection("jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317", "b372dfe7409692", "74f6e317"); Statement stmt = connect.createStatement(); stmt.executeUpdate("UPDATE ticket SET Status = \"Approved\" WHERE Ticket_ID = " + ticketid); - stmt.executeUpdate("UPDATE devices SET Ticket_ID = " + ticketid + ", Status = \"Shipped\", Renter = 10, Location = " + locationid + " WHERE Device_ID = " + deviceid); + stmt.executeUpdate("UPDATE devices SET Ticket_ID = " + ticketid + ", Status = \"Shipped\", Renter = " + sso + ", Location = " + locationid + " WHERE Device_ID = " + deviceid); stmt.close(); connect.close(); }