From c5330f3f6c78c2a076655ae8193dad02da52a4f6 Mon Sep 17 00:00:00 2001 From: Adam R Claxton Date: Tue, 14 Feb 2017 01:50:42 -0500 Subject: [PATCH 01/13] Imporoved the look of the order info popup It also now closes when pressing escape or clicking outside of it. Made shoppingCart.html and shoppingCart.js into shoppnigCart.jsp and shop.jsp respetively; getting ready for database stuff --- WebContent/html/css/stylesheet.css | 1 + WebContent/html/javascript/navbar.js | 2 +- WebContent/html/javascript/shop.jsp | 211 ++++++++++++++++++ .../{shoppingCart.html => shoppingCart.jsp} | 30 ++- 4 files changed, 231 insertions(+), 13 deletions(-) create mode 100644 WebContent/html/javascript/shop.jsp rename WebContent/html/webpages/{shoppingCart.html => shoppingCart.jsp} (70%) diff --git a/WebContent/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css index 8a50290..360b370 100644 --- a/WebContent/html/css/stylesheet.css +++ b/WebContent/html/css/stylesheet.css @@ -60,6 +60,7 @@ div.modal-body{ } input[type=text]{ + margin: 0 auto; width: 60%; } diff --git a/WebContent/html/javascript/navbar.js b/WebContent/html/javascript/navbar.js index e9c421e..b77c810 100644 --- a/WebContent/html/javascript/navbar.js +++ b/WebContent/html/javascript/navbar.js @@ -1 +1 @@ -document.getElementById('navbaruniversal').innerHTML = '
' +document.getElementById('navbaruniversal').innerHTML = '
' diff --git a/WebContent/html/javascript/shop.jsp b/WebContent/html/javascript/shop.jsp new file mode 100644 index 0000000..5a543d7 --- /dev/null +++ b/WebContent/html/javascript/shop.jsp @@ -0,0 +1,211 @@ + +//adding event listeners to all the options, such as ordering and deleting +document.getElementById('os').addEventListener('click',showPopup); +document.getElementById('ds').addEventListener('click',deleteSelected); +document.getElementById('oa').addEventListener('click',showPopup); +document.getElementById('da').addEventListener('click',deleteAll); + +// document.getElementById('orderInfoModal').addEventListener('keypress',escapeModal); +// function escap() { + // if() +// } +// window.onkeypress(function(e) { + // if (e.keyCode == 27) { + // hidePopup(); + // } +// }); +document.onkeydown = function(e) { + if (e.keyCode == 27) { + hidePopup(); + } + +} + +window.onclick = function(event) { + var modal = document.getElementById('orderInfoModal'); + if(event.target == modal) modal.style.display = "none"; +} +// Shipping form popup--------------------- +var orderForm = document.getElementById('orderInfoModal'); +var orderFormCloseButton = document.getElementById('closeOrderForm'); +orderFormCloseButton.addEventListener('click',hidePopup); +show(); //on load, we want to show everything + +function getCartItems(){ + var cart = new Array; //initiate array for them + var cart_str = localStorage.getItem('cart'); //get them from local storage + if (cart_str !== null) { //if there is at least one object already we need to convert it from JSON to string + cart = JSON.parse(cart_str); + } + return cart; //return value is an array +} + +/** +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 + var html = ''; //html string initially empty + var part1 = "nhpup.popup('"; + var part2 = "');" + if(cart.length !== 0){ //only continue if there are cart items + html += '

Tickets have been generated below based on your desired selections.


' + for(var i = 0; i < cart.length; i++){ //iterate cart + var id = cart[i]; //this gets the id value from the cart + for(var j = 0; j < devices.length; j++){ //iterate device list + if(devices[j].id === id){ //match the id's "nhpup.popup(' ');" + html += '

' + devices[j].name + '

