diff --git a/WebContent/html/imgs/Tablet.png b/WebContent/html/imgs/Tablet.png deleted file mode 100644 index c1011a1..0000000 Binary files a/WebContent/html/imgs/Tablet.png and /dev/null differ diff --git a/WebContent/html/imgs/computerStick.png b/WebContent/html/imgs/computerStick.png deleted file mode 100644 index 38a5a64..0000000 Binary files a/WebContent/html/imgs/computerStick.png and /dev/null differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/photo-camera.png b/WebContent/html/imgs/my-icons-collection-devices/png/Camera.png similarity index 100% rename from WebContent/html/imgs/my-icons-collection-devices/png/photo-camera.png rename to WebContent/html/imgs/my-icons-collection-devices/png/Camera.png diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/laptop.png b/WebContent/html/imgs/my-icons-collection-devices/png/Computer.png similarity index 100% rename from WebContent/html/imgs/my-icons-collection-devices/png/laptop.png rename to WebContent/html/imgs/my-icons-collection-devices/png/Computer.png diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/modem.png b/WebContent/html/imgs/my-icons-collection-devices/png/Router.png similarity index 100% rename from WebContent/html/imgs/my-icons-collection-devices/png/modem.png rename to WebContent/html/imgs/my-icons-collection-devices/png/Router.png diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/music-player.png b/WebContent/html/imgs/my-icons-collection-devices/png/iPod Touch.png similarity index 100% rename from WebContent/html/imgs/my-icons-collection-devices/png/music-player.png rename to WebContent/html/imgs/my-icons-collection-devices/png/iPod Touch.png diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/usb.png b/WebContent/html/imgs/my-icons-collection-devices/png/usb.png deleted file mode 100644 index 762071b..0000000 Binary files a/WebContent/html/imgs/my-icons-collection-devices/png/usb.png and /dev/null differ diff --git a/WebContent/html/javascript/return.jsp b/WebContent/html/javascript/return.jsp deleted file mode 100644 index 412e067..0000000 --- a/WebContent/html/javascript/return.jsp +++ /dev/null @@ -1,178 +0,0 @@ -<%@ page import = "database.MySQLAccess,entities.RentedDevice" %> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - -<% -MySQLAccess myaccess = new MySQLAccess(); -//String userID = -int counter = 0; -//9 is just for testing purposes. Should be returning 4 devices at the moment. -RentedDevice[] mydevices = myaccess.getUserDevices("9"); -String deviceString = RentedDevice.arrayToString(mydevices); -%> - - - - \ No newline at end of file diff --git a/WebContent/html/webpages/modem.png b/WebContent/html/webpages/modem.png deleted file mode 100644 index 0c9148a..0000000 Binary files a/WebContent/html/webpages/modem.png and /dev/null differ diff --git a/WebContent/html/webpages/returnPage.jsp b/WebContent/html/webpages/returnPage.jsp index 34db421..377c2e1 100644 --- a/WebContent/html/webpages/returnPage.jsp +++ b/WebContent/html/webpages/returnPage.jsp @@ -1,3 +1,6 @@ +<%@ page import = "database.MySQLAccess,entities.RentedDevice" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> @@ -93,7 +96,172 @@

Return Here

- <%@ include file="../javascript/return.jsp" %> + <% +MySQLAccess myaccess = new MySQLAccess(); +//String userID = +int counter = 0; +//9 is just for testing purposes. Should be returning 4 devices at the moment. +RentedDevice[] mydevices = myaccess.getUserDevices("9"); +String deviceString = RentedDevice.arrayToString(mydevices); +%> + + \ No newline at end of file