fixed pie chart to show umbrella terms

arc12012 · Apr 16, 2017 · 367c4d9 · 367c4d9
1 parent 76ba1c7
commit 367c4d9
Showing 1 changed file with 16 additions and 4 deletions.
diff --git 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',