Skip to content

Commit

Permalink
fixed up statistics to match changes mentioned by zach
Browse files Browse the repository at this point in the history
  • Loading branch information
jic13003 committed Apr 17, 2017
1 parent 367c4d9 commit 1d04f5a
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions WebContent/html/javascript/statistics.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -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 +
Expand All @@ -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',
Expand Down

0 comments on commit 1d04f5a

Please sign in to comment.