Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
===================================================================
diff -u -reed8ffff31396b5fd6c63a4c35cbb92767e49359 -r06ca6dbd77e91c4298f60ca2597ceff1bf8d64f5
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision eed8ffff31396b5fd6c63a4c35cbb92767e49359)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 06ca6dbd77e91c4298f60ca2597ceff1bf8d64f5)
@@ -506,13 +506,13 @@
userData.put(questionResultUid);
userData.put(questionResult.getMaxMark());
userData.put(fullName);
- userData.put(AssessmentEscapeUtils.printResponsesForJqgrid(questionResult));
+ //LDEV_NTU-11 Swapping Mark and Response columns in Assessment Monitor
+ userData.put(questionResult.getMark());
// show confidence levels if this feature is turned ON
if (assessment.isEnableConfidenceLevels()) {
userData.put(questionResult.getConfidenceLevel());
}
-
- userData.put(questionResult.getMark());
+ userData.put(AssessmentEscapeUtils.printResponsesForJqgrid(questionResult));
if (userDto.getPortraitId() != null) {
userData.put(userDto.getPortraitId());
}
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -r1e25de333185aa272dbfc03ea327ea740a0094ba -r06ca6dbd77e91c4298f60ca2597ceff1bf8d64f5
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision 1e25de333185aa272dbfc03ea327ea740a0094ba)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision 06ca6dbd77e91c4298f60ca2597ceff1bf8d64f5)
@@ -38,23 +38,23 @@
'questionResultUid',
'maxMark',
"",
- "",
+ "",
"",
- "",
+ "",
'portraitId'
],
colModel:[
{name:'questionResultUid', index:'questionResultUid', width:0, hidden: true},
{name:'maxMark', index:'maxMark', width:0, hidden: true},
{name:'userName',index:'userName', width:120, searchoptions: { clearSearch: false }, formatter:userNameFormatter},
- {name:'response', index:'response', width:427, sortable:false, search:false},
+ {name:'grade', index:'grade', width:80, sorttype:"float", search:false, editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' },
{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
- {name:'grade', index:'grade', width:80, sorttype:"float", search:false, editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' },
+ {name:'response', index:'response', width:427, sortable:false, search:false},
{name:'portraitId', index:'portraitId', width:0, hidden: true}
],
multiselect: false,
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r1e25de333185aa272dbfc03ea327ea740a0094ba -r06ca6dbd77e91c4298f60ca2597ceff1bf8d64f5
--- lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 1e25de333185aa272dbfc03ea327ea740a0094ba)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 06ca6dbd77e91c4298f60ca2597ceff1bf8d64f5)
@@ -91,21 +91,21 @@
'#',
'questionResultUid',
'Question',
- "",
+ "",
"",
- ""
+ ""
],
colModel:[
{name:'id', index:'id', width:20, sorttype:"int"},
{name:'questionResultUid', index:'questionResultUid', width:0, hidden: true},
{name:'title', index:'title', width: 200},
- {name:'response', index:'response', width:443, sortable:false},
+ {name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' },
{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
- {name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' }
+ {name:'response', index:'response', width:443, sortable:false}
],
multiselect: false,