From 3b4bc36384bbb2210fd6e5db19b8da776569f717 Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Tue, 21 Feb 2017 18:13:09 -0500 Subject: [PATCH] Images actually were working. Eclipse Debugging = :poop: Also merged together two JSP files. No need to separate. --- WebContent/html/imgs/Tablet.png | Bin 1021 -> 0 bytes WebContent/html/imgs/computerStick.png | Bin 7436 -> 0 bytes .../png/{photo-camera.png => Camera.png} | Bin .../png/{laptop.png => Computer.png} | Bin .../png/{modem.png => Router.png} | Bin .../png/{music-player.png => iPod Touch.png} | Bin .../my-icons-collection-devices/png/usb.png | Bin 2261 -> 0 bytes WebContent/html/javascript/return.jsp | 178 ------------------ WebContent/html/webpages/modem.png | Bin 2817 -> 0 bytes WebContent/html/webpages/returnPage.jsp | 170 ++++++++++++++++- 10 files changed, 169 insertions(+), 179 deletions(-) delete mode 100644 WebContent/html/imgs/Tablet.png delete mode 100644 WebContent/html/imgs/computerStick.png rename WebContent/html/imgs/my-icons-collection-devices/png/{photo-camera.png => Camera.png} (100%) rename WebContent/html/imgs/my-icons-collection-devices/png/{laptop.png => Computer.png} (100%) rename WebContent/html/imgs/my-icons-collection-devices/png/{modem.png => Router.png} (100%) rename WebContent/html/imgs/my-icons-collection-devices/png/{music-player.png => iPod Touch.png} (100%) delete mode 100644 WebContent/html/imgs/my-icons-collection-devices/png/usb.png delete mode 100644 WebContent/html/javascript/return.jsp delete mode 100644 WebContent/html/webpages/modem.png diff --git a/WebContent/html/imgs/Tablet.png b/WebContent/html/imgs/Tablet.png deleted file mode 100644 index c1011a1e9da09d8d48914e17a43591593e5e97b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1021 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F&8^|hH!9j+gcyqV(DCY@~pSJ_PuL zxc>kDAIKaz;OUP^Pl3MmFA4GsW?*DuW@G2z;ujW|kXKOC(A3d2u&{Rb_KAv4OiIbk zFDNW7sjTUqFni8|r7Kph->`N2j(rD@96xd9!o^Ehuiv=+;Q8w}?>>C_`tAFVU%&tS z6BIYjU|?WU@pN$vskrs_c4Y7&0}<8-4FO@SjDjvlS&y*B6tL?q&`?VH|9}5SMMsfi z--PnszL@h_?77*`w#?5@1Ru4lc&GQamv<|^=kMJd6m&);{@=Z%bG7%}?d^+`cTSki z^Yu?}<5Mp-=`EkX>s;UDZn-~W=Zr<4f8Kmp@n>h@=?TX^R~%2g_VQ0cwMq3n{~xU0 ze@<@gzPRq~g2NxSNxjMa#gbeTt)KNcwq5=~V4tljOR6TTx z^;Z3MzgBL`snzl~_*RA&JpIhy_~TJbC%fJDsKE6L-~RrkWXJ{`$X8ks&0++ zsC$rKc0Vk{?n=mMkM_r(Ubv8ms#>%y@TI7?j3I0|`u9e9mt9cl!U7D)tp08M1CMEZgN7 zD4lSpa87-C2D8hKq;K)hz3#7RX|-!GXDDD=bv<}x5rY~RpZ)PUbvJ#Fw{x(zcXqKG zHw1i~p|f)XlZNW_m$Uel8-hLyvL9JAnXe(F+mOs9&bODzW!w3&zx^*D{HFatG@30 p_PX}t&EK!Ke}7u8ShxP)e?~W^uU9rto!Srbucxb@%Q~loCIA@0S1AAh diff --git a/WebContent/html/imgs/computerStick.png b/WebContent/html/imgs/computerStick.png deleted file mode 100644 index 38a5a64d153b944c3560c662bc6702021b9aecd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7436 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 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 0c9148a5e0d0cd48f0bdb08ec353cbe006f94871..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2817 zcmeHJ`8(8$7yis@kj9ommP=B`R!FiVPS~ zfq)$3?^D#B1A>qZOt1(9V)V1+)IrJZZ){Hn0IuV|0cu()6+CE)1{m1|So^sL1iO&j zfZ*U@<(s}lva5@~o3bCtqi{t>3;@6kj2YHwe}DgA{=fLof&U8!cEQ~*4}{JJSXo#D zATR_9gL5Icd3X=;9Y*pC2nq=w5jlEHR80K1grt;=>@TSr$3>l(GPAOCa`W;F3X4nbmp*v-=rOIV{AmTf zicwwrtiGY~d2>r^+lzMQ%fDZ}?s(JL&Fbmxd)q(oZt(rkhmRwlM#sh{CZ|46&&@SYBEEwzj_Uee=iG_Rj84&ab^47l{b~fWJ2}yoe3?v|Pvz7sd%EP2S}$J;pRP zgc>!&UK$G?!GLO{jRlO1V2@H#_)sE`P$G)SR)#MPu3=Q~mm!j+PsJvj$RbEcRILp-JN`FO8ko*+q9)N zLGnOTaI{!DEQZ4t-)D)$a2V(I+8ZHa_%QaR3B2{IjhJTty0DTjymvl%<|5q{Q!l1E z;yX%wAiyDwZ6S)2M$is{)|JWJNqUwxygb8>V!R+y8rnzZ;znd-UQxL5Cd;r7z(aFL z7J5c0sP0|<{uPx(cuRfGR^=6@)8=)s4lRs~hpz4H;|^WUTfJ2($Lw&22F2#kgpzuYuO9io>@h19q)up zmif9KX}=p52~osEPGRqlHos3DZRG}dhvpjL-?A3Y*Z{8Y7f*LpU?MdKNQ?;kJQAm* zNzC%$W`b2ViVoN`k*gW3)eTCzp_M?d2vy&LYrcHYtZN5XSK1dVSP^vZN2hvua@R6C znu>+iO<(mOI(7wv7+$bpJ3zR+zlSMVl%BvpSehSCNVLX}!|fOv_qgJ)6E2_uT;xdu zkL(g~hkJnjXEt`Jh`v=`3@yUyd4v4vyN42p*a@T=uI)+rM$LqfL{G5f*!1)7MKz(Z)*~LlquUTM?K9()!dEPMGw64T!oS^2Zv6Q)A%r&r22uALW2fZVrt714YdVW;kLTYQiw$F=5dB;3_Q*RhE6|> zt{X3w3{hhyb~*CR!u!`2azE@jNUH$M)2P0Sv|~JnFYIDoNHCZ2ojJ$GZiod~KYRwz zQrXgLP4ZeFKZ@4tb)rP`4l_khN*!NCDAlXD#mfOG-Oh@=Vz+a5MFt|I$+yx2x#+9f zEyJN{wu2Ef@(@hy`sHFF7Q}8;hTQ4}((3s&Ef2f@$RKISN-au!6cTXWx5}7QN~o~p z%mP_h>=twUUXLd@uRHPVQBQriIAEFx9xkM|$_}{QtdN}^x#7YE3_P|PyCeC!Sba}J zHx3Y9QQw=ZApoHzVSWphpcG`N$_0r1yY$WB=pN;!-seQUs3S4-#m`}j?Q%e_&F$nn zvJi1>t`{osEWlDQn$M(~Z&vMp0J3bNGIB-HibH3kNI*&|;@v+0VpxWPkOn6MV2HY+ zxXvw>K4IQq``xzl$q75sx)7$_ZN8d6MFLN9V|{~d$az;34xR|*pn|T7c(doar_-Ni zR@yE5?5&MTQ5Eg8SNn&w7UhTyEI*W@EH0paUzC8}><^ zk-+z@p&{Tb1?BW?{uOS_jZwYSw<9ns5ZR2RP-&`$z((AIRs_YVyITa9&`1zK zL-|4R2!3MK{E|T7LgvO>dm-y%kEj1#de0WveY5#bHRyYGZAv`2???FG@PXXXMmgb# zsz{8OFK1$2@>J=psM1K3SKeA-ezan!VriLT6mW_(tY^>>YQ&$owTr< zk7hhvI-SE;OlV$Pox|P?9g!5Ax5F<_+k;ax=@kunYANXShx?4*@5jT$$ilG7fDrpX Dj_%@= 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