From a8fac9ccd8b1b51619290bf9fe1447796c6d08d3 Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Sun, 23 Apr 2017 14:34:10 -0400 Subject: [PATCH] All Tickets Page Added --- WebContent/html/imgs/cat.png | Bin 6844 -> 0 bytes WebContent/html/imgs/cat_admin.png | Bin 11294 -> 0 bytes WebContent/html/imgs/potato.png | Bin 12331 -> 0 bytes WebContent/html/imgs/synchrony logo.png | Bin 0 -> 3431 bytes WebContent/html/imgs/user_icon.png | Bin 5021 -> 0 bytes WebContent/html/javascript/request.jsp | 2 +- .../webpages/administration/adminApprove.jsp | 334 ++++++++++-------- .../administration/adminpasswordsetting.jsp | 2 +- .../adminpasswordsettingtryagain.jsp | 2 +- .../webpages/administration/allTickets.jsp | 256 ++++++++++++++ .../html/webpages/components/adminnavbar.jsp | 4 +- .../html/webpages/components/adminsidebar.jsp | 3 +- .../html/webpages/components/navbar.jsp | 4 +- WebContent/html/webpages/returnComplete.jsp | 2 +- WebContent/passwordreset.jsp | 17 +- src/database/AdminQueries.java | 13 +- src/database/TicketQueries.java | 112 ++++-- src/utilities/Mail.java | 6 - 18 files changed, 539 insertions(+), 218 deletions(-) delete mode 100644 WebContent/html/imgs/cat.png delete mode 100644 WebContent/html/imgs/cat_admin.png delete mode 100644 WebContent/html/imgs/potato.png create mode 100644 WebContent/html/imgs/synchrony logo.png delete mode 100644 WebContent/html/imgs/user_icon.png create mode 100644 WebContent/html/webpages/administration/allTickets.jsp diff --git a/WebContent/html/imgs/cat.png b/WebContent/html/imgs/cat.png deleted file mode 100644 index 23058ae954df6378ee5c16c88420f2ebc8e485ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6844 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 Uw&Vx0#{d8T07*qoM6N<$f^!#ah5!Hn diff --git a/WebContent/html/imgs/potato.png b/WebContent/html/imgs/potato.png deleted file mode 100644 index d98bd688619f88f0279906319784a12db112e063..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12331 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 Jg_Lp7{{YS%L5BbU diff --git a/WebContent/html/imgs/synchrony logo.png b/WebContent/html/imgs/synchrony logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0751a830781f64349151d0e7a08a096dadb64821 GIT binary patch literal 3431 zcmV-t4VdzYP)+f{W?pF1_n%ue})ug(rrt;>Eb0bc~&8j12Y(M*# zKl=Tl|LSkA16w^>EAm z@F6d5e?r&2{=HxS$)Eh~DdYd?KmPGY>xcjPGwSDmxbXjSBauTz>c&At4-8-v?kKs$ zh`y{D%6dD{&A8)e{D)?Y5U&V6=BxXTa`Q3WoB^=-^5>4>OSJk=Zk60H5UfEf(3)h4 zy#x}~N)XuKSmUz7_9GD3KOVg%lPtN{k4gVBTK@{JU!Oew;qK=dtN+Q4&$uoB&C6m? z;=1wdfR%_u*%7(KN~-QiJ%Aq{BWQX}NAMM?R}6f{+PAFNck>1Sz3I}t2=iiC)6paM zzwcSdlz?SaN`eX&?_NKcqB+AK>~DI==RnVIr6me(@q<|(~htiBa)niA-wt9$hjr0(sYR>k@JYN ze9O^~AAqK4HfsRL1v!X>s6Z9e1)_{gMG4Vk*O3%i$Yl!t!^r^HR1mU&a`O1QKD_9{ zOT@B5SD_omr7t=p5!3jssdDkYyM1*0wip=4Eq61o0;(uASkywP<9ghzhe#*_Y9XBj zrb|&W2>VeApb;a7HGnxN89jw&S-Ur%XfKCgiMUB|W6@2RCC3O5o0Ct6)Z4UfJ1Fgq z|7gs|@2wJI9RI8VaMK5o9n0Y*BFQcp${K|TlFo%P1X(mrOq!r>*|gu0C;iBCJD|iA zroZFrJF=3{)k2{VIfAJcO~fxLS&`~4@n{$D<#*?KzcX?gO@w0B0EiltEOf&H$C6rB zJVd1kZYq=tq)0?9o7`P@q5LtHeC&L^RR)ZyBpI3ISvd^C8d<+Z2J`_{WA0z5(mA)z zP9UX`C+v?>N8^82RFY5{MI!mcTIhY@0GkM`LpH4a8d-C=kjK}u@bjPRsDChP0PH$p zbF~5&hG<8#%PstfxHJIf9RYOt`0lg9(8c{fa{#;->06rf_!|JO+!_EbnLcvx-kx*= zz_nEY%NH*L6u1H4I>T@2ge12JaIKAi%MZUrfJOqFUCOf7w{A>p0JtLSAMO)py(9t} z04~Y^sxM6h8UW6wq4Or94FKnw<~{rdfK~-GYXE3=sr(_@{Q!+XGyt5pf|^||08|

