Index: lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
===================================================================
diff -u -r558dfc923607b5ac73c0cf9aa6bbd92eed41e46b -rb7ab93d56faa7b55a7603d08e358b7486c5345a0
--- lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp (.../masterDetailLoadUp.jsp) (revision 558dfc923607b5ac73c0cf9aa6bbd92eed41e46b)
+++ lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp (.../masterDetailLoadUp.jsp) (revision b7ab93d56faa7b55a7603d08e358b7486c5345a0)
@@ -5,6 +5,10 @@
function masterDetailLoadUp(){
jQuery("#userSummary${assessmentResult.sessionId}").clearGridData().setGridParam({scrollOffset: 18});
+ $('#userSummary${assessmentResult.sessionId}').on( "sortstop", function(event, ui) {
+ debugger;
+ });
+
@@ -19,6 +23,7 @@
table.addRowData(${i.index + 1}, {
id:"${i.index + 1}",
questionResultUid:"${questionResult.uid}",
+ questionType : "${questionResult.questionDto.type}",
title:"${fn:escapeXml(title)}",
response:responseStr,
@@ -32,28 +37,23 @@
""
-
+ ,
+ marker :
+
+
+ ("")
+
+
+ ""
+
+
+ ""
+
+
});
-
// set maxGrade attribute to cell DOM element
- table.setCell(${i.index + 1}, "grade", "", ${requiresMarking ? "'requires-grading'" : "null"},
- {"maxGrade" : "${questionResult.maxMark}"
-
-
- ,"title" : ""
- ,"data-toggle" : "tooltip"
- ,"data-container" : "body"
-
-
- ,"title" : "
-
- "
- ,"data-toggle" : "tooltip"
- ,"data-container" : "body"
-
-
- });
+ table.setCell(${i.index + 1}, "grade", "", null, {"maxGrade" : "${questionResult.maxMark}"});
$('[data-toggle="tooltip"]').bootstrapTooltip();
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r558dfc923607b5ac73c0cf9aa6bbd92eed41e46b -rb7ab93d56faa7b55a7603d08e358b7486c5345a0
--- lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 558dfc923607b5ac73c0cf9aa6bbd92eed41e46b)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision b7ab93d56faa7b55a7603d08e358b7486c5345a0)
@@ -113,23 +113,27 @@
colNames:[
'#',
'questionResultUid',
+ 'questionType',
'Question',
"",
"",
- ""
+ "",
+ "Marker"
],
colModel:[
{name:'id', index:'id', width:20, sorttype:"int"},
{name:'questionResultUid', index:'questionResultUid', width:0, hidden: true},
+ {name:'questionType', index:'questionType', width:0, hidden: true},
{name:'title', index:'title', width: 200},
{name:'grade', index:'grade', width:80, sorttype:"float", editable:true,
editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align', title : false },
{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
- {name:'response', index:'response', datatype:'html', width:443, sortable:false}
+ {name:'response', index:'response', datatype:'html', width:443, sortable:false},
+ {name:'marker', index:'marker', width: 80, title: false}
],
multiselect: false,