Index: lams_monitoring/web/tblmonitor/teams.jsp =================================================================== diff -u -rac8e6a50884cc7deb0deb3cc7262971d6ccafb05 -r4182bf5297751b7755103a8ed9c29f1cfa7edc6d --- lams_monitoring/web/tblmonitor/teams.jsp (.../teams.jsp) (revision ac8e6a50884cc7deb0deb3cc7262971d6ccafb05) +++ lams_monitoring/web/tblmonitor/teams.jsp (.../teams.jsp) (revision 4182bf5297751b7755103a8ed9c29f1cfa7edc6d) @@ -30,6 +30,55 @@ $(this).toggleClass("collapsed"); }); + + // summary chart + var summaryChartIraDataset = JSON.parse('${chartIraDataset}'), + summaryChartTraDataset = JSON.parse('${chartTraDataset}'), + summaryChartNamesDataset = JSON.parse('${chartNamesDataset}'), + ctx = $('#summary-chart')[0].getContext('2d'), + summaryChart = new Chart(ctx, { + type : 'bar', + data : { + datasets : [ { + label: "iRAT", + data : summaryChartIraDataset, + backgroundColor : 'rgba(255, 195, 55, 1)' + + }, + { + label: "tRAT", + data : summaryChartTraDataset, + backgroundColor : 'rgba(5, 204, 214, 1)' + + }], + labels : summaryChartNamesDataset + }, + options : { + legend : { + display : false + }, + animation : { + duration : 0 + }, + scales : { + yAxes : [ + { + ticks : { + beginAtZero : true + }, + scaleLabel : { + display : true, + labelString : "", + fontSize : 15 + } + } + ] + } + } + }); + + + //Comparison button modal window var chart; $('#comparison-modal').on('shown.bs.modal', function (event) { @@ -50,7 +99,7 @@ //titles var groupId = link.data('group-id'); var groupName = $("#group-name-" + groupId).html(); - var title = groupName + ": iRA vs tRA comparison"; + var title = groupName + ": "; var userNames = []; $(".belong-to-group-" + groupId).each(function() { @@ -66,13 +115,13 @@ type : 'bar', data : { datasets : [ { - label: "iRA", + label: "iRAT", data : iraScores, backgroundColor : 'rgba(255, 195, 55, 1)' }, { - label: "tRA", + label: "tRAT", data : traScores, backgroundColor : 'rgba(5, 204, 214, 1)' @@ -85,6 +134,15 @@ }, animation : { duration : 1000 + }, + scales : { + yAxes : [ + { + ticks : { + beginAtZero : true + } + } + ] } } }); @@ -174,24 +232,20 @@ } - -
-
-
-

- -

-
-
-
- +