From 84490751214b665500ce427193719b266b0e33a2 Mon Sep 17 00:00:00 2001 From: Brianna Date: Thu, 6 Apr 2017 00:56:28 -0400 Subject: [PATCH] Accept Tickets -- tickets still need to be viewable --- WebContent/html/webpages/admin.jsp | 2 +- WebContent/html/webpages/adminApprove.jsp | 35 +++++++---- WebContent/html/webpages/approve.jsp | 17 ++++++ WebContent/html/webpages/navbar.html | 2 +- src/database/TicketQueries.java | 30 +++++++++- src/entities/Ticket.java | 73 +++++++++++++++++++++++ 6 files changed, 144 insertions(+), 15 deletions(-) create mode 100644 WebContent/html/webpages/approve.jsp create mode 100644 src/entities/Ticket.java diff --git a/WebContent/html/webpages/admin.jsp b/WebContent/html/webpages/admin.jsp index d3992f8..afdf899 100644 --- a/WebContent/html/webpages/admin.jsp +++ b/WebContent/html/webpages/admin.jsp @@ -73,7 +73,7 @@ div.approveConfirm {
diff --git a/WebContent/html/webpages/adminApprove.jsp b/WebContent/html/webpages/adminApprove.jsp index 3efebf8..b3b6362 100644 --- a/WebContent/html/webpages/adminApprove.jsp +++ b/WebContent/html/webpages/adminApprove.jsp @@ -1,3 +1,7 @@ +<%@ page import = "database.TicketQueries" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + @@ -22,27 +26,22 @@ background-color: #E9EAEB; display: inline-block; } - div.imgContainer{ display: inline-block; text-align: center; } - img.device{ display: block; } - div.deviceDescp{ display: inline-block; width: 200px; text-align: center; } - button.approvebutton{ display: block; margin: auto; } - div.approveConfirm{ display: none; top: 50%; @@ -57,7 +56,6 @@ border-color: #3B3C43; border-radius: 5px; } - div.displayDevice{ left: 0px; } @@ -66,18 +64,31 @@

Admin View Approvals

-
+
+ + + + + + + + + + + + + <%TicketQueries tickets = new TicketQueries(); + tickets.getTickets(); %> + + + -
-

Approved!

-
- + \ No newline at end of file diff --git a/WebContent/html/webpages/approve.jsp b/WebContent/html/webpages/approve.jsp new file mode 100644 index 0000000..cbdc670 --- /dev/null +++ b/WebContent/html/webpages/approve.jsp @@ -0,0 +1,17 @@ +<%@ page import = "database.*" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ page import = "java.sql.*" %> +<% +MySQLAccess myaccess = new MySQLAccess(); +Statement statement = myaccess.getStatement(); +ResultSet result = statement.executeQuery("select * FROM ticket where Status='Requested'"); +if (result.next()){ + statement.executeQuery("UPDATE ticket SET Status='Approved'"); //is this the right status we wanted?? + myaccess.closeConnection(); + response.sendRedirect("html/webpages/adminApprove.jsp"); +} else { + myaccess.closeConnection(); + response.sendRedirect("adminApprove.jsp"); +} +%> \ No newline at end of file diff --git a/WebContent/html/webpages/navbar.html b/WebContent/html/webpages/navbar.html index 578a279..5b76006 100644 --- a/WebContent/html/webpages/navbar.html +++ b/WebContent/html/webpages/navbar.html @@ -6,7 +6,7 @@ - + diff --git a/src/database/TicketQueries.java b/src/database/TicketQueries.java index a851de0..92f148c 100644 --- a/src/database/TicketQueries.java +++ b/src/database/TicketQueries.java @@ -2,6 +2,7 @@ import java.sql.*; import java.util.Date; +import entities.Ticket; public class TicketQueries { @@ -27,4 +28,31 @@ public static void generateTicket(int requester, int location, int device, Strin statement.executeUpdate(query); access.closeConnection(); } -} \ No newline at end of file + + //get all tickets + public Ticket[] getTickets() throws SQLException, ClassNotFoundException{ + String status = "Requested"; + int i = 0; + MySQLAccess myaccess = new MySQLAccess(); + Statement statement = myaccess.getStatement(); + ResultSet resultSet = statement.executeQuery("Select COUNT(Ticket_ID) FROM ticket WHERE Status = '" +status + "'"); + resultSet.next(); + Ticket[] tickets = new Ticket[resultSet.getInt("COUNT(Ticket_ID)")]; + resultSet = statement.executeQuery("Select * FROM ticket WHERE Status = '" +status + "'"); + while(resultSet.next()){ + tickets[i] = new Ticket( + resultSet.getInt("Ticket_ID"), + resultSet.getInt("Requestor"), + //resultSet.getInt("Request_Date"), + resultSet.getInt("Location"), + resultSet.getInt("Device_ID"), + status, + resultSet.getString("Return_Date") + ); + i++; + } + myaccess.closeConnection(); + return tickets; + } +} + diff --git a/src/entities/Ticket.java b/src/entities/Ticket.java new file mode 100644 index 0000000..a25450c --- /dev/null +++ b/src/entities/Ticket.java @@ -0,0 +1,73 @@ +package entities; + +import java.math.BigInteger; + +//class for tickets +public class Ticket { + private int _id; + private int _requestor; + //private BigInteger _requestDate; + private int _location; + private int _deviceId; + private String _status; + private String _returnDate; + + public Ticket(int id, int requestor, int location, int deviceId, String status, String returnDate){ + this._id = id; + this._requestor = requestor; + //this._requestDate = requestDate; + this._location = location; + this._deviceId = deviceId; + this._status = status; + this._returnDate = returnDate; + } + + public int getId(){ + return _id; + } + public void setId(int id){ + this._id = id; + } + + public int getRequestor(){ + return _requestor; + } + public void setRequestor(int requestor){ + this._requestor = requestor; + } + + /*public BigInteger getRequestDate(){ + return _requestDate; + } + public void setRequestDate(BigInteger requestDate){ + this._requestDate = requestDate; + }*/ + + public int getLocation(){ + return _location; + } + public void setLocation(int location){ + this._location = location; + } + + public int getDeviceId(){ + return _deviceId; + } + public void setDeviceId(int deviceId){ + this._deviceId = deviceId; + } + + public String getStatus(){ + return _status; + } + public void setStatus(String status){ + this._status = status; + } + + public String getReturnDate(){ + return _returnDate; + } + public void setReturnDate(String returnDate){ + this._returnDate = returnDate; + } +}
IdRequestorLocationDevice IDStatusReturn Date