From 1e34125ca8f7fa7f0d8c17adc6c581f68decc519 Mon Sep 17 00:00:00 2001
From: Adam R Claxton <adam.claxton@uconn.edu>
Date: Wed, 29 Mar 2017 23:57:45 -0400
Subject: [PATCH] Shopping cart locations properly make use of employee flags
 when reading from and writing to db

---
 WebContent/html/webpages/orderFormHandler.jsp |  3 ++-
 WebContent/html/webpages/shoppingCart.jsp     |  5 ++---
 src/database/MySQLAccess.java                 |  9 +++++----
 src/entities/Location.java                    | 18 ++++++++++++++++++
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/WebContent/html/webpages/orderFormHandler.jsp b/WebContent/html/webpages/orderFormHandler.jsp
index 09bec68..218df89 100644
--- a/WebContent/html/webpages/orderFormHandler.jsp
+++ b/WebContent/html/webpages/orderFormHandler.jsp
@@ -29,7 +29,8 @@ if(Integer.parseInt(request.getParameter("location_dropdown"))==0)
 			request.getParameter("state"),
 			request.getParameter("address"),
 			request.getParameter("town"),
-			Integer.parseInt(request.getParameter("zip"))
+			request.getParameter("zip"),
+			sso
 		);
 }
 
diff --git a/WebContent/html/webpages/shoppingCart.jsp b/WebContent/html/webpages/shoppingCart.jsp
index 812c005..efbaa51 100644
--- a/WebContent/html/webpages/shoppingCart.jsp
+++ b/WebContent/html/webpages/shoppingCart.jsp
@@ -403,7 +403,7 @@ function forceDropdownCustomLocation() {
 
 function getLocations() {
     <%
-    Location[] loci = access.getLocations(  );
+    Location[] loci = access.getLocations(sso);
     for(int i=0; i<loci.length; i++)
     {
         System.out.println(loci[i].getName());
@@ -431,8 +431,7 @@ function getLocations() {
 function submitOrderForm() {
     // This is called just before order form is submitted. In order for any database activity to occur,
     // we must first append the employees ID as well as the ids of whatever devices are selected.
-    // If nothing is checked then nust don't bother submitting form
-    if(checked.length == 0) break;
+
     // First, employee id
     userID=getUserID();
     document.orderForm.userID.value=userID;
diff --git a/src/database/MySQLAccess.java b/src/database/MySQLAccess.java
index f137110..c2e5fd0 100644
--- a/src/database/MySQLAccess.java
+++ b/src/database/MySQLAccess.java
@@ -14,7 +14,7 @@ public class MySQLAccess {
 	String user = "b372dfe7409692";
 	String password = "74f6e317";
 	String[][] result = new String[20][3];
-	
+
 	public Statement connectDB() throws SQLException, ClassNotFoundException {
 		Class.forName("com.mysql.jdbc.Driver");
 		Connection connect = DriverManager.getConnection(database, user, password);
@@ -101,9 +101,9 @@ public String locationIntToString(int locInt) throws ClassNotFoundException, SQL
 	}
 
 	// returns ID of new location
-	public int addLocation(String name, String state, String address, String town, int zip) throws SQLException, ClassNotFoundException
+	public int addLocation(String name, String state, String address, String town, String zip, int userID) throws SQLException, ClassNotFoundException
 	{
-		return addLocation(new Location(name, address, town, state, ""+zip));
+		return addLocation(new Location(name, address, town, state, zip, userID));
 	}
 
 	// returns ID of new location
@@ -122,7 +122,8 @@ public int addLocation(Location location) throws SQLException, ClassNotFoundExce
 			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()+ "\")");
+			System.out.println("INSERT INTO location (Location_ID,Name,Address,Town,State,Zip_Code,Employee_Flag) VALUES (" + id +",\"" + location.getName() + "\",\"" + location.getAddress()+ "\",\"" + location.getTown() + "\",\"" + location.getState() + "\",\"" + location.getZip()+"\","+location.getEmployeeFlag()  + ")");
+			i = stmt.executeUpdate("INSERT INTO location (Location_ID,Name,Address,Town,State,Zip_Code,Employee_Flag) VALUES (" + id +",\"" + location.getName() + "\",\"" + location.getAddress()+ "\",\"" + location.getTown() + "\",\"" + location.getState() + "\",\"" + location.getZip()+"\","+location.getEmployeeFlag()  + ")");
 		}
 		stmt.close();
 		connect.close();
diff --git a/src/entities/Location.java b/src/entities/Location.java
index 91fe562..a2a19d8 100644
--- a/src/entities/Location.java
+++ b/src/entities/Location.java
@@ -12,6 +12,7 @@ public class Location {
 	private String town;
 	private String state;
 	private String zip;
+	private int employee_flag;
 	
 	/**
 	 * Constructor for existing location.
@@ -46,6 +47,15 @@ public Location(String name, String address, String town, String state, String z
 		this.zip = zip;
 	}
 	
+	public Location(String name, String address, String town, String state, String zip, int employee_flag) {
+		this.name = name;
+		this.address = address;
+		this.town = town;
+		this.state = state;
+		this.zip = zip;
+		this.employee_flag = employee_flag;
+	}
+
 	/**
 	 * Make JSON representation of location.
 	 */
@@ -103,5 +113,13 @@ public String getState(){
 	public String getZip(){
 		return zip;
 	}
+	public void setEmployeeFlag(int ID)
+	{
+		employee_flag=ID;
+	}
+	public int getEmployeeFlag()
+	{
+		return employee_flag;
+	}
 	
 }