I=3tgJXHV$yr>%a8@8VPJu&`4mj zOSwPS*=`FzvkYiq;FZzW?cquek#hp=o2>pJPQ*&^?#1?K%**HhH>oVV1zJ1GU)}y zb2bjN5fN;90cVHM(w#hqHB7IhluBPlsT-x~>WHhP!vRSp4|F0&9pJ5u*jwts`$r$} zWSFqfHJLDy} z+soa1@UnLq{7|;^B;RlJE*&Px_U+)yMvoO%ohkvyDRl>isG~~hrc^r$`__Sm?2ZNa z9d(H(bzKEjH`Hh(@S?W3HRMPFdz*+r;7 z{VOUzY5=$>0DknVTE7`S=+nHZ_gJGU__)cP;5Am=Dt$-ZAPS~p)h8*C9{mmSsdUs0 z$!osqU*g3l4FH$4K_BIy^}m_rKRCNVRTKw9npDMp01abQ$U@W?h(ao{zUgivJsKLM z4s^>9ODG@F{qx`d!SD9#pYdw>CCkN%@ET=8Es#r0hb2C>(g8c{}3@Vhegt&pYrCYfFbFtk9w(!LHOZaFbld`f0$yTPo#WxJOZ0yUd^O)j(CPLYzxAgB@bA;(BG$b~{|>5r z5Ivpl3GN7c>Js;u1tb4Vk{-OCl1xFwq|a=Qdr#VQuXNm$EJO*Uuc@*4r>=Wd=3R-- z`?j?1)v%)If!lhI@(y`5h4UU5z)NsI8NdU$-|I!5(gYbnQ}sDjy6a*&^PhT~w{^}> zc@duy!yQ)7umDR$HC|?+Wq6}Ym=y9R=5jsSC4 z4Ql{s)&MYjYd3{nx%+4S`v8|F@%G@EBcK7`^!O8Hx%j1-|5jn^1fHBarLtJue7Kmk z|7ZTahPdF&f$hwp74p}a0)$=r^~3-5*P4G@6#zcx)^68T--N?vUk0AxK&h3nSKS9_ zt>7yMK(hvbW(@$BX0dHA;K~uuBEVJK%v*sM27oPBH~(MGF1;IQG4EEeXPyJ%!prBp z>3cs~!Hoo7GKDk}(nw&lUjzVJ&-Kay;AcX>_ZPF(p!*yE@WEq}EYwc4)H=_L`d%+Z zkDN^n1n-G3R1k3HwdVW=8alBegV_iWUYub22A_5rM2 zIp!z4mD7EXn|a&LpU#}Svq7NUXKFuw?IG>>g!|*xd8hqhM1ajC>9Gl8N(9NFtofPC zer597WQ~UaGtR`ZBLIp3{nRq zZ!BZcE|_^Mb*@8V=y#Al@BTR00i5}LiLon@Vt0*xtd@>LWO(2CNAKM{|Kw5FI|rT~ zK=w*N>*+p#^=L70@ID_SM~}W{^n6{h_aXwgV6-FV)5VR>5t^Ju=pg0Uni@rq<&EQI zztImLkIy%KoknNG2nO#(B{KrsQ-pTB#dEx;X}+UG$74UxM90JrY743p1*rf9DaI5a z6PQpSbp*mwuGNGTQO3#OvDnKKK-hTbdD3QD(k7*(u!FQHlN8k$syEj)mb1IB66le* zuWuxMQeg521ONqc0gbCj29#*x2BJ*)Q#dBRFiosaCULPBP)}b@K{q~BkUFG+VB#tO zD&T^sQ|6BGIydR!#89;14%#P}a|J-=*yf2ER0Wxk7^;XWA|W?w;T9XcZrg9Qjlcc$ zZCo_2%hO4~=uo>%E4yF{He`BgUySb0&AD@r!knOKBKb4<8e8Pt}?g z4|FA2*hDUomt-bMKT_H4{=li#Y>=^_=L1%Jg5$@nx7cjH_W!}B|3~Wi;qm|g002ov JPDHLkV1o9Re!>6% literal 0 HcmV?d00001 diff --git a/WebContent/html/imgs/user_icon.png b/WebContent/html/imgs/user_icon.png deleted file mode 100644 index feff4b3e7a807c5c92e7d9a3585f2e62f711cedd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5021 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 diff --git a/WebContent/html/javascript/request.jsp b/WebContent/html/javascript/request.jsp index 6e050fe..78a1ce9 100644 --- a/WebContent/html/javascript/request.jsp +++ b/WebContent/html/javascript/request.jsp @@ -41,7 +41,7 @@ function show(deviceArray){ var part1 = "nhpup.popup('"; var part2 = "');" for (var i = 0; i < deviceArray.length; i++) { - html += '

