diff --git a/WebContent/html/javascript/listing.jsp b/WebContent/html/javascript/listing.jsp index b9b2c73..64ca8fc 100644 --- a/WebContent/html/javascript/listing.jsp +++ b/WebContent/html/javascript/listing.jsp @@ -1,183 +1,128 @@ -<%@ page import = "database.MySQLAccess,entities.ListedDevice" %> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - -<% -MySQLAccess myaccess = new MySQLAccess(); -ListedDevice[] mydevices = myaccess.getAllDevices(); - -//string representation of array. -String deviceString = ListedDevice.arrayToString(mydevices); -//out.println(description); -//out.println(hardware); - -%> - - - +<%@ page import = "database.MySQLAccess,entities.ListedDevice" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> + + + + +Insert title here + + +<% +MySQLAccess myaccess = new MySQLAccess(); +ListedDevice[] mydevices = myaccess.getAllDevices(); + +//string representation of array. +String deviceString = ListedDevice.arrayToString(mydevices); +//out.println(description); +//out.println(hardware); + +%> + + + \ No newline at end of file diff --git a/WebContent/html/javascript/navbar.js b/WebContent/html/javascript/navbar.js index 3e706ea..ba46607 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/request.js b/WebContent/html/javascript/request.js deleted file mode 100644 index 62ebde9..0000000 --- a/WebContent/html/javascript/request.js +++ /dev/null @@ -1,193 +0,0 @@ -//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; - } - } - -} -var dev1 = { - id: 1, - name:"George", - description:"George is probably the coolest iPhone to exist. Ever. Point blank, period.", - hardware:"iphone", - software:"apple", -}; - -var dev2 = { - id: 2, - name:"Greyson", - description:"Greyson is pretty cool.. I guess.", - hardware:"iphone", - software:"apple", -}; - -var dev3 = { - id: 3, - name:"Linkin Park", - description:'"The hardest part of ending is starting again."', - hardware:"ipad", - software:"apple", -}; - -var dev4 = { - id: 4, - name:"Abercrombie", - description:"To all the people that hated me in high school, I have the prettiest clothes you all wear now!!", - hardware:"ipad", - software:"apple", -}; - -var dev5 = { - id: 5, - name:"Hulk", - description:"Go ahead and HULK SMASH! this awesome computer stick into your USB.", - hardware:"computerStick", - software:"intel", -}; - -var dev6 = { - id: 6, - name:"Captain America", - description:'"Make America Great Again. Wait, thats someone else.."', - hardware:"computerStick", - software:"intel", -}; - -var devices = [dev1, dev2, dev3, dev4, dev5, dev6]; - -//add event listeners to the options in the left sidebar -for(var a = 0; a < options.length; a++){ - options[a].addEventListener('click', show); -} - -//when an option is selected, show a new list of devices based on what the user asked for -function show(){ - - currentFilter = readFilter(); - selectedDevices = getDevices(currentFilter); //when connor is done with the database library getDevices should be redirected there - - - - var html = ''; - - //iterate through the hardcoded device DB and select all the ones that match the selected option - for(var i = 0; i < devices.length; i++){ - if((hw_type.localeCompare(devices[i].hardware) == 0 && sw_type.localeCompare(devices[i].software) == 0) && !isUnavailable(i)){ - html += '
' + devices[i].name + '

' + devices[i].description + '



' - } - } - - if(html.localeCompare("")==0) - html += "

There are no devices with the search criteria: " + this.textContent + "

