From 1efe7494fe4ef37ad7c9c53e267cc6092eacc9be Mon Sep 17 00:00:00 2001 From: Adam R Claxton Date: Tue, 25 Apr 2017 00:28:53 -0400 Subject: [PATCH] Urgent order option does what it's supposed to now. Implemented admin email, only for urgent orders Still need to do queued admin notifications and improve email quality --- .../webpages/redirect/orderFormHandler.jsp | 39 ++++++++++-- WebContent/html/webpages/shoppingCart.jsp | 30 +++++---- src/database/EmployeeQueries.java | 29 +++++++++ src/entities/Ticket.java | 3 + src/utilities/AdminNotificationQueue.java | 62 +++++++++++++++++++ src/utilities/Mail.java | 57 +++++++++++++++++ 6 files changed, 204 insertions(+), 16 deletions(-) create mode 100644 src/utilities/AdminNotificationQueue.java diff --git a/WebContent/html/webpages/redirect/orderFormHandler.jsp b/WebContent/html/webpages/redirect/orderFormHandler.jsp index aff74f9..afca845 100644 --- a/WebContent/html/webpages/redirect/orderFormHandler.jsp +++ b/WebContent/html/webpages/redirect/orderFormHandler.jsp @@ -1,5 +1,4 @@ -<%@ page import = "database.*,entities.Location" %> -<%@ page import = "entities.User" %> +<%@ page import = "database.*,entities.*,utilities.*" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> @@ -42,13 +41,13 @@ String phone = request.getParameter("phone"); String email = request.getParameter("email"); String[] options = request.getParameterValues("checkboxes"); int perm = 0; -int urgent = 0; +boolean urgent = false; if(options != null){ for(int j = 0; j < options.length; j++){ if(options[j].equals("perm")) perm = 1; if(options[j].equals("urgent")) - urgent = 1; + urgent = true; } } // read location ID, but only if we haven't already generated it when adding new location to db @@ -73,19 +72,49 @@ for(int i=0; i= 0; i--) { + AdminNotificationQueue Q = new AdminNotificationQueue(admins[i],instructions,tickets); + Q.start(); +} %> window.location.replace("../shoppingCart.jsp"); diff --git a/WebContent/html/webpages/shoppingCart.jsp b/WebContent/html/webpages/shoppingCart.jsp index 8b5a3e3..8b698df 100644 --- a/WebContent/html/webpages/shoppingCart.jsp +++ b/WebContent/html/webpages/shoppingCart.jsp @@ -76,9 +76,10 @@ pageEncoding="ISO-8859-1"%>
- + - + +

