From 8a01c2cb9f8c502dc19e8a23348fc652d5dcf7e7 Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Wed, 5 Apr 2017 21:58:41 -0400 Subject: [PATCH] More bug fixes --- WebContent/html/css/stylesheet.css | 1 - WebContent/html/webpages/admin.jsp | 2 +- WebContent/html/webpages/adminApprove.jsp | 2 +- .../html/webpages/adminDeviceSettings.jsp | 2 +- WebContent/html/webpages/adminLocation.jsp | 2 +- WebContent/html/webpages/index.jsp | 2 +- WebContent/html/webpages/listingPage.jsp | 2 +- WebContent/html/webpages/locationRedirect.jsp | 4 +- WebContent/html/webpages/map.jsp | 2 +- WebContent/html/webpages/navbar.html | 42 ------------------- WebContent/html/webpages/navbar.jsp | 4 +- WebContent/html/webpages/profileSettings.jsp | 2 +- WebContent/html/webpages/requestPage.jsp | 2 +- WebContent/html/webpages/returnComplete.jsp | 2 +- WebContent/html/webpages/shoppingCart.jsp | 2 +- 15 files changed, 15 insertions(+), 58 deletions(-) delete mode 100644 WebContent/html/webpages/navbar.html diff --git a/WebContent/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css index bbe9f43..514900a 100644 --- a/WebContent/html/css/stylesheet.css +++ b/WebContent/html/css/stylesheet.css @@ -14,7 +14,6 @@ div.sidebar{ border-right-style: solid; height: 100vh; background-color: #E9EAEB; - width: 300px; position: fixed; } diff --git a/WebContent/html/webpages/admin.jsp b/WebContent/html/webpages/admin.jsp index d3992f8..50e8781 100644 --- a/WebContent/html/webpages/admin.jsp +++ b/WebContent/html/webpages/admin.jsp @@ -67,7 +67,7 @@ div.approveConfirm {
diff --git a/WebContent/html/webpages/adminApprove.jsp b/WebContent/html/webpages/adminApprove.jsp index 3efebf8..ff675d6 100644 --- a/WebContent/html/webpages/adminApprove.jsp +++ b/WebContent/html/webpages/adminApprove.jsp @@ -66,7 +66,7 @@
diff --git a/WebContent/html/webpages/adminDeviceSettings.jsp b/WebContent/html/webpages/adminDeviceSettings.jsp index 35a010d..b841bc0 100644 --- a/WebContent/html/webpages/adminDeviceSettings.jsp +++ b/WebContent/html/webpages/adminDeviceSettings.jsp @@ -68,7 +68,7 @@ diff --git a/WebContent/html/webpages/adminLocation.jsp b/WebContent/html/webpages/adminLocation.jsp index 3462a71..1e75e6d 100644 --- a/WebContent/html/webpages/adminLocation.jsp +++ b/WebContent/html/webpages/adminLocation.jsp @@ -42,7 +42,7 @@ diff --git a/WebContent/html/webpages/index.jsp b/WebContent/html/webpages/index.jsp index 0f23040..8b1e8c1 100644 --- a/WebContent/html/webpages/index.jsp +++ b/WebContent/html/webpages/index.jsp @@ -42,7 +42,7 @@
diff --git a/WebContent/html/webpages/listingPage.jsp b/WebContent/html/webpages/listingPage.jsp index fa01508..9c1acdf 100644 --- a/WebContent/html/webpages/listingPage.jsp +++ b/WebContent/html/webpages/listingPage.jsp @@ -51,7 +51,7 @@
    diff --git a/WebContent/html/webpages/locationRedirect.jsp b/WebContent/html/webpages/locationRedirect.jsp index 6448035..5483488 100644 --- a/WebContent/html/webpages/locationRedirect.jsp +++ b/WebContent/html/webpages/locationRedirect.jsp @@ -20,7 +20,7 @@ @@ -36,7 +36,7 @@ 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); + Location location = new Location(name,address,town,state,zip,0); LocationQueries.addLocation(location); } //modify form was submitted diff --git a/WebContent/html/webpages/map.jsp b/WebContent/html/webpages/map.jsp index 7e1bc24..ac0a458 100644 --- a/WebContent/html/webpages/map.jsp +++ b/WebContent/html/webpages/map.jsp @@ -37,7 +37,7 @@

    Our Wonderful Synchrony Financial Map!

    diff --git a/WebContent/html/webpages/navbar.html b/WebContent/html/webpages/navbar.html deleted file mode 100644 index 3f7f865..0000000 --- a/WebContent/html/webpages/navbar.html +++ /dev/null @@ -1,42 +0,0 @@ -<%@ page import = "database.*,entities.User" %> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> -
    -
    - - - -      -

    -     -
    - - <% - Cookie[] cookies = request.getCookies(); - int sso = 0; - for(Cookie c : cookies){ - if(c.getName().equals("ssoNum")){ - sso = Integer.ParseInt(c.getValue()); - break; - } - } - User self = EmployeeQueries.getEmployeeID(sso); - String name = self.getName(); - %> -
    - diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp index b609f53..a999ed3 100644 --- a/WebContent/html/webpages/navbar.jsp +++ b/WebContent/html/webpages/navbar.jsp @@ -33,10 +33,10 @@ } } User self = EmployeeQueries.getEmployeeByID(navsso); - String name = self.getName(); + String navname = self.getName(); %>
\ No newline at end of file diff --git a/WebContent/html/webpages/profileSettings.jsp b/WebContent/html/webpages/profileSettings.jsp index 730809c..ade5075 100644 --- a/WebContent/html/webpages/profileSettings.jsp +++ b/WebContent/html/webpages/profileSettings.jsp @@ -59,7 +59,7 @@
diff --git a/WebContent/html/webpages/requestPage.jsp b/WebContent/html/webpages/requestPage.jsp index 47b3aa9..6f8ec7b 100644 --- a/WebContent/html/webpages/requestPage.jsp +++ b/WebContent/html/webpages/requestPage.jsp @@ -62,7 +62,7 @@
    diff --git a/WebContent/html/webpages/returnComplete.jsp b/WebContent/html/webpages/returnComplete.jsp index 7abb079..1a35d8b 100644 --- a/WebContent/html/webpages/returnComplete.jsp +++ b/WebContent/html/webpages/returnComplete.jsp @@ -20,7 +20,7 @@ diff --git a/WebContent/html/webpages/shoppingCart.jsp b/WebContent/html/webpages/shoppingCart.jsp index 92c0809..e8558f3 100644 --- a/WebContent/html/webpages/shoppingCart.jsp +++ b/WebContent/html/webpages/shoppingCart.jsp @@ -61,7 +61,7 @@ if(c.getName().equals("ssoNum")) sso = Integer.parseInt(c.getValue());