Index: lams_monitoring/web/includes/javascript/monitorLesson5.js =================================================================== diff -u -rac1bc5dc42645586cf573699676b6f73fcf59d09 -r7fe497ec7a7438f220dfd18d071c02431cc24abc --- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision ac1bc5dc42645586cf573699676b6f73fcf59d09) +++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 7fe497ec7a7438f220dfd18d071c02431cc24abc) @@ -64,11 +64,6 @@ $(document).ready(function(){ - $.ajaxSetup ({ - // Disable caching of AJAX responses - cache: false - }); - initCommonElements(); initSequenceTab(); initGradebookTab(); @@ -155,7 +150,7 @@ break; case 'irat': { - tabContent.load(LAMS_URL + 'tool/laasse10/tblmonitoring/iraAssessment.do?toolContentID=' + iraToolContentId + '&_=' + (new Date()).getTime()); + tabContent.load(LAMS_URL + 'tool/laasse10/tblmonitoring/iraAssessment.do?toolContentID=' + iraToolContentId); } break; @@ -164,6 +159,16 @@ } break; + case 'trat': { + tabContent.load(LAMS_URL + 'tool/lascrt11/tblmonitoring/tra.do?toolContentID=' + traToolContentId); + } + break; + + case 'tratStudentChoices': { + tabContent.load(LAMS_URL + 'tool/lascrt11/tblmonitoring/traStudentChoices.do?toolContentID=' + traToolContentId); + } + break; + case 'aes': { tabContent.load(LAMS_URL + 'monitoring/tblmonitor/aes.do?' + '&aeToolContentIds='+ aeToolContentIds @@ -213,7 +218,15 @@ $('#load-irat-student-choices-tab-btn').click(function(){ loadTab('iratStudentChoices', this); }); + + $('#load-trat-tab-btn').click(function(){ + loadTab('trat', this); + }); + $('#load-trat-student-choices-tab-btn').click(function(){ + loadTab('tratStudentChoices', this); + }); + $('#load-aes-tab-btn').click(function(){ loadTab('aes', this); }); @@ -2802,6 +2815,8 @@ loadTab('irat'); } else if (tabName == 'iratStudentChoices'){ loadTab('iratStudentChoices'); + } else if (tabName == 'trat'){ + loadTab('trat'); } else if (tabName == 'aes'){ loadTab('aes'); } Index: lams_monitoring/web/monitor5.jsp =================================================================== diff -u -r2a5fb646572b9790ef4b88e795e15811d94ed19d -r7fe497ec7a7438f220dfd18d071c02431cc24abc --- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 2a5fb646572b9790ef4b88e795e15811d94ed19d) +++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 7fe497ec7a7438f220dfd18d071c02431cc24abc) @@ -42,6 +42,7 @@ + @@ -59,6 +60,7 @@ TOTAL_LESSON_LEARNERS_NUMBER = ${lesson.numberPossibleLearners}, iraToolContentId = '${iraToolContentId}', + traToolContentId = '${traToolContentId}', aeToolContentIds = "${aeToolContentIds}", aeToolTypes = "${aeToolTypes}", aeActivityTitles = "${aeActivityTitles}", @@ -334,7 +336,7 @@ - + @@ -346,10 +348,16 @@ Index: lams_tool_assessment/web/pages/learning/results/allquestions5.jsp =================================================================== diff -u -rac1bc5dc42645586cf573699676b6f73fcf59d09 -r7fe497ec7a7438f220dfd18d071c02431cc24abc --- lams_tool_assessment/web/pages/learning/results/allquestions5.jsp (.../allquestions5.jsp) (revision ac1bc5dc42645586cf573699676b6f73fcf59d09) +++ lams_tool_assessment/web/pages/learning/results/allquestions5.jsp (.../allquestions5.jsp) (revision 7fe497ec7a7438f220dfd18d071c02431cc24abc) @@ -193,13 +193,13 @@ - + " alt=""> -

+

${status.index + sessionMap.questionNumberingOffset}. @@ -209,12 +209,6 @@

- - - - -   - ${question.question} Index: lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp =================================================================== diff -u -rac1bc5dc42645586cf573699676b6f73fcf59d09 -r7fe497ec7a7438f220dfd18d071c02431cc24abc --- lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp (.../assessment5.jsp) (revision ac1bc5dc42645586cf573699676b6f73fcf59d09) +++ lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp (.../assessment5.jsp) (revision 7fe497ec7a7438f220dfd18d071c02431cc24abc) @@ -49,7 +49,7 @@
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java =================================================================== diff -u -rfd09b5f6803a74b4660114e2bacc234bf9ba7c38 -r7fe497ec7a7438f220dfd18d071c02431cc24abc --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java (.../TblMonitorController.java) (revision fd09b5f6803a74b4660114e2bacc234bf9ba7c38) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java (.../TblMonitorController.java) (revision 7fe497ec7a7438f220dfd18d071c02431cc24abc) @@ -107,7 +107,7 @@ request.setAttribute("groupSummaries", groupSummaries); } - return "pages/tblmonitoring/tra"; + return "pages/tblmonitoring/tra5"; } /** @@ -125,7 +125,7 @@ model.addAttribute("scratchie", scratchie); model.addAttribute("isTbl", true); - return "pages/monitoring/studentChoices"; + return "pages/monitoring/studentChoices5"; } /** Index: lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp =================================================================== diff -u --- lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp (revision 0) +++ lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp (revision 7fe497ec7a7438f220dfd18d071c02431cc24abc) @@ -0,0 +1,386 @@ +<%@ include file="/common/taglibs.jsp"%> +<% pageContext.setAttribute("newLineChar", "\r\n"); %> + +monitoring/timeLimit5.jsp + + + + + + + + + + + +
+ + + + +
+
+

+ +

+
+
+ + + + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bg-success + bg-danger text-white + bg-warning + + + + + + + + + + + + + + + + + + + + + bg-success + bg-danger text-white + bg-warning + + + + + + + + + + + + bg-success + bg-danger text-white + bg-warning + + + + + + + + + + + bg-success + bg-danger text-white + bg-warning + + + + + + + + + + +
+ + ${i.index + 1} + + +   + "> + + % +
+ + + + + + ${item.correctAnswerLetter} + +
+ +
+ + + + ${sessionDto.sessionName} + + + + + + + + ${sessionDto.sessionName} + + + + + + + + successful-response wrong-response"> + + + + + + + + + + + + + ${sessionDto.mark} + + % +
  + "> + ${item.correctOnFirstAttemptCount} + +   + "> + -
% + % + - +  %  + "> +
+
+
+
+
+ + + + + + + +
+
+
+
+
\ No newline at end of file Index: lams_tool_scratchie/web/pages/tblmonitoring/tra5.jsp =================================================================== diff -u --- lams_tool_scratchie/web/pages/tblmonitoring/tra5.jsp (revision 0) +++ lams_tool_scratchie/web/pages/tblmonitoring/tra5.jsp (revision 7fe497ec7a7438f220dfd18d071c02431cc24abc) @@ -0,0 +1,155 @@ +<%@ include file="/common/taglibs.jsp"%> +<% pageContext.setAttribute("newLineChar", "\r\n"); %> + + + + + +
+
+
+

+ +

+
+
+ +
+
+

+ + : ${attemptedLearnersNumber}/ +

+
+
+ +
+
+ + + + +
+
+
+
+

+ ${i.index+1}. +

+ +
+ +
+
+ + + + bg-success + + + + + + + + + + + + + + +
+ + ${ALPHABET[j.index]}. + + + + + + + + + + + + + + ${fn:replace(qbOption.name, newLineChar, ', ')} +
+
+
+
+
+
+
+ + +
+
+
+
+  () +
+ +
+ +
+
+
+
+
\ No newline at end of file