Index: lams_monitoring/web/includes/javascript/monitorLesson5.js
===================================================================
diff -u -r89da5ec382514ba94e3b2f2b8661ec28b42f7afe -r08f538ec5750238a01bc6b9a029c05531a201c2e
--- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 89da5ec382514ba94e3b2f2b8661ec28b42f7afe)
+++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 08f538ec5750238a01bc6b9a029c05531a201c2e)
@@ -148,6 +148,11 @@
tabContent.load(LAMS_URL + 'monitoring/tblmonitor/gates.do?lessonID=' + lessonId);
}
break;
+
+ case 'irat': {
+ tabContent.load(LAMS_URL + 'tool/laasse10/tblmonitoring/iraAssessment.do?toolContentID=' + iraToolContentId);
+ }
+ break;
}
}
@@ -183,6 +188,10 @@
loadTab('gates', this);
});
+ $('#load-irat-tab-btn').click(function(){
+ loadTab('irat', this);
+ });
+
$('#load-other-nvg-btn').click(function(){
let switchButton = $(this),
tblButtons = $('#tbl-navigate-btn-group'),
Index: lams_monitoring/web/monitor5.jsp
===================================================================
diff -u -r89da5ec382514ba94e3b2f2b8661ec28b42f7afe -r08f538ec5750238a01bc6b9a029c05531a201c2e
--- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 89da5ec382514ba94e3b2f2b8661ec28b42f7afe)
+++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 08f538ec5750238a01bc6b9a029c05531a201c2e)
@@ -54,6 +54,8 @@
lessonStartDate = '${lesson.scheduleStartDate}',
lessonEndDate = '${lesson.scheduleEndDate}',
liveEditEnabled = ${enableLiveEdit && lesson.liveEditEnabled},
+ TOTAL_LESSON_LEARNERS_NUMBER = ${lesson.numberPossibleLearners},
+ iraToolContentId='${iraToolContentId}',
LAMS_URL = '',
csrfToken = ' : ',
csrfTokenName = '',
@@ -320,11 +322,11 @@
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -r6f59d1b57843500bf2a226bfea958cc2b9d795ee -r08f538ec5750238a01bc6b9a029c05531a201c2e
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision 6f59d1b57843500bf2a226bfea958cc2b9d795ee)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision 08f538ec5750238a01bc6b9a029c05531a201c2e)
@@ -1317,7 +1317,7 @@
sessionMap.put(AssessmentConstants.CONFIG_KEY_HIDE_TITLES,
Boolean.valueOf(service.getConfigValue(AssessmentConstants.CONFIG_KEY_HIDE_TITLES)));
- return "pages/learning/results" + (embedded ? "/allquestions" : "");
+ return "pages/learning/results" + (embedded ? "/allquestions5" : "");
}
@RequestMapping(path = "/logLearnerInteractionEvent", method = RequestMethod.POST)
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
===================================================================
diff -u -rfd09b5f6803a74b4660114e2bacc234bf9ba7c38 -r08f538ec5750238a01bc6b9a029c05531a201c2e
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision fd09b5f6803a74b4660114e2bacc234bf9ba7c38)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision 08f538ec5750238a01bc6b9a029c05531a201c2e)
@@ -189,7 +189,7 @@
int attemptedLearnersNumber = assessmentService.getCountUsersByContentId(toolContentId);
model.addAttribute("attemptedLearnersNumber", attemptedLearnersNumber);
- return "pages/tblmonitoring/assessment";
+ return "pages/tblmonitoring/assessment5";
}
/**
Index: lams_tool_assessment/web/pages/learning/results/allquestions5.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/results/allquestions5.jsp (revision 0)
+++ lams_tool_assessment/web/pages/learning/results/allquestions5.jsp (revision 08f538ec5750238a01bc6b9a029c05531a201c2e)
@@ -0,0 +1,333 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%@ include file="multiplechoice.jsp"%>
+
+
+
+ <%@ include file="matchingpairs.jsp"%>
+
+
+
+ <%@ include file="vsa.jsp"%>
+
+
+
+ <%@ include file="numerical.jsp"%>
+
+
+
+ <%@ include file="truefalse.jsp"%>
+
+
+
+ <%@ include file="essay.jsp"%>
+
+
+
+ <%@ include file="ordering.jsp"%>
+
+
+
+
+ <%@ include file="markhedging.jsp"%>
+
+
+
+
+ <%@ include file="markandpenaltyarea.jsp"%>
+
+
+
+ <%@ include file="historyresponses.jsp"%>
+
+
+ <%@ include file="confidencelevel.jsp"%>
+
+
+
+
+
+
+ <%-- Display a table with other groups' justifications --%>
+
+
+
+
+
+
+
+
+ <%-- Get the needed piece of information from a complicated questionSummaries structure --%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%-- Sessions are named after groups --%>
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+ <%-- Display only own justification --%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp (revision 0)
+++ lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp (revision 08f538ec5750238a01bc6b9a029c05531a201c2e)
@@ -0,0 +1,121 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+
\ No newline at end of file
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp (revision 0)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp (revision 08f538ec5750238a01bc6b9a029c05531a201c2e)
@@ -0,0 +1,77 @@
+<%@ include file="/common/taglibs.jsp"%>
+<% pageContext.setAttribute("newLineChar", "\r\n"); %>
+
+
+<%@ include file="/pages/monitoring/parts/discloseAnswers.jsp"%>
+
+
+
+
+ <%-- For AEs tab the panes are defined in TBL monitor, for IRA we need to define it here --%>
+
+
+
+
+
+
+
+
+
+
+ : ${attemptedLearnersNumber}/
+
+
+
+
+
+
+ <%-- Release correct/groups answers for all questions in this assessment --%>
+
+
+
+
+
+
\ No newline at end of file