'; //create listing of all the devices + break; //break out of loop when we match + } + } + } + } + else{ //no point in doing all that computing if the list is empty + html += 'Shopping cart is empty.'; //so give a nice error message. + } + + document.getElementById('shoppingContainer').innerHTML = html; //adds what we just generated to the webpage + + var checkboxes = document.getElementsByClassName('deviceCheckbox'); //get all the checkboxes we just placed! + for(var i = 0; i < checkboxes.length; i++){ //iterate them + checkboxes[i].addEventListener('click',changeStatus); //when we click on a checkbox, it should add/remove the id from the selected array + } + + var tickets = document.getElementsByClassName('ticket'); + for(var i = 0; i < tickets.length; i++){ + tickets[i].addEventListener('click',clickTicket); + } +} + +/** +This allows a ticket click to do the same thing as clicking on the checkbox. +**/ +function clickTicket(){ + var checkboxes = document.getElementsByClassName('deviceCheckbox'); + var id = this.getAttribute('id'); + id = parseInt(id.replace(/[^0-9\.]/g,''),10); + if(document.getElementById(id).checked == true){ + document.getElementById(id).checked = false; + for(var i = 0; i < checked.length; i++){ //iterate checked array + if(id == checked[i]) //find the right checkbox + checked.splice(i,1); //remove from the array + } + } + else{ + document.getElementById(id).checked = true; + checked.push(id); + } +} + +/** +When a checkbox is clicked, either a device needs to be checked or unchecked in the shopping cart. This function handles JUST that. +**/ +function changeStatus(){ + var id = this.getAttribute('id'); //get the checkbox's id + if(this.checked == true){ //we just checked it off + checked.push(id); //add item to the selected list + } + else{ //we just unchecked it + for(var i = 0; i < checked.length; i++){ //iterate checked array + if(id == checked[i]) //find the right checkbox + checked.splice(i,1); //remove from the array + } + } +} + +/** +This function takes all the devices we selected and simulates an order on them. +**/ +function showPopup(){ + orderForm.style.display = "block"; +} +function hidePopup(){ + orderForm.style.display = "none"; +} + +function orderSelected(){ + var response = confirm("Are you sure you'd like to order the selected items?"); + if(response == true){ //if they confirm + for(var i = 0; i < checked.length; i++){ //iterate all the checked off devices + var id = checked[i]; //get the id of each device + var requested = getRequestedItems(); //get the unavailable items + var cart = getCartItems(); //get the cart + requested.push(id); //add to unavailable list + for(var j = 0; j < cart.length; j++){ //iterate cart + if(cart[j] == id) //match id's + cart.splice(j,1); //remove from the cart + } + localStorage.setItem('requested', JSON.stringify(requested)); //update local storage + localStorage.setItem('cart', JSON.stringify(cart)); //update local storage + } + checked = new Array; //reset the checked off array + show(); //reload the container + } +} + +/** +This function takes all the devices we selected and removes them from the shopping cart. +**/ +function deleteSelected(){ + var response = confirm("Are you sure you'd like to remove the selected items from the cart?"); + if(response == true){ //if they confirm + for(var i = 0; i < checked.length; i++){ //iterate all the checked off devices + var id = checked[i]; //get the id of each device + var cart = getCartItems(); //get the cart + for(var j = 0; j < cart.length; j++){ //iterate cart + if(cart[j] == id){ //match ids + cart.splice(j,1); //remove from the cart + } + } + localStorage.setItem('cart', JSON.stringify(cart)); //update local storage + } + checked = new Array; //reset the checked array + show(); //reload the container + } +} + +/** +This function takes all devices in the shopping cart and orders them. +**/ +function orderAll(){ + var response = confirm("Are you sure you'd like to order the selected items?"); + if(response == true){ //if they confirm + var cart = getCartItems(); //get the cart + for(var i = 0; i < cart.length; i++){ //iterate the cart + var id = cart[i]; //get the id of each device + var requested = getRequestedItems(); //get the unavailable items + requested.push(id); //add to unavailable list + localStorage.setItem('requested', JSON.stringify(requested)); //update local storage + } + checked = new Array; //reset the checked off array + cart = new Array; //cart should now be empty, so reset also + localStorage.setItem('cart',JSON.stringify(cart)); //update local storage + show(); //reload container + } +} + +/** +This function takes all devices in the shopping cart and deletes them. +**/ +function deleteAll(){ + var response = confirm("Are you sure you'd like to order the selected items?"); + if(response == true){ //if they confirm + cart = new Array; //empty cart + localStorage.setItem('cart',JSON.stringify(cart)); //update local storage + checked = new Array; //reset the checked off array + show(); //reload container + } +} + +/** +This function gets requested items from local storage. +**/ +function getRequestedItems(){ + var requested = new Array; //make new array + var requested_str = localStorage.getItem('requested'); //get the string from local storage + if(requested_str !== '' && requested_str !== null){ //as long as its not null + requested = JSON.parse(requested_str); //make into array + } + return requested; //return value is an array +} +//here are all the hardcoded devices \ No newline at end of file diff --git a/WebContent/html/webpages/shoppingCart.html b/WebContent/html/webpages/shoppingCart.jsp similarity index 70% rename from WebContent/html/webpages/shoppingCart.html rename to WebContent/html/webpages/shoppingCart.jsp index a2768b4..679f0a4 100644 --- a/WebContent/html/webpages/shoppingCart.html +++ b/WebContent/html/webpages/shoppingCart.jsp @@ -16,6 +16,9 @@ -<% -MySQLAccess myaccess = new MySQLAccess(); -myaccess.connectDB(); -String name = myaccess.getResult()[0][0]; -String description = myaccess.getResult()[0][1]; -String hardware = myaccess.getResult()[0][2]; -out.println(name); -out.println(description); -out.println(hardware); -%> - + +
+
+ +
+

User Login

+ +
+ + +
+

Admin Login

+ +
+ +
\ No newline at end of file diff --git a/src/database/MySQLAccess.java b/src/database/MySQLAccess.java index 1666661..b009049 100644 --- a/src/database/MySQLAccess.java +++ b/src/database/MySQLAccess.java @@ -46,6 +46,7 @@ public void initializeEmployee(int id) throws ClassNotFoundException, SQLExcepti public void updateEmployee(int id, String name, String phone, int location) throws ClassNotFoundException, SQLException { + System.out.print("Updating employee "+id+": "+name+".\nPhone: "+phone+", location: "+location); Class.forName("com.mysql.jdbc.Driver"); Connection connect = DriverManager.getConnection(database,user,password); Statement statement = connect.createStatement(); From b7bddb4c8ec30d61357d3695d54894ae22133fda Mon Sep 17 00:00:00 2001 From: Adam R Claxton Date: Wed, 15 Mar 2017 11:28:13 -0400 Subject: [PATCH 06/13] New text fields for address. Ticket generation is very close to working; only the location part of the ticket is ignored. That's what the new text fields are for, and once I get them behaving as desired I'll be able to finish ticket generating. Changed link in navbar to direct to /2017-CSE-Senior-Project-Team-2/html/webpages/ instead of /2017-CSE-Senior-Project-Team-2/html/webpages/index.html. Apache will find the index.* file if it exists there, and I have been using index.jsp. --- WebContent/html/javascript/navbar.js | 2 +- WebContent/html/webpages/navbar.html | 2 +- WebContent/html/webpages/orderForm.html | 2 +- WebContent/html/webpages/orderFormHandler.jsp | 25 +++++- WebContent/html/webpages/requestPage.html | 8 +- WebContent/html/webpages/shoppingCart.jsp | 54 +++++++++--- src/database/MySQLAccess.java | 86 +++++++++++++++---- src/entities/ListedDevice.java | 50 +++++++++++ 8 files changed, 195 insertions(+), 34 deletions(-) create mode 100644 src/entities/ListedDevice.java diff --git a/WebContent/html/javascript/navbar.js b/WebContent/html/javascript/navbar.js index 6918d85..f604dd2 100644 --- a/WebContent/html/javascript/navbar.js +++ b/WebContent/html/javascript/navbar.js @@ -1 +1 @@ -document.getElementById('navbaruniversal').innerHTML = '
' +document.getElementById('navbaruniversal').innerHTML = '
' diff --git a/WebContent/html/webpages/navbar.html b/WebContent/html/webpages/navbar.html index ec86e01..78d93dd 100644 --- a/WebContent/html/webpages/navbar.html +++ b/WebContent/html/webpages/navbar.html @@ -12,7 +12,7 @@
diff --git a/WebContent/html/webpages/shoppingCart.jsp b/WebContent/html/webpages/shoppingCart.jsp index dc2838b..3200c63 100644 --- a/WebContent/html/webpages/shoppingCart.jsp +++ b/WebContent/html/webpages/shoppingCart.jsp @@ -58,18 +58,47 @@ pageEncoding="ISO-8859-1"%>

Please provide additional order information

- + + + +


- +
+

- + + + + +
+
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +

@@ -155,14 +184,13 @@ This function displays a list of devices that a user has currently in their shop **/ function show(){ var cart = getCartItems(); //get all the cart items you want to show - alert("cart: "+JSON.stringify(cart)); var html = ''; //html string initially empty var part1 = "nhpup.popup('"; var part2 = "');" if(cart.length !== 0){ //only continue if there are cart items html += '

Tickets have been generated below based on your desired selections.


' for(var i = 0; i < cart.length; i++){ //iterate cart - var id = cart[i]; //this gets the id value from the cart + var id = cart[i].id; //this gets the id value from the cart html += '

' + cart[i].name + '

'; //create listing of all the devices } } @@ -201,7 +229,6 @@ function clickTicket(){ document.getElementById(id).checked = true; checked.push(id); } - alert("the 'checked' array looks like this: "+JSON.stringify(cart)); } /** @@ -218,7 +245,6 @@ function changeStatus(){ checked.splice(i,1); //remove from the array } } - alert("the 'checked' array looks like this: "+JSON.stringify(cart)); } // These functions just redirect button pressed to call the showPopup method with the appropriate parameter @@ -266,19 +292,19 @@ function submitOrderForm() { // we must first append the employees ID as well as the ids of whatever devices are selected. // First, employee id userID=getUserID(); - document.orderForm.append(''); + document.orderForm.userID.value=userID; // Now selected devices. if(document.orderForm.orderAll.value=="true") //if the order form was opened using the order all button {selectAllDevices();} var selectedDeviceString=JSON.stringify(checked); - document.orderForm.append(''); + document.orderForm.deviceIDs.value=selectedDeviceString; // Finally remove selected items from the cart var cart = getCartItems(); for(var i = 0; i < checked.length; i++){ //iterate all the checked off devices for(var j = 0; j < cart.length; j++){ //iterate cart - if(cart[j] == id) //match id's + if(cart[j] == checked[i]) //match id's cart.splice(j,1); //remove from the cart } } @@ -342,12 +368,20 @@ function deleteAll(){ } } +function getUserID() { + return 9; //TODO actually get a userID +} function debug_add_item_to_cart() { employee.id=5; employee.location="test"; employee.name="test"; employee.phone="test"; var cart = [employee]; + employee.id=6; + employee.location="test"; + employee.name="test"; + employee.phone="test"; + cart.push(employee) localStorage.setItem("cart",JSON.stringify(cart)); } diff --git a/src/database/MySQLAccess.java b/src/database/MySQLAccess.java index b009049..53b97a0 100644 --- a/src/database/MySQLAccess.java +++ b/src/database/MySQLAccess.java @@ -1,6 +1,7 @@ package database; import java.sql.*; +import java.util.Date; import entities.User; @@ -41,22 +42,52 @@ public void initializeEmployee(int id) throws ClassNotFoundException, SQLExcepti Class.forName("com.mysql.jdbc.Driver"); Connection connect = DriverManager.getConnection(database,user,password); Statement statement = connect.createStatement(); - statement.executeQuery("INSERT INTO employee (Employee_ID) VALUES ("+id+");"); + statement.executeUpdate("INSERT INTO employee (Employee_ID) VALUES ("+id+");"); } - public void updateEmployee(int id, String name, String phone, int location) throws ClassNotFoundException, SQLException + public void updateEmployee(int id, String name, String phone, String location) throws ClassNotFoundException, SQLException { System.out.print("Updating employee "+id+": "+name+".\nPhone: "+phone+", location: "+location); Class.forName("com.mysql.jdbc.Driver"); Connection connect = DriverManager.getConnection(database,user,password); Statement statement = connect.createStatement(); String query = ""; - query+="UPDATE employee SET "; - query+="Name="+name; - query+=", Phone_Number="+phone; - query+=", Location_ID="+location; - query+=" WHERE Employee_ID="+id; - statement.executeQuery(query); + query+="SELECT Location_ID FROM Location "; + query+="WHERE Address="+location; + System.out.println(query); + ResultSet rs = statement.executeQuery(query); + if(rs.next()) + // If there is already a record in locations matching given string, set + // employee's location FK to that location ID + { + query=""; + query+="UPDATE employee SET "; + query+="Name='"+name; + query+="', Phone_Number='"+phone; + query+="', Location_ID="+rs.getInt("Location_ID"); + query+=" WHERE Employee_ID="+id; + } + else + // Otherwise we need to make a whole new location entry + { + query+="SELECT COUNT(Location_ID) FROM location"; //generate a new key. Probably will run into trouble if a location is ever deleted + rs=statement.executeQuery(query); + rs.next(); + query+="INSERT INTO location "; + query+="(Location_ID, Address) "; + query+="VALUES ("+(rs.getInt("COUNT(Location_ID)")+1)+", '"+location+"')"; + statement.executeQuery(query); + + // then update employee's location id + query=""; + query+="UPDATE employee SET "; + query+="Name='"+name; + query+="', Phone_Number='"+phone; + query+="', Location_ID="+(rs.getInt("(COUNT(Location_ID)")+1); + query+=" WHERE Employee_ID="+id; + } + System.out.println(query); + statement.executeUpdate(query); } public User getEmployeeByID(int id) throws ClassNotFoundException, SQLException @@ -78,22 +109,47 @@ public User getEmployeeByID(int id) throws ClassNotFoundException, SQLException return employee; } - public void generateTicket(int id, int requester, int location, int device, String stat, String std) throws ClassNotFoundException, SQLException + public int locationStringToInt(String locString) throws SQLException, ClassNotFoundException + { + Class.forName("com.mysql.jdbc.Driver"); + Connection connect = DriverManager.getConnection(database,user,password); + Statement statement = connect.createStatement(); + ResultSet resultSet = statement.executeQuery("SELECT Location_ID FROM location WHERE Address = '"+locString+"'"); + resultSet.next(); + return resultSet.getInt("Location_ID"); + } + + public String locationIntToString(int locInt) throws ClassNotFoundException, SQLException + { + Class.forName("com.mysql.jdbc.Driver"); + Connection connect = DriverManager.getConnection(database,user,password); + Statement statement = connect.createStatement(); + ResultSet resultSet = statement.executeQuery("SELECT Address FROM location WHERE Location_ID = "+locInt); + resultSet.next(); + return resultSet.getString("Address"); + } + + public void generateTicket(int requester, String location, int device) throws ClassNotFoundException, SQLException { + long time = new Date().getTime(); //Using milliseconds because sql is annoying with dates. + int locID = locationStringToInt(location); + long ticketID = time+requester+device+locID; + String stat = "Requested"; Class.forName("com.mysql.jdbc.Driver"); Connection connect = DriverManager.getConnection(database,user,password); Statement statement = connect.createStatement(); String query = ""; - query+="INSERT INTO ticket (Ticket_ID, Requester, Request_Date, Location, Device_ID, Status, Status_Date_Fields) "; + query+="INSERT INTO ticket (Ticket_ID, Requestor, Request_Date, Location, Device_ID, Status, Status_Date_Fields) "; query+="VALUES ("; - query+= id +", "; + query+= ticketID +", "; query+= requester +", "; - query+= 0 +", "; + query+= "'"+time+"'" +", "; query+= location +", "; query+= device +", "; - query+= stat +", "; - query+= std +");"; - statement.executeQuery(query); + query+= "'"+stat+"'" +", "; + query+= "'"+time+"'" +");"; + System.out.println(query); + statement.executeUpdate(query); } } diff --git a/src/entities/ListedDevice.java b/src/entities/ListedDevice.java new file mode 100644 index 0000000..4de1aac --- /dev/null +++ b/src/entities/ListedDevice.java @@ -0,0 +1,50 @@ +package entities; +/** + * Simple Modification of the RentedDevice class for use in the listed devices page. + * @author John Costa III + * + */ +public class ListedDevice { + private String Device_Name; + private String Device_Description; + private String Hardware; + private String Model; + public ListedDevice(String name, String desc, String hardware, String model) { + Device_Name = name; + Device_Description = desc; + Hardware = hardware; + Model = model; + } + /** + * Formatting the device to fit a JSON object. + * @author - Connor + */ + public String toString(){ + StringBuilder sb = new StringBuilder(); + String comma = ", "; + sb.append("{\"name\": \"").append(Device_Name).append("\"").append(comma); + sb.append("\"description\": \"").append(Device_Description).append("\"").append(comma); + sb.append("\"hardware\": \"").append(Hardware).append("\"").append(comma); + sb.append("\"model\": \"").append(Model).append("\""); + sb.append("}"); + return sb.toString(); + } + /** + * This is a static function which will turn a Listed Device array into its proper string. (modification) + * @author - Connor + * @param array + * @return + */ + public static String arrayToString(ListedDevice[] array){ + StringBuilder sb = new StringBuilder(); + sb.append("["); + for(int i = 0; i < array.length; i++){ + sb.append(array[i].toString()); + if(i+1 != array.length){ + sb.append(","); + } + } + sb.append("]"); + return sb.toString(); + } +} From 8b3cc0b4f1f1f1e53fbd55ae515a6ebabbe39e63 Mon Sep 17 00:00:00 2001 From: Adam R Claxton Date: Fri, 17 Mar 2017 16:33:42 -0400 Subject: [PATCH 07/13] Autofill updated for new address filds and location dropdown. --- WebContent/html/css/stylesheet.css | 7 ++ WebContent/html/webpages/shoppingCart.jsp | 107 +++++++++++++++++----- src/database/MySQLAccess.java | 28 ++++++ src/entities/Location.java | 68 ++++++++++++++ 4 files changed, 187 insertions(+), 23 deletions(-) create mode 100644 src/entities/Location.java diff --git a/WebContent/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css index 360b370..08d057b 100644 --- a/WebContent/html/css/stylesheet.css +++ b/WebContent/html/css/stylesheet.css @@ -64,6 +64,13 @@ input[type=text]{ width: 60%; } +select{ + margin:0 auto; + width: 65%; + align-self: center; + float: center; +} + span.close{ color: #aaa; diff --git a/WebContent/html/webpages/shoppingCart.jsp b/WebContent/html/webpages/shoppingCart.jsp index 3200c63..2862eb5 100644 --- a/WebContent/html/webpages/shoppingCart.jsp +++ b/WebContent/html/webpages/shoppingCart.jsp @@ -1,7 +1,9 @@ <%@ page import = "database.MySQLAccess" %> <%@ page import = "entities.User" %> +<%@ page import = "entities.Location" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> + @@ -52,7 +54,7 @@ pageEncoding="ISO-8859-1"%> <%@ include file="navbar.html"%>