"; - - //add to HTML page - document.getElementById('devContainer').innerHTML = html; - - //now we need to add event listeners to all the request buttons - var requestbuttons = document.getElementsByClassName('requestbutton'); - for(var i = 0; i < requestbuttons.length; i++){ - requestbuttons[i].addEventListener('click',addToCart); - } -} - -function readFilter() { - //Constrcts a filter object for use in the database library that corresponds to the checked optionsin the sidebar - var hw_type; - var sw_type; - -} - -function addToCart(){ - var id = this.getAttribute('id'); - id = parseInt(id.replace(/[^0-9\.]/g,''),10); //this gets just the numerical value from the id! - if(!inCart(id)){ //if not in the cart - var cart = getCartItems(); //this is an array - cart.push(id); //push to bottom of cart - localStorage.setItem('cart', JSON.stringify(cart)); - $('#added').fadeIn(1000); - $('#added').fadeIn(1000); - $('#added').fadeOut(1000); - } - else{ - $('#already').fadeIn(1000); - $('#already').fadeIn(1000); - $('#already').fadeOut(1000); - } -} - -function inCart(id){ - var cart = getCartItems(); - if(cart.length == 0) //if nothing's in the cart - return 0; - else{ //something is in the cart - for(var i = 0; i < cart.length; i++){ - if(cart[i] === id) - return 1; - } - } - return 0; -} - -function getCartItems(){ - //initiate array for them - var cart = new Array; - //get them from local storage - var cart_str = localStorage.getItem('cart'); - //if there is at least one object already we need to convert it from JSON to string - if (cart_str !== null && cart_str !== "") { - cart = JSON.parse(cart_str); - } - return cart; -} - -function getUnavailableItems(){ - var unavailable = new Array; - var unavailable_str = localStorage.getItem('unavailable'); - if(unavailable_str !== "" && unavailable_str !== null){ - unavailable = JSON.parse(unavailable_str); - } - return unavailable; -} - -function isUnavailable(id){ - var unavailable = getUnavailableItems(); - if(unavailable.length == 0) - return 0; - else{ - for(var i = 0; i < unavailable.length; i++){ - if(unavailable[i] == (id+1)) - return 1; - } - } - return 0; -} - -//this code allows a message to appear that indicates that the item was successfully placed in the shopping cart. diff --git a/WebContent/html/javascript/request.jsp b/WebContent/html/javascript/request.jsp new file mode 100644 index 0000000..b1cca96 --- /dev/null +++ b/WebContent/html/javascript/request.jsp @@ -0,0 +1,195 @@ +<%@ page import = "database.MySQLAccess,entities.ListedDevice" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> + + + + +Insert title here + + +<% +MySQLAccess myaccess = new MySQLAccess(); +ListedDevice[] mydevices = myaccess.getAllDevices(); + +//string representation of array. +String deviceString = ListedDevice.arrayToString(mydevices); +//out.println(description); +//out.println(hardware); + +%> + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/index.html b/WebContent/html/webpages/index.html index 5f5a100..20bd2a7 100644 --- a/WebContent/html/webpages/index.html +++ b/WebContent/html/webpages/index.html @@ -47,7 +47,7 @@
- +

Request

Check out our selection of devices that YOU have the chance to check out!

diff --git a/WebContent/html/webpages/listingPage.jsp b/WebContent/html/webpages/listingPage.jsp index a5b1633..c7ec3f2 100644 --- a/WebContent/html/webpages/listingPage.jsp +++ b/WebContent/html/webpages/listingPage.jsp @@ -53,20 +53,27 @@
- -
- -
+
    +

    Device Type

    +
    • +
    • +
    • +
    • +
    • +
    • +
+ +
+
    +

    Manufacturer

    +
    • +
    • +
    • +
    • +
    • +
    • +
+

Device Dictionary

diff --git a/WebContent/html/webpages/requestPage.html b/WebContent/html/webpages/requestPage.jsp similarity index 75% rename from WebContent/html/webpages/requestPage.html rename to WebContent/html/webpages/requestPage.jsp index e4d7bb8..ba18e78 100644 --- a/WebContent/html/webpages/requestPage.html +++ b/WebContent/html/webpages/requestPage.jsp @@ -66,22 +66,22 @@

    Hardware Type

    -
    • -
    • -
    • -
    • -
    • -
    • +
    • +
    • +
    • +
    • +
    • +

    Manufacture

    -
    • -
    • -
    • -
    • -
    • -
    • +
    • +
    • +
    • +
    • +
    • +
@@ -98,7 +98,7 @@

Available Devices

Already in Cart

