Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7c12721027454f10b087240a31a83612efa41057 -r4182bf5297751b7755103a8ed9c29f1cfa7edc6d
--- lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 7c12721027454f10b087240a31a83612efa41057)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4182bf5297751b7755103a8ed9c29f1cfa7edc6d)
@@ -417,13 +417,14 @@
label.gates = Gates
label.ira = iRAT
label.tra = tRAT
-label.ira.correct.count = iRAT correct answer count
-label.ira.correct.count.average = iRAT correct answer count average
+label.ira.correct.count = iRAT correct answers
+label.ira.correct.count.average = iRAT correct answers average
label.average = Average
-label.tra.correct.count = tRAT correct answer count
+label.tra.correct.count = tRAT correct answers
label.highest = Highest
label.lowest = Lowest
label.ira.tra.delta = Increase iRAT vs tRAT
+label.ira.tra.correct.count = correct answers iRAT & tRAT
label.summary = Summary
label.burning.questions = Burning Qs
label.forum = Forum
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
===================================================================
diff -u -r7c12721027454f10b087240a31a83612efa41057 -r4182bf5297751b7755103a8ed9c29f1cfa7edc6d
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java (.../TblMonitoringController.java) (revision 7c12721027454f10b087240a31a83612efa41057)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java (.../TblMonitoringController.java) (revision 4182bf5297751b7755103a8ed9c29f1cfa7edc6d)
@@ -45,6 +45,9 @@
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+
/**
* Displays TBL monitor.
*
@@ -182,6 +185,10 @@
int traCorrectAnswerSum = 0;
int deltaSum = 0;
+ ArrayNode chartIraDataset = JsonNodeFactory.instance.arrayNode();
+ ArrayNode chartTraDataset = JsonNodeFactory.instance.arrayNode();
+ ArrayNode chartNamesDataset = JsonNodeFactory.instance.arrayNode();
+
for (TblGroupDTO group : groupDtos) {
Double iraCorrectAnswerCountAverage = group.getIraCorrectAnswerCountAverage();
if (iraCorrectAnswerCountAverage != null) {
@@ -208,6 +215,10 @@
}
if (iraCorrectAnswerCountAverage != null) {
+ chartIraDataset.add(iraCorrectAnswerCountAverage);
+ chartTraDataset.add(traCorrectAnswerCount);
+ chartNamesDataset.add(group.getGroupName());
+
long correctAnswerCountPercentDelta = Math
.round((traCorrectAnswerCount - iraCorrectAnswerCountAverage) * 100
/ iraCorrectAnswerCountAverage);
@@ -243,6 +254,12 @@
request.setAttribute("averageCorrectAnswerCountDelta", (double) deltaSum / deltaCount);
}
+ if (iraGroupsCount > 0 && traGroupsCount > 0) {
+ request.setAttribute("chartIraDataset", chartIraDataset.toString());
+ request.setAttribute("chartTraDataset", chartTraDataset.toString());
+ request.setAttribute("chartNamesDataset", chartNamesDataset.toString());
+ }
+
return "tblmonitor/teams";
}
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 @@
}
-
-
-
+