Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r6ab3389a13d007de0abc74bc9df848332037f9dd -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 --- lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 6ab3389a13d007de0abc74bc9df848332037f9dd) +++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1) @@ -415,5 +415,6 @@ label.monitoring.summary.completion.completed = Completed label.monitoring.summary.answered.questions = Students Progress label.monitoring.summary.answered.questions.x.axis = Number of answered questions -label.monitoring.summary.answered.questions.y.axis = Students +label.monitoring.summary.answered.questions.y.axis.students = Students +label.monitoring.summary.answered.questions.y.axis.groups = Groups label.authoring.basic.import.word = MS Word Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java =================================================================== diff -u -r83788437f93dd64ff91ee58e0cd343bdc8a55f33 -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision 83788437f93dd64ff91ee58e0cd343bdc8a55f33) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1) @@ -117,14 +117,16 @@ + " (type = 8 AND answer_int > 0)" + " ,1, 0)) AS answered_question_count FROM" + " (SELECT ar.user_uid, qbq.type, qr.mark, qbta.answer, oa.answer_boolean, oa.answer_int" - + " FROM tl_laasse10_assessment AS a" + + " FROM tl_laasse10_assessment AS a" + " JOIN tl_laasse10_assessment_result AS ar ON a.uid = ar.assessment_uid" + + " JOIN tl_laasse10_session AS s USING (session_id)" + " JOIN tl_laasse10_question_result AS qr ON ar.uid = qr.result_uid" + " JOIN lams_qb_tool_answer AS qbta ON qbta.answer_uid = qr.uid" + " JOIN lams_qb_tool_question AS qbtq USING (tool_question_uid)" + " JOIN lams_qb_question AS qbq ON qbq.uid = qbtq.qb_question_uid" + " LEFT JOIN tl_laasse10_option_answer AS oa ON oa.question_result_uid = qr.uid" + " WHERE ar.latest = 1" + + " AND (a.use_select_leader_tool_ouput = 0 OR s.group_leader_uid = ar.user_uid)" + " AND ((qbq.type = 7 AND qr.mark > 0) OR (qbta.answer IS NOT NULL AND TRIM(qbta.answer) <> '') " + " OR oa.answer_boolean IS NULL OR oa.answer_boolean = 1 OR answer_int <> -1)" + " AND a.content_id = :toolContentId" Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java =================================================================== diff -u -r36716004da333fcc5eb3f776801e3e5278719fd7 -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 36716004da333fcc5eb3f776801e3e5278719fd7) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1) @@ -250,6 +250,7 @@ chartJson.put("startedLearners", service.getCountUsersByContentId(toolContentId)); chartJson.put("completedLearners", service.getCountLearnersWithFinishedCurrentAttempt(toolContentId)); + chartJson.put("sessionCount", service.getSessionsByContentId(toolContentId).size()); Map answeredQuestionsByUsers = service.getCountAnsweredQuestionsByUsers(toolContentId); if (!answeredQuestionsByUsers.isEmpty()) { chartJson.set("answeredQuestionsByUsers", JsonUtil.readObject(answeredQuestionsByUsers)); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java =================================================================== diff -u -r4e9425a2e99b7b5a99f7224d7e6ace59719d2c04 -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision 4e9425a2e99b7b5a99f7224d7e6ace59719d2c04) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1) @@ -115,6 +115,7 @@ request.setAttribute("questions", questionDtos); request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId); + request.setAttribute("groupsInAnsweredQuestionsChart", assessment.isUseSelectLeaderToolOuput()); return "pages/tblmonitoring/iraAssessmentStudentChoices"; } @@ -255,6 +256,7 @@ request.setAttribute("sessions", sessions); request.setAttribute("questionDtos", tblQuestionDtos); request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId); + request.setAttribute("groupsInAnsweredQuestionsChart", assessment.isUseSelectLeaderToolOuput()); return "pages/tblmonitoring/assessmentStudentChoices"; } 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 } } Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -r52c0736c3d1adbba1c561772f11a79194356e247 -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 --- lams_tool_assessment/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 52c0736c3d1adbba1c561772f11a79194356e247) +++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1) @@ -53,8 +53,10 @@ ANSWERED_QUESTIONS_CHART_TITLE : '', ANSWERED_QUESTIONS_CHART_X_AXIS : '', - - ANSWERED_QUESTIONS_CHART_Y_AXIS : '' + + ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS : '', + + ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : '' }, // pass settings to monitorToolSummaryAdvanced.js submissionDeadlineSettings = { Index: lams_tool_assessment/web/pages/monitoring/summary.jsp =================================================================== diff -u -rb7bb3d6cf518847e49ca575d7c594a55f06b9b9e -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 --- lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision b7bb3d6cf518847e49ca575d7c594a55f06b9b9e) +++ lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1) @@ -316,7 +316,7 @@ } initInidividualTimeLimitAutocomplete(); - drawCompletionCharts(${assessment.contentId}, true); + drawCompletionCharts(${assessment.contentId}, ${assessment.useSelectLeaderToolOuput}, true); }); function resizeJqgrid(jqgrids) { Index: lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp =================================================================== diff -u -rdca7b3dba49f1ed80be1ad3fc19958073005d1d8 -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 --- lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp (.../assessment.jsp) (revision dca7b3dba49f1ed80be1ad3fc19958073005d1d8) +++ lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp (.../assessment.jsp) (revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1) @@ -30,8 +30,10 @@ ANSWERED_QUESTIONS_CHART_TITLE : '', ANSWERED_QUESTIONS_CHART_X_AXIS : '', - - ANSWERED_QUESTIONS_CHART_Y_AXIS : '' + + ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS : '', + + ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : '' }); $(document).ready(function(){ Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp =================================================================== diff -u -rdca7b3dba49f1ed80be1ad3fc19958073005d1d8 -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 --- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp (.../assessmentStudentChoices.jsp) (revision dca7b3dba49f1ed80be1ad3fc19958073005d1d8) +++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp (.../assessmentStudentChoices.jsp) (revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1) @@ -18,7 +18,7 @@ COMPLETION_CHART_UPDATE_INTERVAL = 10 * 1000; $(document).ready(function(){ - drawCompletionCharts(${toolContentID}, true); + drawCompletionCharts(${toolContentID}, ${groupsInAnsweredQuestionsChart}, true); }); function exportExcel(){ Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp =================================================================== diff -u -rdca7b3dba49f1ed80be1ad3fc19958073005d1d8 -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 --- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp (.../iraAssessmentStudentChoices.jsp) (revision dca7b3dba49f1ed80be1ad3fc19958073005d1d8) +++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp (.../iraAssessmentStudentChoices.jsp) (revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1) @@ -15,7 +15,7 @@ COMPLETION_CHART_UPDATE_INTERVAL = 0; $(document).ready(function(){ - drawCompletionCharts(${toolContentID}, false); + drawCompletionCharts(${toolContentID}, ${groupsInAnsweredQuestionsChart}, false); }); function exportExcel(){