- + <%@ include file="../javascript/request.jsp" %> \ No newline at end of file diff --git a/src/database/MySQLAccess.java b/src/database/MySQLAccess.java index 2aeeb84..e39c64d 100644 --- a/src/database/MySQLAccess.java +++ b/src/database/MySQLAccess.java @@ -1,74 +1,74 @@ -package database; - -import java.sql.*; - -import entities.ListedDevice; -import entities.RentedDevice; - -public class MySQLAccess { - +package database; + +import java.sql.*; + +import entities.ListedDevice; +import entities.RentedDevice; + +public class MySQLAccess { + String[][] result = new String[20][3]; - public void connectDB() throws SQLException, ClassNotFoundException { + public Statement connectDB() throws SQLException, ClassNotFoundException { Class.forName("com.mysql.jdbc.Driver"); Connection connect = DriverManager.getConnection("jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317", "b372dfe7409692", "74f6e317"); Statement statement = connect.createStatement(); return statement; - } - - public RentedDevice[] getUserDevices(String userID) throws SQLException, ClassNotFoundException{ - //Not sure how to get cookie information (if that is how we choose to accomplish this...) ? But this should be a passed parameter - System.getenv("VCAP_SERVICES"); - Class.forName("com.mysql.jdbc.Driver"); - Connection connect = DriverManager.getConnection("jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317", "b372dfe7409692", "74f6e317"); - Statement stmt = connect.createStatement(); - ResultSet resultSet = stmt.executeQuery("SELECT Device_ID, Device_Name, Device_Description, Ticket_ID, Hardware, Model, Borrow_Date FROM devices WHERE Renter = " + userID); - int counter = 0; - - resultSet.last(); - int rows = resultSet.getRow(); - resultSet.beforeFirst(); - - //Covers amount of rows, and 6 attributes (indices 0-5) - RentedDevice[] devices = new RentedDevice[rows]; - - //iterate result set - while(resultSet.next()){ - devices[counter] = new RentedDevice(resultSet.getInt("Device_ID") + "",resultSet.getString("Device_Name"),resultSet.getString("Device_Description"),resultSet.getInt("Ticket_ID") + "",resultSet.getString("Hardware"),resultSet.getString("Model"),resultSet.getString("Borrow_Date")); - counter++; - } - - return devices; - } - - public ListedDevice[] getAllDevices() throws SQLException, ClassNotFoundException{ - //Not sure how to get cookie information (if that is how we choose to accomplish this...) ? But this should be a passed parameter - System.getenv("VCAP_SERVICES"); - Class.forName("com.mysql.jdbc.Driver"); - Connection connect = DriverManager.getConnection("jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317", "b372dfe7409692", "74f6e317"); - Statement stmt = connect.createStatement(); - ResultSet resultSet = stmt.executeQuery("SELECT * FROM devices"); - int counter = 0; - - resultSet.last(); - int rows = resultSet.getRow(); - resultSet.beforeFirst(); - - //Covers amount of rows, and 6 attributes (indices 0-5) - ListedDevice[] devices = new ListedDevice[rows]; - - //iterate result set - while(resultSet.next()){ - devices[counter] = new ListedDevice(resultSet.getString("Device_Name"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"),resultSet.getString("Model")); - counter++; - } - - return devices; - } - - public String[][] getResult(){ - return result; - } + } + + public RentedDevice[] getUserDevices(String userID) throws SQLException, ClassNotFoundException{ + //Not sure how to get cookie information (if that is how we choose to accomplish this...) ? But this should be a passed parameter + System.getenv("VCAP_SERVICES"); + Class.forName("com.mysql.jdbc.Driver"); + Connection connect = DriverManager.getConnection("jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317", "b372dfe7409692", "74f6e317"); + Statement stmt = connect.createStatement(); + ResultSet resultSet = stmt.executeQuery("SELECT Device_ID, Device_Name, Device_Description, Ticket_ID, Hardware, Model, Borrow_Date FROM devices WHERE Renter = " + userID); + int counter = 0; + + resultSet.last(); + int rows = resultSet.getRow(); + resultSet.beforeFirst(); + + //Covers amount of rows, and 6 attributes (indices 0-5) + RentedDevice[] devices = new RentedDevice[rows]; + + //iterate result set + while(resultSet.next()){ + devices[counter] = new RentedDevice(resultSet.getInt("Device_ID") + "",resultSet.getString("Device_Name"),resultSet.getString("Device_Description"),resultSet.getInt("Ticket_ID") + "",resultSet.getString("Hardware"),resultSet.getString("Model"),resultSet.getString("Borrow_Date")); + counter++; + } + + return devices; + } + + public ListedDevice[] getAllDevices() throws SQLException, ClassNotFoundException{ + //Not sure how to get cookie information (if that is how we choose to accomplish this...) ? But this should be a passed parameter + System.getenv("VCAP_SERVICES"); + Class.forName("com.mysql.jdbc.Driver"); + Connection connect = DriverManager.getConnection("jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317", "b372dfe7409692", "74f6e317"); + Statement stmt = connect.createStatement(); + ResultSet resultSet = stmt.executeQuery("SELECT * FROM devices"); + int counter = 0; + + resultSet.last(); + int rows = resultSet.getRow(); + resultSet.beforeFirst(); + + //Covers amount of rows, and 6 attributes (indices 0-5) + ListedDevice[] devices = new ListedDevice[rows]; + + //iterate result set + while(resultSet.next()){ + devices[counter] = new ListedDevice(resultSet.getString("Device_Name"),resultSet.getString("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status")); + counter++; + } + + return devices; + } + + public String[][] getResult(){ + return result; + } } diff --git a/src/entities/ListedDevice.java b/src/entities/ListedDevice.java index 77877dc..2be3fd5 100644 --- a/src/entities/ListedDevice.java +++ b/src/entities/ListedDevice.java @@ -6,14 +6,20 @@ */ public class ListedDevice { private String Device_Name; + private String Device_ID; private String Device_Description; private String Hardware; private String Model; - public ListedDevice(String name, String desc, String hardware, String model) { + private String Manu; + private String Status; + public ListedDevice(String name, String id, String desc, String hardware, String model, String manufacturer, String available) { + Device_ID = id; Device_Name = name; Device_Description = desc; Hardware = hardware; Model = model; + Manu = manufacturer; + Status = available; } /** * Formatting the device to fit a JSON object. @@ -23,9 +29,12 @@ public String toString(){ StringBuilder sb = new StringBuilder(); String comma = ", "; sb.append("{\"name\": \"").append(Device_Name).append("\"").append(comma); + sb.append("\"id\": \"").append(Device_ID).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("\"status\": \"").append(Status).append("\"").append(comma); + sb.append("\"model\": \"").append(Model).append("\"").append(comma); + sb.append("\"manufacturer\": \"").append(Manu).append("\""); sb.append("}"); return sb.toString(); }