From 367c4d9ce40aa5cf6e21db82e1d85dab9834b915 Mon Sep 17 00:00:00 2001
From: John Costa <john.costa_iii@uconn.edu>
Date: Sat, 15 Apr 2017 21:44:54 -0400
Subject: [PATCH 1/6] fixed pie chart to show umbrella terms

---
 WebContent/html/javascript/statistics.jsp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/WebContent/html/javascript/statistics.jsp b/WebContent/html/javascript/statistics.jsp
index ff97eab..ecb6c60 100644
--- a/WebContent/html/javascript/statistics.jsp
+++ b/WebContent/html/javascript/statistics.jsp
@@ -23,19 +23,31 @@ function displayData() {
 	var availableDevices;
 	var loanDevices;
 	var lostDevices;
+	//umbrella sections
+	var pendingDevices;
+	var unavailDevices;
+	var returnDevices;
+	var brokenDevices;
 	if (statistics.status != "" && statistics.count != ""){
 		
 		for (var i = 0; i<statistics.length; i++){
 			totalDevices = totalDevices + statistics[i].count;
 		}
-		
+		//data for info section
 		availableDevices = statistics[1].count;
 		loanDevices = statistics[5].count;
 		lostDevices = statistics[4].count;
+		returnDevices = statistics[8].count;
+		//umbrella divisions
+		pendingDevices = statistics[0].count + statistics[9].count;
+		unavailDevices = statistics[5].count + statistics[6].count + statistics[7].count;
+		brokenDevices = statistics[2].count + statistics[3].count + statistics[4].count;
+		
 		
 		html += '<div class = "info-container">Total Devices: '+ totalDevices + 
-		'<br>Loaned Devices: ' + loanDevices + 
 		'<br>Available Devices: ' + availableDevices + 
+		'<br>Loaned Devices: ' + loanDevices + 
+		'<br>Returning Devices: ' + returnDevices +
 		'<br>Lost Devices: ' + lostDevices + 
 		'</div>'
 		
@@ -54,8 +66,8 @@ function displayData() {
         	var data = new google.visualization.DataTable();
         	data.addColumn('string', 'Status');
         	data.addColumn('number', 'Count');       
-        	data.addRows([['Total Devices', totalDevices],['Available Devices', availableDevices],
-        		['Loaned Devices',loanDevices],['Lost Devices',lostDevices]]);
+        	data.addRows([['Available Devices', availableDevices],['Unavailable Devices',unavailDevices],
+        		['Pending Devices',pendingDevices],['Broken Devices',lostDevices]]);
 
         	// Set chart options
         	var options = {'title':'Chart of Devices',

From 1d04f5aae7b9f4576356e992280d8598bdcf57d5 Mon Sep 17 00:00:00 2001
From: John Costa <john.costa_iii@uconn.edu>
Date: Sun, 16 Apr 2017 21:38:12 -0400
Subject: [PATCH 2/6] fixed up statistics to match changes mentioned by zach

---
 WebContent/html/javascript/statistics.jsp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/WebContent/html/javascript/statistics.jsp b/WebContent/html/javascript/statistics.jsp
index ecb6c60..3c200fd 100644
--- a/WebContent/html/javascript/statistics.jsp
+++ b/WebContent/html/javascript/statistics.jsp
@@ -35,13 +35,13 @@ function displayData() {
 		}
 		//data for info section
 		availableDevices = statistics[1].count;
-		loanDevices = statistics[5].count;
-		lostDevices = statistics[4].count;
-		returnDevices = statistics[8].count;
+		loanDevices = statistics[3].count;
+		lostDevices = statistics[2].count;
+		returnDevices = statistics[6].count;
 		//umbrella divisions
-		pendingDevices = statistics[0].count + statistics[9].count;
-		unavailDevices = statistics[5].count + statistics[6].count + statistics[7].count;
-		brokenDevices = statistics[2].count + statistics[3].count + statistics[4].count;
+		pendingDevices = statistics[0].count;
+		unavailDevices = statistics[2].count + statistics[4].count + statistics[5].count;
+		
 		
 		
 		html += '<div class = "info-container">Total Devices: '+ totalDevices + 
@@ -67,7 +67,8 @@ function displayData() {
         	data.addColumn('string', 'Status');
         	data.addColumn('number', 'Count');       
         	data.addRows([['Available Devices', availableDevices],['Unavailable Devices',unavailDevices],
-        		['Pending Devices',pendingDevices],['Broken Devices',lostDevices]]);
+        		['Loaned Devices',loanDevices],['Pending Devices',pendingDevices],
+        		['Broken Devices',lostDevices]]);
 
         	// Set chart options
         	var options = {'title':'Chart of Devices',

From 467eeaf26c105bf0a548d9f591a8aa76a67f51be Mon Sep 17 00:00:00 2001
From: John Costa <john.costa_iii@uconn.edu>
Date: Sun, 16 Apr 2017 23:16:05 -0400
Subject: [PATCH 3/6] Modified return, request, and listing to support
 mouseover

---
 WebContent/html/javascript/listing.jsp   |  10 +-
 WebContent/html/javascript/request.jsp   |   6 +-
 WebContent/html/webpages/listingPage.jsp |   7 +
 WebContent/html/webpages/requestPage.jsp | 222 ++++++++++++-----------
 WebContent/html/webpages/returnPage.jsp  |  13 +-
 5 files changed, 144 insertions(+), 114 deletions(-)

diff --git a/WebContent/html/javascript/listing.jsp b/WebContent/html/javascript/listing.jsp
index d709c5b..256995b 100644
--- a/WebContent/html/javascript/listing.jsp
+++ b/WebContent/html/javascript/listing.jsp
@@ -14,7 +14,7 @@
 //out.println(description);
 //out.println(hardware);
 	%>
-
+	<script src = "../javascript/nhpup_1.1.js"></script>
 	<script type=text/javascript>
 //gets variables for database data
 var devices = makeDeviceArray();
@@ -35,8 +35,10 @@ searchbar[0].onkeyup = refresh;
 showAll();
 function showAll(){
 	var html = '';
+	var part1 = "nhpup.popup('";
+    var part2 = "');"
 	for(var i = 0; i < devices.length; i++){
-		html += '<div class = "deviceContainer"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + devices[i].hardware + '.png" class = "device">' + devices[i].name + '</div><div class = "deviceDescp"><p>' + devices[i].description + '</p><div class = "availableAnchor" id = "' + (i) + '"></div></div></div><br><br>';
+		html += '<a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + devices[i].hardware + '<br><br>' + 'Manufacturer: ' + devices[i].manufacturer + part2 + '"><div class = "deviceContainer"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + devices[i].hardware + '.png" class = "device">' + devices[i].name + '</div><div class = "deviceDescp"><p>' + devices[i].description + '</p><div class = "availableAnchor" id = "' + (i) + '"></div></div></div></a><br><br>';
 	}
 	document.getElementById('devContainer').innerHTML = html;
 	var anchors = document.getElementsByClassName('availableAnchor');
@@ -61,9 +63,11 @@ function refresh() {
 }
 function show(deviceArray){
 	var html = '';
+	var part1 = "nhpup.popup('";
+    var part2 = "');"
 	for (var i = 0; i < deviceArray.length; i++) 
 	{
-		html += '<div class = "deviceContainer"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + deviceArray[i].hardware + '.png" class = "device">' + deviceArray[i].name + '</div><div class = "deviceDescp"><p>' + deviceArray[i].description + '</p><div class = "availableAnchor" id = "' + (deviceArray[i].id) + '"></div></div></div><br><br>'
+		html += '<div class = "deviceContainer"><a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + devices[i].hardware + '<br><br>' + 'Manufacturer: ' + devices[i].manufacturer + part2 + '"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + deviceArray[i].hardware + '.png" class = "device">' + deviceArray[i].name + '</div><div class = "deviceDescp"><p>' + deviceArray[i].description + '</p><div class = "availableAnchor" id = "' + (deviceArray[i].id) + '"></div></div></a></div><br><br>'
 	}
 	document.getElementById('devContainer').innerHTML = html;
 	var anchors = document.getElementsByClassName('availableAnchor');
diff --git a/WebContent/html/javascript/request.jsp b/WebContent/html/javascript/request.jsp
index dd78f9a..8993184 100644
--- a/WebContent/html/javascript/request.jsp
+++ b/WebContent/html/javascript/request.jsp
@@ -14,7 +14,7 @@ String deviceString = Device.arrayToString(mydevices);
 //out.println(description);
 //out.println(hardware);
 %>
-
+<script src = "../javascript/nhpup_1.1.js"></script>
 <script type=text/javascript>
 //gets variables for database data
 var devices = makeDeviceArray();
@@ -38,8 +38,10 @@ function refresh() {
 function show(deviceArray){
 	// var type = this.getAttribute('data-type');
 	var html = '';
+	var part1 = "nhpup.popup('";
+    var part2 = "');"
 	for (var i = 0; i < deviceArray.length; i++) {
-		html += '<div class = "deviceContainer"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + deviceArray[i].hardware + '.png" onerror="this.src=\'../imgs/synchrony-financial-logo-dlpx_1.png\';" class = "device">' + deviceArray[i].name + '</div><div class = "deviceDescp"><p>' + deviceArray[i].description + '</p><button class = "requestbutton" id = "button' + (deviceArray[i].id) + '" type="button">Order device</button></div></div><br><br>'
+		html += '<a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + deviceArray[i].hardware + '<br><br>' + 'Manufacturer: ' + deviceArray[i].manufacturer + part2 + '"><div class = "deviceContainer"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + deviceArray[i].hardware + '.png" onerror="this.src=\'../imgs/synchrony-financial-logo-dlpx_1.png\';" class = "device">' + deviceArray[i].name + '</div><div class = "deviceDescp"><p>' + deviceArray[i].description + '</p><button class = "requestbutton" id = "button' + (deviceArray[i].id) + '" type="button">Order device</button></div></div></a><br><br>'
 	}
 	
 	if(html.localeCompare("")==0)
diff --git a/WebContent/html/webpages/listingPage.jsp b/WebContent/html/webpages/listingPage.jsp
index 9c1acdf..d82fb41 100644
--- a/WebContent/html/webpages/listingPage.jsp
+++ b/WebContent/html/webpages/listingPage.jsp
@@ -46,6 +46,13 @@
       border: solid;
       border-width: thin;
     }
+    
+    #pup{
+            background-color: #E9EAEB;
+            border: solid;
+            text-align: center;
+            padding: 10px;
+            }
   </style>
 </head>
 
diff --git a/WebContent/html/webpages/requestPage.jsp b/WebContent/html/webpages/requestPage.jsp
index d79f8ff..5bf8c5e 100644
--- a/WebContent/html/webpages/requestPage.jsp
+++ b/WebContent/html/webpages/requestPage.jsp
@@ -1,109 +1,115 @@
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-  <meta name="description" content="">
-  <meta name="author" content="">
-
-  <title>Synchrony Financial</title>
-
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-  <link rel = "stylesheet" type = "text/css" href = "../css/stylesheet.css">
-  <link rel = "shortcut icon" href = "../imgs/synchrony-financial-logo-dlpx_1.ico">
-  <style>
-    div.deviceContainer{
-      border: solid; 
-      border-width: thin; 
-      padding: 15px;
-      background-color: #E9EAEB;
-      display: inline-block;
-    }
-
-    div.imgContainer{
-      display: inline-block; 
-      text-align: center;
-    }
-
-    img.device{
-      display: block;
-    }
-
-    div.deviceDescp{
-      display: inline-block; 
-      width: 200px; 
-      text-align: center; 
-    }
-
-    button.requestbutton{
-      display: block; 
-      margin: auto;
-    }
-
-    div.cartConfirm{
-      display: none;
-      top: 50%;
-      left: 50%;
-      position: fixed;
-      width: 155px;
-      height: 85px;
-      line-height: 85px;
-      text-align: center;
-      background-color: #FBC600;
-      border: solid;
-      border-color: #3B3C43;
-      border-radius: 5px;
-    }
-  </style>
-</head>
-
-<body>
-  <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-    <%@ include file="navbar.jsp"%>
-  </nav>
-  <div class="col-sm-3 col-md-2 sidebar">
-    <ul class="nav nav-sidebar">
-      <h4>Hardware Type</h4>
-      <li><label><input type="checkbox" class="hw-data-type" data-type = "Computer">  Computers</label></li>
-      <li><label><input type="checkbox" class="hw-data-type" data-type = "Camera">  Cameras</label></li>
-      <li><label><input type="checkbox" class="hw-data-type" data-type = "Smartphone">  Smartphone</label></li>
-      <li><label><input type="checkbox" class="hw-data-type" data-type = "Storage Device">  Storage Devices</label></li>
-      <li><label><input type="checkbox" class="hw-data-type" data-type = "Tablet">  Tablet</label></li>
-      <li><label><input type="checkbox" class="hw-data-type" data-type = "Other">  Other</label></li> <!-- same -->
-    </ul>
-    <br>
-    <ul class="nav nav-sidebar">
-      <h4>Manufacture</h4>
-      <li><label><input type="checkbox" class="sw-data-type" data-type = "Amazon">  Amazon</label></li>
-      <li><label><input type="checkbox" class="sw-data-type" data-type = "Apple">  Apple</label></li>
-      <li><label><input type="checkbox" class="sw-data-type" data-type = "Intel">  Intel</label></li>
-      <li><label><input type="checkbox" class="sw-data-type" data-type = "Samsung">  Samsung</label></li>
-      <li><label><input type="checkbox" class="sw-data-type" data-type = "Microsoft">  Microsoft</label></li>
-      <li><label><input type="checkbox" class="sw-data-type" data-type = "Other">  Other</label></li> <!-- will modify later -->
-    </ul>
-  </div>
-
-  <div class = "displayDevice">
-    <h2>Available Devices
-      <!-- I'm only using a form to leverage bootstrap's styling. The onsubmit function just returns false because the form is never meant to be submitted anywhere. -->
-    </h2>
-    <form onsubmit="return false;">
-    <input type="search" class="form-control" name="searchBar" placeholder=" search for devices by name" autocomplete="off" style="width: 50%; text-align: left; margin: 1%;"  />
-    </form>
-    <div id = "devContainer"><p>Or choose an option to the left to begin requesting!</p></div>   
-  </div>
-
-  <div class = "cartConfirm" id = "added">
-    <p>Added to Cart</p>
-  </div>
-
-  <div class = "cartConfirm" id = "already">
-    <p>Already in Cart</p>
-  </div>
-
-  <%@ include file="../javascript/request.jsp" %>
-</body>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+  <meta name="description" content="">
+  <meta name="author" content="">
+
+  <title>Synchrony Financial</title>
+
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+  <link rel = "stylesheet" type = "text/css" href = "../css/stylesheet.css">
+  <link rel = "shortcut icon" href = "../imgs/synchrony-financial-logo-dlpx_1.ico">
+  <style>
+    div.deviceContainer{
+      border: solid; 
+      border-width: thin; 
+      padding: 15px;
+      background-color: #E9EAEB;
+      display: inline-block;
+    }
+
+    div.imgContainer{
+      display: inline-block; 
+      text-align: center;
+    }
+
+    img.device{
+      display: block;
+    }
+
+    div.deviceDescp{
+      display: inline-block; 
+      width: 200px; 
+      text-align: center; 
+    }
+
+    button.requestbutton{
+      display: block; 
+      margin: auto;
+    }
+
+    div.cartConfirm{
+      display: none;
+      top: 50%;
+      left: 50%;
+      position: fixed;
+      width: 155px;
+      height: 85px;
+      line-height: 85px;
+      text-align: center;
+      background-color: #FBC600;
+      border: solid;
+      border-color: #3B3C43;
+      border-radius: 5px;
+    }
+    #pup{
+            background-color: #E9EAEB;
+            border: solid;
+            text-align: center;
+            padding: 10px;
+        }
+  </style>
+</head>
+
+<body>
+  <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
+    <%@ include file="navbar.jsp"%>
+  </nav>
+  <div class="col-sm-3 col-md-2 sidebar">
+    <ul class="nav nav-sidebar">
+      <h4>Hardware Type</h4>
+      <li><label><input type="checkbox" class="hw-data-type" data-type = "Computer">  Computers</label></li>
+      <li><label><input type="checkbox" class="hw-data-type" data-type = "Camera">  Cameras</label></li>
+      <li><label><input type="checkbox" class="hw-data-type" data-type = "Smartphone">  Smartphone</label></li>
+      <li><label><input type="checkbox" class="hw-data-type" data-type = "Storage Device">  Storage Devices</label></li>
+      <li><label><input type="checkbox" class="hw-data-type" data-type = "Tablet">  Tablet</label></li>
+      <li><label><input type="checkbox" class="hw-data-type" data-type = "Other">  Other</label></li> <!-- same -->
+    </ul>
+    <br>
+    <ul class="nav nav-sidebar">
+      <h4>Manufacture</h4>
+      <li><label><input type="checkbox" class="sw-data-type" data-type = "Amazon">  Amazon</label></li>
+      <li><label><input type="checkbox" class="sw-data-type" data-type = "Apple">  Apple</label></li>
+      <li><label><input type="checkbox" class="sw-data-type" data-type = "Intel">  Intel</label></li>
+      <li><label><input type="checkbox" class="sw-data-type" data-type = "Samsung">  Samsung</label></li>
+      <li><label><input type="checkbox" class="sw-data-type" data-type = "Microsoft">  Microsoft</label></li>
+      <li><label><input type="checkbox" class="sw-data-type" data-type = "Other">  Other</label></li> <!-- will modify later -->
+    </ul>
+  </div>
+
+  <div class = "displayDevice">
+    <h2>Available Devices
+      <!-- I'm only using a form to leverage bootstrap's styling. The onsubmit function just returns false because the form is never meant to be submitted anywhere. -->
+    </h2>
+    <form onsubmit="return false;">
+    <input type="search" class="form-control" name="searchBar" placeholder=" search for devices by name" autocomplete="off" style="width: 50%; text-align: left; margin: 1%;"  />
+    </form>
+    <div id = "devContainer"><p>Or choose an option to the left to begin requesting!</p></div>   
+  </div>
+
+  <div class = "cartConfirm" id = "added">
+    <p>Added to Cart</p>
+  </div>
+
+  <div class = "cartConfirm" id = "already">
+    <p>Already in Cart</p>
+  </div>
+
+  <%@ include file="../javascript/request.jsp" %>
+</body>
 </html>
\ No newline at end of file
diff --git a/WebContent/html/webpages/returnPage.jsp b/WebContent/html/webpages/returnPage.jsp
index 6d85190..7c397fe 100644
--- a/WebContent/html/webpages/returnPage.jsp
+++ b/WebContent/html/webpages/returnPage.jsp
@@ -71,6 +71,12 @@
     	height: 20px;
     	width: 20px;
     }
+    #pup{
+            background-color: #E9EAEB;
+            border: solid;
+            text-align: center;
+            padding: 10px;
+        }
   </style>
 </head>
 <body>
@@ -124,7 +130,7 @@ Device[] mydevices = DeviceQueries.getUserDevices(navsso);
 //string representation of array.
 String deviceString = Device.arrayToString(mydevices);
 %>
-
+<script src = "../javascript/nhpup_1.1.js"></script>
 <script type=text/javascript>
 
 //JSON representation of array.
@@ -212,7 +218,12 @@ function populateDeviceList(){
 		var name = devices[i].name;
 		var hardware = devices[i].hardware;
 		var checkout = devices[i].checkout;
+		var manufacturer = devices[i].manufacturer;
+		
+		var part1 = "nhpup.popup('";
+	    var part2 = "');"
 		//HTML representation in divs
+		htmlString+='<a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + hardware + '<br><br>' + 'Manufacturer: ' + manufacturer + part2 + '">';
 		htmlString+="<div class=\"deviceContainer\" data-num=\"" + i +"\">";
 		htmlString+="<input class=\"deviceCheckbox\" type = \"checkbox\" data-num=\"" + i + "\">";
 		htmlString+="<div><div class=\"imgContainer\"><img onerror=\"this.src='../imgs/synchrony-financial-logo-dlpx_1.png';\" src=\"../imgs/my-icons-collection-devices/png/";

From 6cb7e19c0547fe739972972bd3b7a98dc46c50b2 Mon Sep 17 00:00:00 2001
From: John Costa <john.costa_iii@uconn.edu>
Date: Sun, 16 Apr 2017 23:27:24 -0400
Subject: [PATCH 4/6] fixed a problem with other manufacturer in request, fixed
 listing popup

---
 WebContent/html/javascript/listing.jsp |  2 +-
 WebContent/html/javascript/request.jsp | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/WebContent/html/javascript/listing.jsp b/WebContent/html/javascript/listing.jsp
index 256995b..e4e2c10 100644
--- a/WebContent/html/javascript/listing.jsp
+++ b/WebContent/html/javascript/listing.jsp
@@ -67,7 +67,7 @@ function show(deviceArray){
     var part2 = "');"
 	for (var i = 0; i < deviceArray.length; i++) 
 	{
-		html += '<div class = "deviceContainer"><a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + devices[i].hardware + '<br><br>' + 'Manufacturer: ' + devices[i].manufacturer + part2 + '"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + deviceArray[i].hardware + '.png" class = "device">' + deviceArray[i].name + '</div><div class = "deviceDescp"><p>' + deviceArray[i].description + '</p><div class = "availableAnchor" id = "' + (deviceArray[i].id) + '"></div></div></a></div><br><br>'
+		html += '<div class = "deviceContainer"><a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + deviceArray[i].hardware + '<br><br>' + 'Manufacturer: ' + deviceArray[i].manufacturer + part2 + '"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + deviceArray[i].hardware + '.png" class = "device">' + deviceArray[i].name + '</div><div class = "deviceDescp"><p>' + deviceArray[i].description + '</p><div class = "availableAnchor" id = "' + (deviceArray[i].id) + '"></div></div></a></div><br><br>'
 	}
 	document.getElementById('devContainer').innerHTML = html;
 	var anchors = document.getElementsByClassName('availableAnchor');
diff --git a/WebContent/html/javascript/request.jsp b/WebContent/html/javascript/request.jsp
index 8993184..6e050fe 100644
--- a/WebContent/html/javascript/request.jsp
+++ b/WebContent/html/javascript/request.jsp
@@ -94,21 +94,21 @@ function filter(deviceArray) {
 		if (activeHOptions.length == 0) {
 			hardwareMatch = true;
 		}
+		for(var j = 0; j < activeSOptions.length; j++) {
+			if (activeSOptions[j] == devices[i].manufacturer){
+				softwareMatch = true;
+			}
 		// now we must handle the 'other' case
 		// there is no 'other' catagory, so if that is the option selected we must make sure
 		// that the device in question is not one of the categories we DO have options for
-		if(activeSOptions[j] === 'Other')
-		{
-			var othermatch = true;
-			for (var k = 0; k < softwareOptions.length; k++) {
-				if(devices[i].manufacturer == softwareOptions[k].getAttribute('data-type'))
-					othermatch = false;
-			}
-			if(othermatch) softwareMatch = true;
-		}
-		for(var j = 0; j < activeSOptions.length; j++) {
-			if (activeSOptions[j] == deviceArray[i].manufacturer){
-				softwareMatch = true;
+			if(activeSOptions[j] === 'Other')
+			{
+				var othermatch = true;
+				for (var k = 0; k < softwareOptions.length; k++) {
+					if(devices[i].manufacturer == softwareOptions[k].getAttribute('data-type'))
+						othermatch = false;
+				}
+				if(othermatch) softwareMatch = true;
 			}
 		}
 		if (activeSOptions.length == 0) {

From d2f31f38722818e98276bbcbb4d16ff30e5d5f20 Mon Sep 17 00:00:00 2001
From: Connor L Jackson <connor.jackson@uconn.edu>
Date: Mon, 17 Apr 2017 15:06:49 -0400
Subject: [PATCH 5/6] Couple temp fixes

---
 WebContent/html/javascript/listing.jsp    |  4 ++--
 WebContent/html/javascript/statistics.jsp | 29 +++++++++++------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/WebContent/html/javascript/listing.jsp b/WebContent/html/javascript/listing.jsp
index e4e2c10..ff995e1 100644
--- a/WebContent/html/javascript/listing.jsp
+++ b/WebContent/html/javascript/listing.jsp
@@ -38,7 +38,7 @@ function showAll(){
 	var part1 = "nhpup.popup('";
     var part2 = "');"
 	for(var i = 0; i < devices.length; i++){
-		html += '<a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + devices[i].hardware + '<br><br>' + 'Manufacturer: ' + devices[i].manufacturer + part2 + '"><div class = "deviceContainer"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + devices[i].hardware + '.png" class = "device">' + devices[i].name + '</div><div class = "deviceDescp"><p>' + devices[i].description + '</p><div class = "availableAnchor" id = "' + (i) + '"></div></div></div></a><br><br>';
+		html += '<a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + devices[i].hardware + '<br><br>' + 'Manufacturer: ' + devices[i].manufacturer + part2 + '"><div class = "deviceContainer"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + devices[i].hardware + '.png" onerror="this.src=\'../imgs/synchrony-financial-logo-dlpx_1.png\';" class = "device">' + devices[i].name + '</div><div class = "deviceDescp"><p>' + devices[i].description + '</p><div class = "availableAnchor" id = "' + (i) + '"></div></div></div></a><br><br>';
 	}
 	document.getElementById('devContainer').innerHTML = html;
 	var anchors = document.getElementsByClassName('availableAnchor');
@@ -67,7 +67,7 @@ function show(deviceArray){
     var part2 = "');"
 	for (var i = 0; i < deviceArray.length; i++) 
 	{
-		html += '<div class = "deviceContainer"><a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + deviceArray[i].hardware + '<br><br>' + 'Manufacturer: ' + deviceArray[i].manufacturer + part2 + '"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + deviceArray[i].hardware + '.png" class = "device">' + deviceArray[i].name + '</div><div class = "deviceDescp"><p>' + deviceArray[i].description + '</p><div class = "availableAnchor" id = "' + (deviceArray[i].id) + '"></div></div></a></div><br><br>'
+		html += '<div class = "deviceContainer"><a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + deviceArray[i].hardware + '<br><br>' + 'Manufacturer: ' + deviceArray[i].manufacturer + part2 + '"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + deviceArray[i].hardware + '.png" onerror="this.src=\'../imgs/synchrony-financial-logo-dlpx_1.png\';" class = "device">' + deviceArray[i].name + '</div><div class = "deviceDescp"><p>' + deviceArray[i].description + '</p><div class = "availableAnchor" id = "' + (deviceArray[i].id) + '"></div></div></a></div><br><br>'
 	}
 	document.getElementById('devContainer').innerHTML = html;
 	var anchors = document.getElementsByClassName('availableAnchor');
diff --git a/WebContent/html/javascript/statistics.jsp b/WebContent/html/javascript/statistics.jsp
index 3c200fd..c5de328 100644
--- a/WebContent/html/javascript/statistics.jsp
+++ b/WebContent/html/javascript/statistics.jsp
@@ -20,27 +20,27 @@ displayData();
 function displayData() {
 	var html = "";
 	var totalDevices = 0;
-	var availableDevices;
-	var loanDevices;
-	var lostDevices;
+	var availableDevices=0;
+	var loanDevices=0;
+	var lostDevices=0;
 	//umbrella sections
-	var pendingDevices;
-	var unavailDevices;
-	var returnDevices;
-	var brokenDevices;
+	var pendingDevices=0;
+	var unavailDevices=0;
+	var returnDevices=0;
+	var brokenDevices=0;
 	if (statistics.status != "" && statistics.count != ""){
 		
 		for (var i = 0; i<statistics.length; i++){
 			totalDevices = totalDevices + statistics[i].count;
 		}
 		//data for info section
-		availableDevices = statistics[1].count;
-		loanDevices = statistics[3].count;
-		lostDevices = statistics[2].count;
-		returnDevices = statistics[6].count;
+		availableDevices = statistics[0].count;
+		loanDevices = statistics[1].count;
+		//lostDevices = statistics[2].count;
+		//returnDevices = statistics[6].count;
 		//umbrella divisions
-		pendingDevices = statistics[0].count;
-		unavailDevices = statistics[2].count + statistics[4].count + statistics[5].count;
+		//pendingDevices = statistics[0].count;
+		unavailDevices = statistics[2].count;
 		
 		
 		
@@ -67,8 +67,7 @@ function displayData() {
         	data.addColumn('string', 'Status');
         	data.addColumn('number', 'Count');       
         	data.addRows([['Available Devices', availableDevices],['Unavailable Devices',unavailDevices],
-        		['Loaned Devices',loanDevices],['Pending Devices',pendingDevices],
-        		['Broken Devices',lostDevices]]);
+        		['Loaned Devices',loanDevices]]);
 
         	// Set chart options
         	var options = {'title':'Chart of Devices',

From ff35a4c9a8028f86bbb63b526110b754361f8a61 Mon Sep 17 00:00:00 2001
From: Connor L Jackson <connor.jackson@uconn.edu>
Date: Mon, 17 Apr 2017 16:13:49 -0400
Subject: [PATCH 6/6] Committing to get to master.

---
 src/database/DeviceQueries.java | 6 +++---
 src/entities/Device.java        | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/database/DeviceQueries.java b/src/database/DeviceQueries.java
index 248a400..3529742 100644
--- a/src/database/DeviceQueries.java
+++ b/src/database/DeviceQueries.java
@@ -27,7 +27,7 @@ public static Device[] getUserDevices(String userID) throws SQLException, ClassN
 		
 		//iterate result set
 		while(resultSet.next()){
-			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getString("NFC_ID"));
+			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getString("NFC_ID"), resultSet.getString("Locker_Position"), resultSet.getString("Operating_System"), resultSet.getString("Admin_Comments"));
 			counter++;
 		}		
 		stmt.close();
@@ -53,7 +53,7 @@ public static Device[] getAllDevices() throws SQLException, ClassNotFoundExcepti
 		
 		//iterate result set
 		while(resultSet.next()){
-			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getString("NFC_ID"));
+			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getString("NFC_ID"), resultSet.getString("Locker_Position"), resultSet.getString("Operating_System"), resultSet.getString("Admin_Comments"));
 			counter++;
 		}
 		stmt.close();
@@ -79,7 +79,7 @@ public static Device[] getAvailableDevices() throws SQLException, ClassNotFoundE
 		
 		//iterate result set
 		while(resultSet.next()){
-			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getString("NFC_ID"));
+			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getString("NFC_ID"), resultSet.getString("Locker_Position"), resultSet.getString("Operating_System"), resultSet.getString("Admin_Comments"));
 			counter++;
 		}
 		stmt.close();
diff --git a/src/entities/Device.java b/src/entities/Device.java
index 5e3f871..593fead 100644
--- a/src/entities/Device.java
+++ b/src/entities/Device.java
@@ -16,8 +16,11 @@ public class Device {
 	private String MAC;
 	private String Serial;
 	private String NFC;
+	private String locker_position;
+	private String OS;
+	private String Admin_Comments;
 	
-	public Device(String name, int id, String desc, String hardware, String model, String manufacturer, String available, String mac, String serial, String nfc) {
+	public Device(String name, int id, String desc, String hardware, String model, String manufacturer, String available, String mac, String serial, String nfc, String locker, String os, String comments) {
 		Device_Name = name;
 		Device_ID = id;
 		Device_Description = desc;
@@ -28,6 +31,9 @@ public Device(String name, int id, String desc, String hardware, String model, S
 		MAC = mac;
 		Serial = serial;
 		NFC = nfc;
+		locker_position = locker;
+		OS = os;
+		Admin_Comments = comments;
 	}
 /**
  * Formatting the device to fit a JSON object.