@@ -96,10 +97,7 @@ pageEncoding="ISO-8859-1"%>
-
- - -
+
@@ -173,6 +171,11 @@ pageEncoding="ISO-8859-1"%>
+ +
+
+ +
@@ -250,6 +253,7 @@ var employee = { var checked = new Array(); var locations = getLocations(); +var cart = getCartItems(); show(); //on load, we want to show everything @@ -271,7 +275,7 @@ function setCart(cartArray) { This function displays a list of devices that a user has currently in their shopping cart. **/ function show(){ - var cart = getCartItems(); //get all the cart items you want to show + cart = getCartItems(); //get all the cart items you want to show var html = ''; //html string initially empty var part1 = "nhpup.popup('"; var part2 = "');" @@ -347,12 +351,12 @@ function orderAll_showPopup() { // If true, submitting the form will order everything in the cart. If false it only orders selected devices. function showPopup(orderAllBool){ if(checked.length==0 && !orderAllBool){ - $('#Submit').attr('disabled',true); - $('#Submit').attr('title',"There aren't any devices selected to order!"); + $('#Submit').attr('disabled',true); + $('#Submit').attr('title',"There aren't any devices selected to order!"); } else{ - $('#Submit').attr('disabled',false); - $('#Submit').removeAttr('title'); + $('#Submit').attr('disabled',false); + $('#Submit').removeAttr('title'); } orderForm.style.display = "block"; autoFillFields(orderAllBool); @@ -474,6 +478,7 @@ function forceUpdateLocationMetadata() { var selectedDeviceString=JSON.stringify(checked); document.orderForm.deviceIDs.value=selectedDeviceString; + // Finally remove selected items from the cart deleteSelected(false); return true; @@ -535,6 +540,9 @@ function deleteAll(){ function getUserID() { return <%=sso%>; } + function function_name(argument) { + // body... + } diff --git a/src/database/EmployeeQueries.java b/src/database/EmployeeQueries.java index 43a98b8..4d5ba46 100644 --- a/src/database/EmployeeQueries.java +++ b/src/database/EmployeeQueries.java @@ -246,4 +246,33 @@ public static void updateNotificationPreferences(int client, int preferences) th statement.close(); connect.close(); } + + public static User[] getAllAdmins() throws SQLException, ClassNotFoundException { + System.getenv("VCAP_SERVICES"); + Class.forName("com.mysql.jdbc.Driver"); + Connection connect = DriverManager.getConnection(database, user, password); + Statement statement = connect.createStatement(); + String query = "select * from employee join admin on employee.Employee_ID=Admin.Admin_ID"; + query+=" WHERE Employee_ID = 0;"; //TODO Remove this line when ready for production! It is only here to prevent every single admin from getting all my test emails. + System.out.println("Executing query: "+query); + ResultSet results = statement.executeQuery(query); + results.last(); + User[] admins = new User[results.getRow()]; + results.beforeFirst(); + while(results.next()) + { + admins[results.getRow()-1]=new User( + results.getInt("Employee_ID"), + results.getInt("Location_ID"), + results.getString("Name"), + results.getString("Phone_Number"), + results.getString("Email"), + results.getInt("Img_Index"), + results.getInt("Notification_Preference") + ); + } + statement.close(); + connect.close(); + return admins; + } } \ No newline at end of file diff --git a/src/entities/Ticket.java b/src/entities/Ticket.java index e6b1bea..6ae1bda 100644 --- a/src/entities/Ticket.java +++ b/src/entities/Ticket.java @@ -122,4 +122,7 @@ public long getStatusDatefields(){ public String getDeviceName(){ return devicename; } + public String getRequestorName() { + return username; + } } diff --git a/src/utilities/AdminNotificationQueue.java b/src/utilities/AdminNotificationQueue.java new file mode 100644 index 0000000..2c39636 --- /dev/null +++ b/src/utilities/AdminNotificationQueue.java @@ -0,0 +1,62 @@ +package utilities; + +import java.util.Set; + +import entities.Ticket; +import entities.User; + +public class AdminNotificationQueue extends Thread { +/* + This class functions similarly to the regular notification queue. + There are enough differences in admin and client notifications, + however, that it seemed like it deserved a seperate class. +*/ + private String instructions=""; + private int threadWaitTime; + private User admin; + private Ticket[] tickets; + + // The tickets parameter will most likely be relevant only when using this class to + // dispatch emails immediately with threads + public AdminNotificationQueue(User admin, String initialization, Ticket[] tickets) + { + instructions=initialization; + this.admin=admin; + this.tickets=tickets; + } + + public void run() { + try { + String threadName = instructions+admin.getID(); + Set threadSet = Thread.getAllStackTraces().keySet(); + Thread[] threadArray = threadSet.toArray(new Thread[threadSet.size()]); + boolean match = false; + System.out.println("Admin Notification Queue: Chacking active threads for match with "+threadName+"..."); + for (int i=0; i" + + "" + + "

{CLIENT} is very excited about getting a device, and doesn't want to be kept waiting.

" + + "

You'd better drop everything you're doing to take care of them immediately. Who knows what might happen if they don't get their device{s} right freakin' now?

" + + "

Here {is/are} the ticket{s} in question:

" + + "
" + + "{TICKETS GO HERE}" + + "
" + + "" + + "" + + ""; + + // The messege needs to be tailored to make sense + subject=subject.replace("{CLIENT}",""+tickets[0].getRequestorName()); + subject=subject.replace("{a/some}",tickets.length==1 ? "a" : "some"); + subject=subject.replace("{s}",(tickets.length==1 ? "" : "s")); + msg=msg.replace("{CLIENT}",""+tickets[0].getRequestorName()); // + msg=msg.replace("{s}",(tickets.length==1 ? "" : "s")); //make occurances of 'device' and 'ticket' plural or singular + msg=msg.replace("{was/were}",tickets.length==1 ? "was" : "were"); //use appropriate verbs + msg=msg.replace("{is/are}",tickets.length==1 ? "is" : "are"); + msg=msg.replace("{!s}",tickets.length==1 ? "s" : "s"); //verbs again + + String tickethtml = ""; + for(Ticket ticket : tickets) + { + tickethtml+="

Ticket #"+ticket.getId()+"

"; + } + msg=msg.replace("{TICKETS GO HERE}",tickethtml); + Properties properties = System.getProperties(); + properties = setProp(sender, client.getEmail()); + Session session = Session.getInstance(properties, new Authenticator() { + protected PasswordAuthentication getPasswordAuthentication(){ + return new PasswordAuthentication(sender, password); + } + }); + + try { + Address address = new InternetAddress(client.getEmail()); + MimeMessage message = new MimeMessage(session); + message.setFrom(address); + message.addRecipient(Message.RecipientType.TO, address); + message.setSubject(subject); + message.setText(msg,"utf-8","html"); + message.saveChanges(); + Transport.send(message); + System.out.println("Sent message successfully...."); + + } catch (Exception mex) { + mex.printStackTrace(); + } + } + private Properties setProp(String email, String targetEmail) { Properties props = null; try {