Index: lams_monitoring/web/includes/javascript/monitorLesson5.js =================================================================== diff -u -re63f171f9fe9c08cdf47514249ecb9757419193c -r1a24cfe9b9193edfa8bb951c538a9520dd319f42 --- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision e63f171f9fe9c08cdf47514249ecb9757419193c) +++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 1a24cfe9b9193edfa8bb951c538a9520dd319f42) @@ -168,6 +168,11 @@ tabContent.load(LAMS_URL + 'tool/lascrt11/tblmonitoring/traStudentChoices.do?toolContentID=' + traToolContentId); } break; + + case 'burningQuestions': { + tabContent.load(LAMS_URL + 'tool/lascrt11/tblmonitoring/burningQuestions.do?toolContentID=' + traToolContentId); + } + break; case 'aes': { tabContent.load(LAMS_URL + 'monitoring/tblmonitor/aes.do?' @@ -227,6 +232,10 @@ loadTab('tratStudentChoices', this); }); + $('#load-burning-tab-btn').click(function(){ + loadTab('burningQuestions', this); + }); + $('#load-aes-tab-btn').click(function(){ loadTab('aes', this); }); @@ -2817,6 +2826,10 @@ loadTab('iratStudentChoices'); } else if (tabName == 'trat'){ loadTab('trat'); + } else if (tabName == 'tratStudentChoices'){ + loadTab('tratStudentChoices'); + } else if (tabName == 'burningQuestions'){ + loadTab('burningQuestions'); } else if (tabName == 'aes'){ loadTab('aes'); } Index: lams_monitoring/web/monitor5.jsp =================================================================== diff -u -r7fe497ec7a7438f220dfd18d071c02431cc24abc -r1a24cfe9b9193edfa8bb951c538a9520dd319f42 --- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 7fe497ec7a7438f220dfd18d071c02431cc24abc) +++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 1a24cfe9b9193edfa8bb951c538a9520dd319f42) @@ -596,7 +596,7 @@ --> -

Lesson Name

+

Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java =================================================================== diff -u -r7fe497ec7a7438f220dfd18d071c02431cc24abc -r1a24cfe9b9193edfa8bb951c538a9520dd319f42 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java (.../TblMonitorController.java) (revision 7fe497ec7a7438f220dfd18d071c02431cc24abc) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java (.../TblMonitorController.java) (revision 1a24cfe9b9193edfa8bb951c538a9520dd319f42) @@ -196,7 +196,7 @@ request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, scratchie.getContentId()); request.setAttribute("discussionSentimentEnabled", scratchie.isDiscussionSentimentEnabled()); - return "pages/monitoring/parts/burningQuestions"; + return "pages/monitoring/parts/burningQuestions5"; } /** Index: lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions5.jsp =================================================================== diff -u --- lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions5.jsp (revision 0) +++ lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions5.jsp (revision 1a24cfe9b9193edfa8bb951c538a9520dd319f42) @@ -0,0 +1,229 @@ +<%@ include file="/common/taglibs.jsp"%> + + + +
+ + +
+
+

+ +

+
+
+ +
+
+ +
+
+
+ + + + + <%-- toolQuestionUid, i.e. item UID, is required for discussion token. + It is missing for general burning questions as they are not bound to any question. + In this case we use first question's UID, as burning question UID will uniquely identify the discussion anyway + --%> + + +
+

+ +

+
+
+ + +
+
+ + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + ${burningQuestionDto.escapedBurningQuestion} + + ${burningQuestionDto.likeCount} + + +
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
\ No newline at end of file