Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java =================================================================== diff -u -r0f26317695dd332266620b2a59bb697a10844c1f -rcaa87aa1c2a7b103a6f7253c34775c075220bb42 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 0f26317695dd332266620b2a59bb697a10844c1f) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision caa87aa1c2a7b103a6f7253c34775c075220bb42) @@ -1040,6 +1040,8 @@ } request.setAttribute("ldPath", ldPathBuilder.toString()); + request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, learningDesign.getContentFolderID()); + request.setAttribute("isIntegrationLogin", ss.getAttribute("isIntegrationLogin")); return "monitor"; Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r70a627b2a1fdfbf5593642d917a7ac21fab99f14 -rcaa87aa1c2a7b103a6f7253c34775c075220bb42 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 70a627b2a1fdfbf5593642d917a7ac21fab99f14) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision caa87aa1c2a7b103a6f7253c34775c075220bb42) @@ -76,6 +76,7 @@ var lessonId = ${lesson.lessonID}, userId = '', ldId = ${lesson.learningDesignID}, + contentFolderId = '${contentFolderID}', lessonStateId = ${lesson.lessonStateID}, createDateTimeStr = '${lesson.createDateTimeStr}', lessonStartDate = '${lesson.scheduleStartDate}', Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r97b9227e4f759db2510bc57ef24be3a3ef714bfc -rcaa87aa1c2a7b103a6f7253c34775c075220bb42 --- lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 97b9227e4f759db2510bc57ef24be3a3ef714bfc) +++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision caa87aa1c2a7b103a6f7253c34775c075220bb42) @@ -315,6 +315,7 @@ label.print = Print label.excel.export = Export label.teams = Teams +label.activity.monitoring = Extra information label.no.questions.in.question.bank = No questions have been added to the question list. Do you still want to proceed with no questions? label.authoring.advance.disclose.answers = Disclose learner's and other groups' answers in monitor label.learning.summary.other.team.answers = Other teams' answers @@ -453,4 +454,4 @@ label.authoring.advance.time.limit.relative.tooltip = Set the duration in minutes that the learners will have to complete the assessment. The duration will apply from the moment each learner begins the assessment. For example, if set to 5 minutes, all learners will have 5 minutes from the moment each of them start the assessment. label.authoring.advance.time.limit.absolute = for all learners label.authoring.advance.time.limit.absolute.tooltip = Set the number of minutes to finish the assessment for all learners. The duration will apply from the moment the first learner starts the assessment. -label.authoring.basic.import.openai = Generative AI +label.authoring.basic.import.openai = Generative AI \ No newline at end of file Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp =================================================================== diff -u -rcfd463431d2171b40403dcff2508408e72685c0e -rcaa87aa1c2a7b103a6f7253c34775c075220bb42 --- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp (.../assessmentStudentChoices.jsp) (revision cfd463431d2171b40403dcff2508408e72685c0e) +++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp (.../assessmentStudentChoices.jsp) (revision caa87aa1c2a7b103a6f7253c34775c075220bb42) @@ -3,32 +3,32 @@ - +
@@ -72,10 +78,14 @@
+ onclick="javascript:loadAePane(${toolContentID}, 'default'); return false;"> + + + + @@ -107,57 +117,57 @@
-
-
-
+
+
+
- - - - - - - - - - +
-
- - ${i.count}. - - ${tblQuestionDto.title} -
-
+ + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - -
+
+ + ${i.count}. + + ${tblQuestionDto.title} +
+
Question type - ${tblQuestionDto.questionTypeLabel} -
Question type + ${tblQuestionDto.questionTypeLabel} +
Correct answer - -
Correct answer + +
+ + + + + + + +
+
+
-
-
-
Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp =================================================================== diff -u -rcfd463431d2171b40403dcff2508408e72685c0e -rcaa87aa1c2a7b103a6f7253c34775c075220bb42 --- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp (.../iraAssessmentStudentChoices.jsp) (revision cfd463431d2171b40403dcff2508408e72685c0e) +++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp (.../iraAssessmentStudentChoices.jsp) (revision caa87aa1c2a7b103a6f7253c34775c075220bb42) @@ -60,13 +60,19 @@ function exportExcel(){ //dynamically create a form and submit it - var exportExcelUrl = "tool/laasse10/monitoring/exportSummary.do?toolContentID=${toolContentID}&downloadTokenValue=dummy&fileName=assessment_export.xlsx&reqID=" + (new Date()).getTime(); + var exportExcelUrl = "tool/laasse10/monitoring/exportSummary.do?toolContentID=${toolContentID}&downloadTokenValue=dummy&fileName=assessment_export.xlsx&reqID=" + + (new Date()).getTime(); var form = $('
'); var hiddenInput = $(''); form.append(hiddenInput); $(document.body).append(form); form.submit(); }; + + function openActivityMonitoring(){ + openPopUp('monitoring/summary.do?toolContentID=${toolContentID}&contentFolderID=' + + contentFolderId, "MonitorActivity", popupHeight, popupWidth, true, true); + }
@@ -78,6 +84,10 @@ + + + + Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -ra455dd0a59c45ffc1d9f9ebd34f33f158bc08d46 -rcaa87aa1c2a7b103a6f7253c34775c075220bb42 --- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision a455dd0a59c45ffc1d9f9ebd34f33f158bc08d46) +++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision caa87aa1c2a7b103a6f7253c34775c075220bb42) @@ -84,6 +84,7 @@ label.group.leader = Group leader: {0} label.refresh = Refresh label.export.excel = Export +label.activity.monitoring = Extra information label.research.analysis = Research and analysis label.scratchie.report = Scratchie report label.overall.summary.by.team = Overall summary by team @@ -307,4 +308,4 @@ label.authoring.advance.time.limit.relative.tooltip = Set the duration in minutes that the learners will have to complete the assessment. The duration will apply from the moment each learner begins the assessment. For example, if set to 5 minutes, all learners will have 5 minutes from the moment each of them start the assessment. label.authoring.advance.time.limit.absolute = for all learners label.authoring.advance.time.limit.absolute.tooltip = Set the number of minutes to finish the assessment for all learners. The duration will apply from the moment the first learner starts the assessment. -label.time.limit.tooltip = Number of minutes that each student will get from the moment they enter this activity. Leave it at 0 for no time restrictions. +label.time.limit.tooltip = Number of minutes that each student will get from the moment they enter this activity. Leave it at 0 for no time restrictions. \ No newline at end of file Index: lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp =================================================================== diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -rcaa87aa1c2a7b103a6f7253c34775c075220bb42 --- lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp (.../studentChoices5.jsp) (revision eccd6838790a4369b6788e48fb5ae5851622fe35) +++ lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp (.../studentChoices5.jsp) (revision caa87aa1c2a7b103a6f7253c34775c075220bb42) @@ -54,6 +54,11 @@ form.submit(); }; + function openActivityMonitoring(){ + openPopUp('monitoring/summary.do?toolContentID=${toolContentID}&contentFolderID=' + + contentFolderId, "MonitorActivity", popupHeight, popupWidth, true, true); + } + $(document).ready(function(){ openEventSource('tblmonitoring/traStudentChoicesFlux.do?toolContentId=${toolContentID}', function(event) { $(tlbMonitorHorizontalScrollElement).load('tblmonitoring/traStudentChoicesTable.do?toolContentID=${toolContentID}'); @@ -102,6 +107,10 @@ + + + +