From eeb1fcd65ec08b2ed3b3fd8fc4ff7233e84848a2 Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Wed, 5 Apr 2017 20:45:44 -0400 Subject: [PATCH 1/5] Bug pushes --- WebContent/html/css/stylesheet.css | 2 +- WebContent/html/javascript/request.jsp | 29 ---------- WebContent/html/webpages/navbar.html | 22 +++++++- WebContent/html/webpages/navbar.jsp | 42 ++++++++++++++ WebContent/html/webpages/returnComplete.jsp | 5 +- WebContent/html/webpages/returnPage.jsp | 62 +++++++++++++++------ WebContent/html/webpages/shoppingCart.jsp | 5 -- src/database/DeviceQueries.java | 9 ++- 8 files changed, 116 insertions(+), 60 deletions(-) create mode 100644 WebContent/html/webpages/navbar.jsp diff --git a/WebContent/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css index f063542..bbe9f43 100644 --- a/WebContent/html/css/stylesheet.css +++ b/WebContent/html/css/stylesheet.css @@ -59,7 +59,7 @@ div.modal-content{ padding: 10px; border: 1px solid #888; width: 80%; - max-height: 80%; + max-height: 100%; text-align: center; vertical-align: center; align-items: center; diff --git a/WebContent/html/javascript/request.jsp b/WebContent/html/javascript/request.jsp index 68ffb65..5414824 100644 --- a/WebContent/html/javascript/request.jsp +++ b/WebContent/html/javascript/request.jsp @@ -21,35 +21,6 @@ var devices = makeDeviceArray(); //get all the option buttons var hardwareOptions = document.getElementsByClassName('hw-data-type'); var softwareOptions = document.getElementsByClassName('sw-data-type'); -function ajaxFunction(){ - var request; - try { - request = new XMLHttpRequest(); - } - catch(e){ - try { - request = new ActiveXObject("Msxml2.XMLHTTP"); - } - catch(e){ - try { - request = new ActiveXObject(Microsoft.XMLHTTP); - } catch(e) { - alert("Something is wrong with your browser"); - return false; - } - - } - } - - - request.onreadystatechange = function(){ - if(request.readyState == 4){ - var display = document.getElementById('ajaxDiv'); - display.innerHTML = request.responseText; - } - } - -} //add event listeners to the options in the left sidebar for(var a = 0; a < hardwareOptions.length; a++){ hardwareOptions[a].addEventListener('click', refresh); diff --git a/WebContent/html/webpages/navbar.html b/WebContent/html/webpages/navbar.html index 578a279..3f7f865 100644 --- a/WebContent/html/webpages/navbar.html +++ b/WebContent/html/webpages/navbar.html @@ -1,3 +1,5 @@ +<%@ page import = "database.*,entities.User" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
- + +      +

+ <% + Cookie[] cookies = request.getCookies(); + int sso = 0; + for(Cookie c : cookies){ + if(c.getName().equals("ssoNum")){ + sso = Integer.ParseInt(c.getValue()); + break; + } + } + User self = EmployeeQueries.getEmployeeID(sso); + String name = self.getName(); + %>
+ diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp new file mode 100644 index 0000000..b609f53 --- /dev/null +++ b/WebContent/html/webpages/navbar.jsp @@ -0,0 +1,42 @@ +<%@ page import = "database.*,entities.User" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> +
+
+ + + +      +

+ +
+ + <% + Cookie[] usercookies = request.getCookies(); + int navsso = 0; + for(Cookie c : usercookies){ + if(c.getName().equals("ssoNum")){ + navsso = Integer.parseInt(c.getValue()); + break; + } + } + User self = EmployeeQueries.getEmployeeByID(navsso); + String name = self.getName(); + %> +
+ \ No newline at end of file diff --git a/WebContent/html/webpages/returnComplete.jsp b/WebContent/html/webpages/returnComplete.jsp index 4ed52d5..7abb079 100644 --- a/WebContent/html/webpages/returnComplete.jsp +++ b/WebContent/html/webpages/returnComplete.jsp @@ -26,12 +26,13 @@

Returning Devices

Thanks for returning some devices!

- +
+ +
<% //get string from request form String devices = request.getParameter("devicesToReturn"); DeviceQueries.returnDevices(devices); %> - \ No newline at end of file diff --git a/WebContent/html/webpages/returnPage.jsp b/WebContent/html/webpages/returnPage.jsp index 15bdf43..aa61042 100644 --- a/WebContent/html/webpages/returnPage.jsp +++ b/WebContent/html/webpages/returnPage.jsp @@ -1,4 +1,4 @@ -<%@ page import = "database.*,entities.RentedDevice" %> +<%@ page import = "database.*,entities.Device" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> @@ -75,7 +75,7 @@ } @@ -98,10 +98,10 @@ -
+
- +
@@ -109,12 +109,9 @@
@@ -122,15 +119,22 @@
-
<% -//String userID = cookie implementation exists here. -//19 is just for testing purposes. Replaced by userID later. -RentedDevice[] mydevices = DeviceQueries.getUserDevices("19"); +//get user information +Cookie[] cookies = request.getCookies(); +String sso = ""; +for(Cookie c : cookies){ + if(c.getName().equals("ssoNum")){ + sso = c.getValue(); + break; + } +} + +Device[] mydevices = DeviceQueries.getUserDevices(sso); //string representation of array. -String deviceString = RentedDevice.arrayToString(mydevices); +String deviceString = Device.arrayToString(mydevices); %> diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp index b609f53..a999ed3 100644 --- a/WebContent/html/webpages/navbar.jsp +++ b/WebContent/html/webpages/navbar.jsp @@ -33,10 +33,10 @@ } } User self = EmployeeQueries.getEmployeeByID(navsso); - String name = self.getName(); + String navname = self.getName(); %> \ No newline at end of file diff --git a/WebContent/html/webpages/profileSettings.jsp b/WebContent/html/webpages/profileSettings.jsp index 730809c..ade5075 100644 --- a/WebContent/html/webpages/profileSettings.jsp +++ b/WebContent/html/webpages/profileSettings.jsp @@ -59,7 +59,7 @@
diff --git a/WebContent/html/webpages/requestPage.jsp b/WebContent/html/webpages/requestPage.jsp index 47b3aa9..6f8ec7b 100644 --- a/WebContent/html/webpages/requestPage.jsp +++ b/WebContent/html/webpages/requestPage.jsp @@ -62,7 +62,7 @@
    diff --git a/WebContent/html/webpages/returnComplete.jsp b/WebContent/html/webpages/returnComplete.jsp index 7abb079..1a35d8b 100644 --- a/WebContent/html/webpages/returnComplete.jsp +++ b/WebContent/html/webpages/returnComplete.jsp @@ -20,7 +20,7 @@ diff --git a/WebContent/html/webpages/shoppingCart.jsp b/WebContent/html/webpages/shoppingCart.jsp index 92c0809..e8558f3 100644 --- a/WebContent/html/webpages/shoppingCart.jsp +++ b/WebContent/html/webpages/shoppingCart.jsp @@ -61,7 +61,7 @@ if(c.getName().equals("ssoNum")) sso = Integer.parseInt(c.getValue()); @@ -117,10 +120,122 @@
+ - - + window.onload = function(){ + + iconSelect = new IconSelect("my-icon-select", + {'selectedIconWidth':23, + 'selectedIconHeight':23, + 'selectedBoxPadding':3, + 'iconsWidth':48, + 'iconsHeight':48, + 'boxIconSpace':5, + 'vectoralIconNumber':2, + 'horizontalIconNumber':8}); + + var icons = []; + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/' + <%=self.getIcon()%> + '.png', 'iconValue':' + <%=self.getIcon()%> + '}); + for(var i = 1; i <= 15; i++){ + if( i != <%=self.getIcon()%>) + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/' + i + '.png', 'iconValue': i }); + } + + iconSelect.refresh(icons); + + //around here is where you'll have to define the current image, then this will update as the user selects new ones! + $('#profimg').attr("src","../imgs/my-icons-collection-128px/png/" + '<%=self.getIcon()%>' + ".png"); + }; + + //event listener on the apply changes button + document.getElementById('apply').addEventListener('click',applyChanges); + document.getElementById('inputName').addEventListener('keyup',checkEmpty); + document.getElementById('inputSSO').addEventListener('keyup',checkEmpty); + document.getElementById('closeBttn').addEventListener('click',function(){document.getElementById('missingcontent').style.display = "none";}); + + var typeTimer; + var doneTypingInterval = 2000 //ms + + $('#inputSSO').keyup(function(){clearTimeout(typeTimer); typeTimer = setTimeout(querySSO,doneTypingInterval);}); + + var flag = 0; + var name; + var SSO; + var telephone; + var email; + + //populates the fields + populate(); + + //sends applied changes to DB + function applyChanges(){ + if(flag == 0){ + name = $('#inputName').val(); + SSO = $('#inputSSO').val(); + telephone = $('#inputTelephone').val(); + email = $('#inputEmail').val(); + + //send these values to DB for updates to be made + //EX + //if(name != "") + //send to database + } + + else + $('#missingcontent').css('display','block'); + } + + //populates form fields if info exists in db already + function populate(){ + //get values from database + + $('#inputName').val('<%=navname%>'); + $('#inputSSO').val('<%=self.getID()%>'); + $('#inputTelephone').val('<%=self.getPhone()%>'); + $('#inputEmail').val('<%=self.getEmail()%>'); + } + + function checkEmpty(){ + var id = this.getAttribute('id'); + if($('#' + id).val() == ""){ + $('#' + id).parent().attr('class','form-group has-error'); + $('#' + id).siblings('span').text(warningtext(id)) + } + else{ + $('#' + id).parent().attr('class','form-group'); + $('#' + id).siblings('span').text('') + } + + } + + function warningtext(id){ + if(id == "inputName") + return "This is a required field."; + else if (id == "inputSSO") + return "This is a required field."; + } + + function querySSO(){ + //query to see if SSO is in database already + + //if so... && val() != "" + //$('#' + id).parent().attr('class','form-group has-error'); + //$('#inputSSO').siblings('span').text('SSO is currently in use.'); + //flag = 1; + + //if not... && val() != "" + //$('#' + id).parent().attr('class','form-group'); + //$('#' + id).siblings('span').text(''); + } + + window.onclick = function(event) { + var modal = document.getElementById('missingcontent'); + if(event.target == modal) + modal.style.display = "none"; + } + \ No newline at end of file diff --git a/src/database/EmployeeQueries.java b/src/database/EmployeeQueries.java index 981329b..ecb5687 100644 --- a/src/database/EmployeeQueries.java +++ b/src/database/EmployeeQueries.java @@ -40,7 +40,9 @@ public static User getEmployeeByID(int id) throws ClassNotFoundException, SQLExc id, resultSet.getInt("Location_ID"), resultSet.getString("Name"), - resultSet.getString("Phone_Number") + resultSet.getString("Phone_Number"), + resultSet.getString("Email"), + resultSet.getInt("Img_Index") ); resultSet = statement.executeQuery("SELECT Address FROM location WHERE Location_ID = "+employee.getLocation()); resultSet.next(); diff --git a/src/entities/Admin.java b/src/entities/Admin.java index d6fe586..2ebfd89 100644 --- a/src/entities/Admin.java +++ b/src/entities/Admin.java @@ -6,8 +6,8 @@ */ public class Admin extends User { - public Admin(int id, int location, String name, String phone) { - super(id, location, name, phone); + public Admin(int id, int location, String name, String phone, String email, int icon) { + super(id, location, name, phone, email, icon); } } diff --git a/src/entities/User.java b/src/entities/User.java index 5545d91..cec664c 100644 --- a/src/entities/User.java +++ b/src/entities/User.java @@ -6,13 +6,26 @@ public class User { private String locationName; private String name; private String phone; +private String email; +private int icon; - public User(int id, int location, String name, String phone){ + public User(int id, int location, String name, String phone, String email, int icon){ this.id = id; this.location = location; this.name = name; //later will do table lookup to determine by id this.phone = phone; + this.email = email; + this.icon = icon; } + + public int getIcon(){ + return icon; + } + + public String getEmail(){ + return email; + } + public int getID() { return id; From 86a6a3804f18e0b8398631d675730c289601dd89 Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Thu, 6 Apr 2017 21:44:36 -0400 Subject: [PATCH 4/5] Quick fix --- WebContent/html/webpages/ticketAdminRedirect.jsp | 2 +- src/database/EmployeeQueries.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/html/webpages/ticketAdminRedirect.jsp b/WebContent/html/webpages/ticketAdminRedirect.jsp index 6e61fbe..37cb521 100644 --- a/WebContent/html/webpages/ticketAdminRedirect.jsp +++ b/WebContent/html/webpages/ticketAdminRedirect.jsp @@ -20,7 +20,7 @@ diff --git a/src/database/EmployeeQueries.java b/src/database/EmployeeQueries.java index c8e58d5..08a3fba 100644 --- a/src/database/EmployeeQueries.java +++ b/src/database/EmployeeQueries.java @@ -68,7 +68,7 @@ public static User[] getAllUsers() throws SQLException, ClassNotFoundException{ //iterate result set while(resultSet.next()){ - users[counter] = new User(resultSet.getInt("Employee_ID"),resultSet.getInt("Location_ID"),resultSet.getString("Name"),resultSet.getString("Phone_Number")); + users[counter] = new User(resultSet.getInt("Employee_ID"),resultSet.getInt("Location_ID"),resultSet.getString("Name"),resultSet.getString("Phone_Number"),resultSet.getString("Email"),resultSet.getInt("Img_Index")); counter++; } From 7b2f7963fb6bf01a60a24d0c77e6407907ca8c44 Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Thu, 6 Apr 2017 22:13:59 -0400 Subject: [PATCH 5/5] BETA IS READY --- WebContent/html/javascript/request.jsp | 11 +++++++++-- src/database/DeviceQueries.java | 26 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/WebContent/html/javascript/request.jsp b/WebContent/html/javascript/request.jsp index 5414824..dd78f9a 100644 --- a/WebContent/html/javascript/request.jsp +++ b/WebContent/html/javascript/request.jsp @@ -8,7 +8,7 @@ <% -Device[] mydevices = DeviceQueries.getAllDevices(); +Device[] mydevices = DeviceQueries.getAvailableDevices(); //string representation of array. String deviceString = Device.arrayToString(mydevices); //out.println(description); @@ -150,7 +150,8 @@ function addToCart(){ if(!inCart(id)){ //if not in the cart var cart = getCartItems(); //this is an array id = parseInt(id,10); //this gets just the numerical value from the id! - cart.push(devices[id - 1]); //push to bottom of cart + var device = getDevice(id); + cart.push(device); //push to bottom of cart localStorage.setItem('cart', JSON.stringify(cart)); $('#added').fadeIn(1000); $('#added').fadeIn(1000); @@ -189,6 +190,12 @@ function makeDeviceArray(){ window.json = '<%=deviceString%>'; return JSON.parse(window.json); } +function getDevice(id){ + for(var i = 0; i < devices.length; i++){ + if(id == devices[i].id) + return devices[i]; + } +} //this code allows a message to appear that indicates that the item was successfully placed in the shopping cart. diff --git a/src/database/DeviceQueries.java b/src/database/DeviceQueries.java index 5e3dc3a..54986d5 100644 --- a/src/database/DeviceQueries.java +++ b/src/database/DeviceQueries.java @@ -62,6 +62,32 @@ public static Device[] getAllDevices() throws SQLException, ClassNotFoundExcepti return devices; } + public static Device[] getAvailableDevices() throws SQLException, ClassNotFoundException{ + //database connect + System.getenv("VCAP_SERVICES"); + Class.forName("com.mysql.jdbc.Driver"); + Connection connection = DriverManager.getConnection(database, user, password); + Statement stmt = connection.createStatement(); + ResultSet resultSet = stmt.executeQuery("SELECT * FROM devices WHERE Status = \"Available\""); + int counter = 0; + + resultSet.last(); + int rows = resultSet.getRow(); + resultSet.beforeFirst(); + + //Covers amount of rows, and 6 attributes (indices 0-5) + Device[] devices = new Device[rows]; + + //iterate result set + while(resultSet.next()){ + devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getInt("NFC_ID")); + counter++; + } + stmt.close(); + connection.close(); + return devices; + } + /** * This function will take devices as input and return them. * More specifically, the input will be a string that looks like an array.