Multiple Important Changes

Making sure everything works after the amazing great merge.
arc12012 · Mar 24, 2017 · 0a91d1b · 0a91d1b
1 parent 08176ab
commit 0a91d1b
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/WebContent/adminLogin.jsp b/WebContent/adminLogin.jsp
@@ -19,8 +19,10 @@ if (result.next()){
 	adminCookie = new Cookie("ssoNum", Integer.toString(ssoNum));
 	adminCookie.setMaxAge(30*60);
 	response.addCookie(adminCookie);
+	statement.close();
 	response.sendRedirect("html/webpages/admin.html");
 } else {
+	statement.close();
 	response.sendRedirect("index.jsp");
 }
 

diff --git a/WebContent/html/webpages/adminLocation.jsp b/WebContent/html/webpages/adminLocation.jsp
@@ -311,7 +311,7 @@
 //database connection
 MySQLAccess myaccess = new MySQLAccess();
 //database query
-Location[] locations = myaccess.getLocations();
+Location[] locations = myaccess.getAdminLocations();
 //string representation of array.
 String locationString = Location.arrayToString(locations);
 locationString = locationString.replace("'","\\'");

diff --git a/WebContent/html/webpages/index.jsp b/WebContent/html/webpages/index.jsp
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:WebContent/html/webpages/index.jsp
 <html lang="en">
 <head>
   <meta charset="utf-8">
@@ -48,13 +47,13 @@
 
   <div class = "menuBox">
     <div>
-      <a class = "divlink" href = "requestPage.html">
+      <a class = "divlink" href = "requestPage.jsp">
        <div class = "menuOption">
          <h2>Request</h2>
          <p>Check out our selection of devices that YOU have the chance to check out!</p>  
        </div>
      </a>
-     <a class = "divlink" href="returnPage.html">
+     <a class = "divlink" href="returnPage.jsp">
       <div class = "menuOption">
         <h2>Return</h2>
         <p>All set with a device? No problem! You can return it here!</p>   

diff --git a/WebContent/html/webpages/navbar.html b/WebContent/html/webpages/navbar.html
@@ -13,8 +13,8 @@
 	<div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
 		<ul class="nav navbar-nav navbar-right">
 			<li><a href="../webpages/">Home</a></li>
-			<li><a href="requestPage.html">Device</a></li>
-			<li><a href="returnPage.html">Return Device</a></li>
+			<li><a href="requestPage.jsp">Request Device</a></li>
+			<li><a href="returnPage.jsp">Return Device</a></li>
 			<li><a href="listingPage.jsp">Device Listing</a></li>
 			<li><a href="shoppingCart.jsp">Shopping Cart</a></li>
 		</ul>

diff --git a/WebContent/html/webpages/orderFormHandler.jsp b/WebContent/html/webpages/orderFormHandler.jsp
@@ -34,7 +34,6 @@ String phone = request.getParameter("phone");
 if(location==-1){ location = Integer.parseInt(request.getParameter("location_dropdown"));}
 access.updateEmployee(1, userName, phone, location); //TODO get ID somehow
 System.out.print("updated employee "+userName);
-%>alert("updated employee "+userName);<%
 
 // And now for the ticket
 
@@ -56,7 +55,9 @@ for(int i=0; i<devIDs.length; i++)
 {
 	access.generateTicket(1, location, devIDs[i], request.getParameter("timeNeeded"));//TODO get ID somehow
 }
+
 %>
+window.location.replace("shoppingCart.jsp");
 </script>
 </body>
 </html>
diff --git a/WebContent/html/webpages/shoppingCart.jsp b/WebContent/html/webpages/shoppingCart.jsp
@@ -169,7 +169,7 @@ var employee = {
 var checked = new Array();
 var locations = getLocations();
 
-debug_add_items_to_cart();
+//debug_add_items_to_cart();
 show();                                                                                 //on load, we want to show everything
 
 

diff --git a/WebContent/userLogin.jsp b/WebContent/userLogin.jsp
@@ -17,8 +17,10 @@ if (result.next()){
 	userCookie = new Cookie("ssoNum", Integer.toString(ssoNum));
 	userCookie.setMaxAge(30*60);
 	response.addCookie(userCookie);
-	response.sendRedirect("html/webpages/index.html");
+	statement.close();
+	response.sendRedirect("html/webpages/index.jsp");
 } else {
+	statement.close();
 	response.sendRedirect("index.jsp");
 }
 

diff --git a/src/database/MySQLAccess.java b/src/database/MySQLAccess.java
@@ -233,6 +233,9 @@ public RentedDevice[] getUserDevices(String userID) throws SQLException, ClassNo
 			counter++;
 		}
 
+		stmt.close();
+		connect.close();
+
 		return devices;
 	}
 
@@ -258,6 +261,8 @@ public ListedDevice[] getAllDevices() throws SQLException, ClassNotFoundExceptio
 			counter++;
 		}
 
+		stmt.close();
+		connect.close();		
 		return devices;
 	}
 
@@ -281,7 +286,8 @@ public void returnDevices(String devices) throws ClassNotFoundException, SQLExce
 			//update statement
 			stmt.executeUpdate("UPDATE devices SET Status = \"Returning\" WHERE Device_ID = " + deviceArray[i]);
 		}
-		System.out.println("\nUpdates complete\n");
+		stmt.close();
+		connect.close();
 	}
 
 	/**