Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

arc12012 · Apr 21, 2017 · 1f3595a · 1f3595a
2 parents 30999b4 + 49c6fbf
commit 1f3595a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,12 @@
-# [Synchrony Financial Mobile Device Tracking System](https://seniordesign.cfapps.io/html/webpages/)
+# [Innovation Hub](https://seniordesign.cfapps.io/html/webpages/)
 In the Innovation Station at Synchrony Financial, applications are used by over 60 million cardholders across the US, and those customers use a huge variety of devices to access them.  To make sure applications work on all devices they house hundreds of smart phones, tablets, and other connected devices to test with.  The devices are lent to employees across the country for their individual testing needs.
 
 The goal of this project is to build and design an application that allows employees to view a list of available devices, allow employees to request one of those devices, and for it to be shipped for their testing needs. The current goal of this project is to design this as a Java web application that will work proficiently on phones and desktops.
 
 Team member on this project include:
-* Brianna Boyce
+* Connor Jackson
 * Adam Claxton
+* Brianna Boyce
 * John Costa
 * Maegan Dyakiw
-* Connor Jackson
+
diff --git a/WebContent/html/webpages/redirect/orderFormHandler.jsp b/WebContent/html/webpages/redirect/orderFormHandler.jsp
@@ -32,8 +32,7 @@ if(Integer.parseInt(request.getParameter("location_dropdown"))==0)
 			request.getParameter("state"),
 			request.getParameter("zip"),
 			Integer.parseInt(navsso),
-			"",
-			"")
+			"","",0,0)
 		);
 }
 

diff --git a/WebContent/html/webpages/returnComplete.jsp b/WebContent/html/webpages/returnComplete.jsp
@@ -1,4 +1,4 @@
-<%@ page import = "database.*,entities.RentedDevice" %>
+<%@ page import = "database.*" %>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
@@ -37,8 +37,8 @@
 </div>
 <%
 //get string from request form
-//String devices = request.getParameter("devicesToReturn");
-//DeviceQueries.returnDevices(devices);
+String devices = request.getParameter("devicesToReturn");
+DeviceQueries.returnDevices(devices);
 %>
 </body>
 </html>