From 1d04f5aae7b9f4576356e992280d8598bdcf57d5 Mon Sep 17 00:00:00 2001 From: John Costa Date: Sun, 16 Apr 2017 21:38:12 -0400 Subject: [PATCH] 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 += '
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',