Skip to content

Commit

Permalink
Some minor modal changes to return page.
Browse files Browse the repository at this point in the history
  • Loading branch information
clj13001 committed Feb 23, 2017
1 parent b872a75 commit ded7118
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions WebContent/html/webpages/returnPage.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ 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");
RentedDevice[] mydevices = myaccess.getUserDevices("19");
String deviceString = RentedDevice.arrayToString(mydevices);
%>

Expand Down Expand Up @@ -164,7 +164,9 @@ $('input.deviceCheckbox').click(selectBox);
$('#returnbutton').click(returnDevice);
$('#closeOrderForm').click(hidePopup);
$(function(){$('#tabledisplay').DataTable();})
//event listeners to escape modal
window.onkeydown = function(e){if (e.keyCode == 27){hidePopup();}}
window.onclick = function(e){var modal = document.getElementById('orderInfoModal'); if(e.target == modal) modal.style.display = "none";}
//This should make the device array of retrieved devices
function makeDeviceArray(){
Expand Down

0 comments on commit ded7118

Please sign in to comment.