diff --git a/WebContent/html/webpages/adminLocation.jsp b/WebContent/html/webpages/adminLocation.jsp new file mode 100644 index 0000000..7e8db38 --- /dev/null +++ b/WebContent/html/webpages/adminLocation.jsp @@ -0,0 +1,389 @@ +<%@ page import = "database.MySQLAccess,entities.Location" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + + + + + + + + Synchrony Financial + + + + + + + + + + + + + + +
+ +
+ + + + + + +
+ +

Location Listing

+ + + + + + + + + + + + + +
NameAddressTownStateZip Code
+ +
+<% +//database connection +MySQLAccess myaccess = new MySQLAccess(); +//database query +Location[] locations = myaccess.getLocations(); +//string representation of array. +String locationString = Location.arrayToString(locations); +locationString = locationString.replace("'","\\'"); +%> + + + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/index.html b/WebContent/html/webpages/index.html index 20bd2a7..3399075 100644 --- a/WebContent/html/webpages/index.html +++ b/WebContent/html/webpages/index.html @@ -53,7 +53,7 @@

Request

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

- +

Return

All set with a device? No problem! You can return it here!

diff --git a/WebContent/html/webpages/locationRedirect.jsp b/WebContent/html/webpages/locationRedirect.jsp new file mode 100644 index 0000000..967f9da --- /dev/null +++ b/WebContent/html/webpages/locationRedirect.jsp @@ -0,0 +1,64 @@ +<%@ page import = "database.MySQLAccess,entities.Location" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + + + + + + + + Synchrony Financial + + + + + + + + + + +

Redirect Page

+

You shouldn't be seeing this page :)

+ +<% +//make instance +MySQLAccess myaccess = new MySQLAccess(); +String name = request.getParameter("name").replace("\"","\\\""); +String address = request.getParameter("address").replace("\"","\\\""); +String town = request.getParameter("town").replace("\"","\\\""); +String state = request.getParameter("state"); +String zip = request.getParameter("zip"); +//add form was submitted +if(request.getParameter("add") != null){ + Location location = new Location(name,address,town,state,zip); + myaccess.addLocation(location); +} +//modify form was submitted +if(request.getParameter("modify") != null){ + //getParameter() always returns string + String strID = request.getParameter("id"); + //turn to int for constructor + int id = Integer.parseInt(strID); + Location location = new Location(id,name,address,town,state,zip); + myaccess.modifyLocation(location); +} +//delete form was submitted +if(request.getParameter("delete") != null){ + String strID = request.getParameter("id"); + int id = Integer.parseInt(strID); + myaccess.deleteLocation(id); +} +%> + + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/profileSettings.html b/WebContent/html/webpages/profileSettings.html index b907797..ea0abb4 100644 --- a/WebContent/html/webpages/profileSettings.html +++ b/WebContent/html/webpages/profileSettings.html @@ -57,8 +57,10 @@ + +

    User Profile Settings

    @@ -67,6 +69,7 @@

    User Profile Settings