' + deviceArray[i].name + '

' + deviceArray[i].description + '



' + html += '
' + deviceArray[i].name + '

' + deviceArray[i].description + '



' } if(html.localeCompare("")==0) diff --git a/WebContent/html/webpages/administration/adminApprove.jsp b/WebContent/html/webpages/administration/adminApprove.jsp index e08853e..af64ee3 100644 --- a/WebContent/html/webpages/administration/adminApprove.jsp +++ b/WebContent/html/webpages/administration/adminApprove.jsp @@ -14,48 +14,11 @@ pageEncoding="ISO-8859-1"%> Innovation Hub + - + + + + + + + +
+ <%@ include file="../components/adminsidebar.jsp" %> +
+ + +
+

All Tickets

+ +
+ +
+ + + + + + + + + + + + + + +
Ticket IDRequestor NameLocation NameDevice NameStatusPermanent?Return Date
+
+ +<% +/* + Get all tickets. +*/ +Ticket[] tickets = TicketQueries.getAllTickets(); +String ticketStr = Ticket.arrayToString(tickets); +%> + + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/components/adminnavbar.jsp b/WebContent/html/webpages/components/adminnavbar.jsp index e3cde2c..4bfbe33 100644 --- a/WebContent/html/webpages/components/adminnavbar.jsp +++ b/WebContent/html/webpages/components/adminnavbar.jsp @@ -9,7 +9,7 @@ - +

