Index: lams_tool_assessment/web/includes/javascript/chart.js =================================================================== diff -u -r52c0736c3d1adbba1c561772f11a79194356e247 -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 --- lams_tool_assessment/web/includes/javascript/chart.js (.../chart.js) (revision 52c0736c3d1adbba1c561772f11a79194356e247) +++ lams_tool_assessment/web/includes/javascript/chart.js (.../chart.js) (revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1) @@ -1,4 +1,4 @@ -function drawCompletionCharts(toolContentId, animate) { +function drawCompletionCharts(toolContentId, useGroups,animate) { $.ajax({ 'url' : WEB_APP_URL + 'monitoring/getCompletionChartsData.do', 'data': { @@ -8,7 +8,7 @@ 'success' : function(data) { // draw charts for the first time drawActivityCompletionChart(data, animate); - drawAnsweredQuestionsChart(data, animate); + drawAnsweredQuestionsChart(data, useGroups, animate); } }); @@ -19,7 +19,7 @@ // set up update interval for the charts completionChartInterval = window.setInterval(function(){ - drawCompletionCharts(toolContentId, animate); + drawCompletionCharts(toolContentId, useGroups,animate); }, COMPLETION_CHART_UPDATE_INTERVAL); } } @@ -108,7 +108,7 @@ }); } -function drawAnsweredQuestionsChart(data, animate){ +function drawAnsweredQuestionsChart(data, useGroups, animate){ if (!data.answeredQuestionsByUsers) { return; } @@ -167,11 +167,11 @@ // prevent scale to change on each update // set suggested max number of students to 3/4 // of all possible learners - suggestedMax : 3 * data.possibleLearners / 4 + suggestedMax : Math.max(2, Math.floor(3 * (useGroups ? data.sessionCount : data.possibleLearners) / 4)) }, scaleLabel : { display : true, - labelString : LABELS.ANSWERED_QUESTIONS_CHART_Y_AXIS, + labelString : useGroups ? LABELS.ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : LABELS.ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS, fontSize : 14 } }