From 7e61ec86140bfd941181d6d0c637c4c9a0d9a6be Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Thu, 20 Apr 2017 21:23:24 -0400 Subject: [PATCH 1/2] Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8ee797b..bf30d82 100644 --- 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 + From 49c6fbf127dfae8074d42078a227b2f0fc87e169 Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Thu, 20 Apr 2017 21:35:20 -0400 Subject: [PATCH 2/2] Obliterating Rented Device --- WebContent/html/webpages/redirect/orderFormHandler.jsp | 3 +-- WebContent/html/webpages/returnComplete.jsp | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/WebContent/html/webpages/redirect/orderFormHandler.jsp b/WebContent/html/webpages/redirect/orderFormHandler.jsp index 08ac232..b2c680a 100644 --- 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 index 5d42fb0..6133e6c 100644 --- 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"%> @@ -37,8 +37,8 @@ <% //get string from request form -//String devices = request.getParameter("devicesToReturn"); -//DeviceQueries.returnDevices(devices); +String devices = request.getParameter("devicesToReturn"); +DeviceQueries.returnDevices(devices); %> \ No newline at end of file