@@ -80,5 +80,5 @@ var name = '<%=navname%>'; document.getElementById('user').innerHTML = "Hi " + name + "!"; if(<%=admin%> == 1) -document.getElementById('adminbar').innerHTML = '' +document.getElementById('adminbar').innerHTML = '' \ No newline at end of file diff --git a/WebContent/html/webpages/components/adminsidebar.jsp b/WebContent/html/webpages/components/adminsidebar.jsp index 42f8a31..537e7f6 100644 --- a/WebContent/html/webpages/components/adminsidebar.jsp +++ b/WebContent/html/webpages/components/adminsidebar.jsp @@ -2,7 +2,8 @@

    Admin Options

    -
  • Ticket Hub
    • +
  • Ticket Approval Hub
    • +
  • All Tickets Hub
  • Device Hub
  • Location Hub
    • diff --git a/WebContent/html/webpages/components/navbar.jsp b/WebContent/html/webpages/components/navbar.jsp index ac1ec25..99c35ac 100644 --- a/WebContent/html/webpages/components/navbar.jsp +++ b/WebContent/html/webpages/components/navbar.jsp @@ -9,7 +9,7 @@ - +

    @@ -74,5 +74,5 @@ var name = '<%=navname%>'; document.getElementById('user').innerHTML = "Hi " + name + "!"; if(<%=admin%> == 1) -document.getElementById('adminbar').innerHTML = '    ' +document.getElementById('adminbar').innerHTML = '' \ No newline at end of file diff --git a/WebContent/html/webpages/returnComplete.jsp b/WebContent/html/webpages/returnComplete.jsp index 30e6408..398daa8 100644 --- a/WebContent/html/webpages/returnComplete.jsp +++ b/WebContent/html/webpages/returnComplete.jsp @@ -29,7 +29,7 @@ pageEncoding="ISO-8859-1"%>

    Thanks for returning some devices!

    You can ship the devices to the following address:

    - Synchrony Financial
    777 Long Ridge Road
    Stamford, CT
    06902 + Synchrony Financial
    ATTN: Jake Miller
    777 Long Ridge Road
    Stamford, CT
    06902
    diff --git a/WebContent/passwordreset.jsp b/WebContent/passwordreset.jsp index 7d43820..0a5ff34 100644 --- a/WebContent/passwordreset.jsp +++ b/WebContent/passwordreset.jsp @@ -1,9 +1,5 @@ -<%@ page import = "database.*,entities.User,utilities.Mail" %> +<%@ page import = "database.*,entities.User,utilities.Mail,java.sql.*,java.security.MessageDigest,java.security.NoSuchAlgorithmException,java.util.Random" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> -<%@ page import = "java.sql.*" %> -<%@ page import = "java.security.MessageDigest" %> -<%@ page import = "java.security.NoSuchAlgorithmException" %> -<%@ page import = "java.util.Random" %> @@ -18,8 +14,8 @@ - + @@ -28,15 +24,12 @@ <% int success=0; -/* - If the user wants to reset their password, we will keep them on this page. -*/ if(request.getParameter("reset") != null){ int ssoNum = Integer.parseInt(request.getParameter("username")); String email = request.getParameter("email"); @@ -130,10 +123,6 @@ if(request.getParameter("reset") != null){ /* At this point, we show the user what happened. */ -if(<%=success%> == 1) - document.getElementById("msg").innerHTML = "Please check your email to get your newly generated password!"; -else - document.getElementById("msg").innerHTML = "Email and SSO Number did not match. Please go back and try again."; document.getElementById("info").style.visibility = 'visible'; document.getElementById("navbaruniversal").style.visibility = 'visible'; diff --git a/src/database/AdminQueries.java b/src/database/AdminQueries.java index 5a3a364..ad0bddc 100644 --- a/src/database/AdminQueries.java +++ b/src/database/AdminQueries.java @@ -2,12 +2,22 @@ import java.sql.*; +/** + * This class is responsible for performing most queries corresponding + * to admin (object) actions. + * @author Connor Jackson + * + */ public class AdminQueries { private static String database = "jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317"; private static String user = "b372dfe7409692"; private static String password = "74f6e317"; + /** + * This function determines if a certain user is an admin. + * @author Connor Jackson + */ public static boolean isAdmin(int id) throws ClassNotFoundException, SQLException, InterruptedException{ System.getenv("VCAP_SERVICES"); Class.forName("com.mysql.jdbc.Driver"); @@ -38,8 +48,7 @@ public static boolean isAdmin(int id) throws ClassNotFoundException, SQLExceptio /** * Checks to see if a pincode is numeric. - * @param pincode - * @return + * @author Connor Jackson */ public static boolean pincodeInt(String pincode){ try{ diff --git a/src/database/TicketQueries.java b/src/database/TicketQueries.java index 65d29d7..85a2701 100644 --- a/src/database/TicketQueries.java +++ b/src/database/TicketQueries.java @@ -3,14 +3,23 @@ import java.sql.*; import java.util.Date; import entities.Ticket; -import entities.User; +/** + * This class is responsible for performing most queries corresponding + * to ticket actions. + * @author Brianna Boyce, Connor Jackson, Adam Claxton + * + */ public class TicketQueries { private static String database = "jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317"; private static String user = "b372dfe7409692"; private static String password = "74f6e317"; + /** + * This function generates a ticket entry in the database. + * @author Brianna Boyce + */ public static int generateTicket(int requester, int location, int device, String returnDate, int perm) throws ClassNotFoundException, SQLException, InterruptedException { @@ -58,8 +67,11 @@ public static int generateTicket(int requester, int location, int device, String return ticketID; } - //get all tickets - public static Ticket[] getTickets() + /** + * This function retrieves all tickets that need to be reviewed by an administrator for approval. + * @author Brianna Boyce + */ + public static Ticket[] getRequestedTickets() throws SQLException, ClassNotFoundException, InterruptedException{ int i = 0; System.getenv("VCAP_SERVICES"); @@ -111,9 +123,14 @@ public static Ticket[] getTickets() connection.close(); return tickets; } - - public static void acceptTicket(int ticketid, int deviceid, int locationid, int sso, int perm) + + /** + * This function retrieves all tickets. Ever. + * @author Connor Jackson + */ + public static Ticket[] getAllTickets() throws SQLException, ClassNotFoundException, InterruptedException{ + int i = 0; System.getenv("VCAP_SERVICES"); Class.forName("com.mysql.jdbc.Driver"); Connection connection; @@ -136,22 +153,40 @@ public static void acceptTicket(int ticketid, int deviceid, int locationid, int Thread.sleep(1); } } - long milliseconds = new java.util.Date().getTime(); - String query = "UPDATE ticket, devices SET ticket.Status = \"Approved\"" - +", ticket.Status_Date_Fields = " + milliseconds - +", devices.Ticket_ID = " + ticketid - +", devices.Status = \"Ready to Ship\", devices.Renter = " + sso - +", devices.Location = " + locationid - +", devices.Permanent = " + perm - +" WHERE ticket.Ticket_ID = " + ticketid + " AND devices.Device_ID = " + deviceid; - System.out.println("Executing query: "+query); - stmt.executeUpdate(query); - + ResultSet resultSet = stmt.executeQuery("SELECT ticket.*, employee.Name AS 'username', devices.Device_Name, location.Name AS 'locationname' FROM ticket INNER JOIN employee ON ticket.Requestor = employee.Employee_ID INNER JOIN devices ON ticket.Device_ID = devices.Device_ID INNER JOIN location ON ticket.Location = location.Location_ID"); + resultSet.last(); + int rows = resultSet.getRow(); + resultSet.beforeFirst(); + Ticket[] tickets = new Ticket[rows]; + + while(resultSet.next()){ + tickets[i] = new Ticket( + resultSet.getInt("Ticket_ID"), + resultSet.getInt("Requestor"), + resultSet.getLong("Request_Date"), + resultSet.getInt("Location"), + resultSet.getInt("Device_ID"), + resultSet.getString("Status"), + resultSet.getLong("Status_Date_Fields"), + resultSet.getString("Return_Date"), + resultSet.getString("username"), + resultSet.getString("Device_Name"), + resultSet.getString("locationname"), + resultSet.getInt("Permanent_Order") + ); + i++; + } stmt.close(); connection.close(); + return tickets; } - - public static void rejectTicket(int id) + + /** + * This function accepts a ticket, and assigns that ticket & device to its + * corresponding renter and location. + * @author Connor Jackson + */ + public static void acceptTicket(int ticketid, int deviceid, int locationid, int sso, int perm) throws SQLException, ClassNotFoundException, InterruptedException{ System.getenv("VCAP_SERVICES"); Class.forName("com.mysql.jdbc.Driver"); @@ -175,16 +210,26 @@ public static void rejectTicket(int id) Thread.sleep(1); } } - long milliseconds = new Date().getTime(); - String query="UPDATE ticket SET Status = \"Rejected\", Status_Date_Fields = "+milliseconds+" WHERE Ticket_ID = " + id; - System.out.println("Executing query "+query); + long milliseconds = new java.util.Date().getTime(); + String query = "UPDATE ticket, devices SET ticket.Status = \"Approved\"" + +", ticket.Status_Date_Fields = " + milliseconds + +", devices.Ticket_ID = " + ticketid + +", devices.Status = \"Ready to Ship\", devices.Renter = " + sso + +", devices.Location = " + locationid + +", devices.Permanent = " + perm + +" WHERE ticket.Ticket_ID = " + ticketid + " AND devices.Device_ID = " + deviceid; + System.out.println("Executing query: "+query); stmt.executeUpdate(query); + stmt.close(); connection.close(); } - - // Returns millisecond value of the most recently modified ticket assigned to 'employee' with status 'status' - public static long getLatestTicketActivity(User employee, String status) + + /** + * This function rejects a ticket. + * @author Connor Jackson + */ + public static void rejectTicket(int id) throws SQLException, ClassNotFoundException, InterruptedException{ System.getenv("VCAP_SERVICES"); Class.forName("com.mysql.jdbc.Driver"); @@ -208,16 +253,18 @@ public static long getLatestTicketActivity(User employee, String status) Thread.sleep(1); } } - String query = "SELECT MAX(Status_Date_Fields) FROM ticket WHERE Requestor = "+employee.getID()+" AND Status = '"+status+"';"; - System.out.println("Executing query '"+query+"'"); - ResultSet results = stmt.executeQuery(query); - results.next(); + long milliseconds = new Date().getTime(); + String query="UPDATE ticket SET Status = \"Rejected\", Status_Date_Fields = "+milliseconds+" WHERE Ticket_ID = " + id; + System.out.println("Executing query "+query); + stmt.executeUpdate(query); stmt.close(); connection.close(); - return results.getLong("MAX(Status_Date_Fields)"); } - // Returns all tickets changed to 'status' since 'millieconds' and associated with 'employee' + /** + * Returns all tickets changed to 'status' since 'milliseconds' and associated with 'employee' + * @author Adam Claxton + */ public static Ticket[] getRecentlyChangedTickets(int userID, String status, long milliseconds) throws SQLException, ClassNotFoundException { System.getenv("VCAP_SERVICES"); Class.forName("com.mysql.jdbc.Driver"); @@ -258,6 +305,11 @@ public static Ticket[] getRecentlyChangedTickets(int userID, String status, long return tickets; } + /** + * Gets the SSO number from a certain ticket. This is to support sending an email to an employee + * when an action is changed on a ticket. + * @author Adam Claxton + */ public static int getUserID(int ticketID) throws ClassNotFoundException, SQLException, InterruptedException{ System.getenv("VCAP_SERVICES"); Class.forName("com.mysql.jdbc.Driver"); diff --git a/src/utilities/Mail.java b/src/utilities/Mail.java index de32c30..1a34837 100644 --- a/src/utilities/Mail.java +++ b/src/utilities/Mail.java @@ -1,11 +1,7 @@ package utilities; import java.awt.HeadlessException; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStreamReader; import java.util.*; import javax.mail.*; import javax.mail.internet.*; @@ -13,8 +9,6 @@ import entities.Ticket; import entities.User; -import javax.activation.*; - public class Mail { private String sender = "Senior.design.synchrony.test@gmail.com";