+ @@ -244,7 +247,9 @@ function returnDevice() } //place html in body document.getElementById("tablebody").innerHTML = html; - //show modal + //place input in form + $('#deviceArray').val(arrayToString(toReturn)); + //show modal $('#orderInfoModal').show(); } @@ -252,7 +257,22 @@ function returnDevice() function hidePopup(){ $('#orderInfoModal').hide(); } + +//Turns array to string, which can be submitted on the form when actually returning +//The string will contain the ID's of devices to be returned, and this will be sent to the database! +function arrayToString(array){ + var sb = "["; + for(var i = 0; i < array.length; i++){ + //get the return id, go to that index in queried devices, and get that id! + sb+= devices[array[i]].id; + if(i != array.length-1) + sb+=","; + } + sb+="]"; + return sb; +} - \ No newline at end of file + + \ No newline at end of file diff --git a/src/database/MySQLAccess.java b/src/database/MySQLAccess.java index e39c64d..6c38199 100644 --- a/src/database/MySQLAccess.java +++ b/src/database/MySQLAccess.java @@ -3,6 +3,7 @@ import java.sql.*; import entities.ListedDevice; +import entities.Location; import entities.RentedDevice; public class MySQLAccess { @@ -24,7 +25,7 @@ public RentedDevice[] getUserDevices(String userID) throws SQLException, ClassNo 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); + ResultSet resultSet = stmt.executeQuery("SELECT Device_ID, Device_Name, Device_Description, Ticket_ID, Hardware, Model, Borrow_Date FROM devices WHERE Renter = " + userID + " AND Status <> \"Available\" AND Status <> \"Returning \""); int counter = 0; resultSet.last(); @@ -44,7 +45,7 @@ public RentedDevice[] getUserDevices(String userID) throws SQLException, ClassNo } 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 + //database connect 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"); @@ -68,6 +69,111 @@ public ListedDevice[] getAllDevices() throws SQLException, ClassNotFoundExceptio 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. + * The values in this array correspond to device ID's. + * @param devices + * @throws ClassNotFoundException + * @throws SQLException + */ + public void returnDevices(String devices) throws ClassNotFoundException, SQLException{ + //connect to DB + 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(); + //make into string array; queries need to have numbers as strings! + String[] deviceArray = devices.replaceAll("\\[","").replaceAll("\\]","").replaceAll("\\s","").split(","); + for(int i = 0; i < deviceArray.length; i++){ + //update statement + stmt.executeUpdate("UPDATE devices SET Status = \"Returning\" WHERE Device_ID = " + deviceArray[i]); + } + System.out.println("\nUpdates complete\n"); + } + + public Location[] getLocations() throws ClassNotFoundException, SQLException{ + //database connect + 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 location WHERE Zip_Code <> \"00000\""); + int counter = 0; + + resultSet.last(); + int rows = resultSet.getRow(); + resultSet.beforeFirst(); + + //Covers amount of rows, and 6 attributes (indices 0-5) + Location[] locations = new Location[rows]; + + //iterate result set + while(resultSet.next()){ + locations[counter] = new Location(resultSet.getInt("Location_ID"),resultSet.getString("Name"),resultSet.getString("Address"),resultSet.getString("Town"),resultSet.getString("State"),resultSet.getString("Zip_Code")); + counter++; + } + stmt.close(); + connect.close(); + return locations; + } + + /** + * Adds location to mySQL database. + * @throws ClassNotFoundException + * @throws SQLException + */ + public void addLocation(Location location) throws ClassNotFoundException, SQLException{ + 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(); + int i = -1; + while(i <= 0){ + ResultSet results = stmt.executeQuery("SELECT * from location ORDER BY Location_ID"); + results.last(); + //gets largest ID + int id = results.getInt("Location_ID"); + id++; + //tries this statement, otherwise tries again with a new id + i = stmt.executeUpdate("INSERT INTO location (Location_ID,Name,Address,Town,State,Zip_Code) VALUES (" + id +",\"" + location.getName() + "\",\"" + location.getAddress()+ "\",\"" + location.getTown() + "\",\"" + location.getState() + "\",\"" + location.getZip()+ "\")"); + } + stmt.close(); + connect.close(); + } + + /** + * Updates a location, assuming that all input fields have been changed. + * @param location + * @throws ClassNotFoundException + * @throws SQLException + */ + public void modifyLocation(Location location) throws ClassNotFoundException, SQLException{ + 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(); + stmt.executeUpdate("UPDATE location SET Name = \"" + location.getName() + "\", Address = \"" + location.getAddress() + "\", Town = \"" + location.getTown() + "\", State = \"" + location.getState() + "\", Zip_Code = \"" + location.getZip() + "\" WHERE Location_ID = " + location.getID()); + stmt.close(); + connect.close(); + } + + /** + * Deletes a location based on input id. + * @param id + * @throws ClassNotFoundException + * @throws SQLException + */ + public void deleteLocation(int id) throws ClassNotFoundException, SQLException{ + 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(); + stmt.executeUpdate("DELETE from location WHERE Location_ID = " + id); + stmt.close(); + connect.close(); + } + public String[][] getResult(){ return result; } diff --git a/src/entities/Location.java b/src/entities/Location.java new file mode 100644 index 0000000..91fe562 --- /dev/null +++ b/src/entities/Location.java @@ -0,0 +1,107 @@ +package entities; + +/** + * Representation of locations from database. + * @author conno + * + */ +public class Location { + private int id; + private String name; + private String address; + private String town; + private String state; + private String zip; + + /** + * Constructor for existing location. + * @param name + * @param address + * @param town + * @param state + * @param zip + */ + public Location(int id, String name, String address, String town, String state, String zip){ + this.id = id; + this.name = name; + this.address = address; + this.town = town; + this.state = state; + this.zip = zip; + } + + /** + * Constructor for brand new location. + * @param name + * @param address + * @param town + * @param state + * @param zip + */ + public Location(String name, String address, String town, String state, String zip){ + this.name = name; + this.address = address; + this.town = town; + this.state = state; + this.zip = zip; + } + + /** + * Make JSON representation of location. + */ + public String toString(){ + StringBuilder sb = new StringBuilder(); + String comma = ", "; + sb.append("{\"name\": \"").append(name.replace("\"", """)).append("\"").append(comma); + sb.append("\"id\": ").append(id).append(comma); + sb.append("\"address\": \"").append(address.replace("\"", """)).append("\"").append(comma); + sb.append("\"town\": \"").append(town.replace("\"", """)).append("\"").append(comma); + sb.append("\"state\": \"").append(state).append("\"").append(comma); + sb.append("\"zip\": \"").append(zip).append("\""); + sb.append("}"); + return sb.toString(); + } + + /** + * This is a static function which will turn a Location array into its proper string. + * @param array + * @return + */ + public static String arrayToString(Location[] 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(); + } + + public int getID(){ + return id; + } + + public String getName(){ + return name; + } + + public String getAddress(){ + return address; + } + + public String getTown(){ + return town; + } + + public String getState(){ + return state; + } + + public String getZip(){ + return zip; + } + +}