Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java =================================================================== diff -u -r4f1a37c96ff1b0aab43c11f24ba557ba0fdbe5dd -r1dbecfa7a6a96832fa3c1578a4ac977b424a2b9d --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 4f1a37c96ff1b0aab43c11f24ba557ba0fdbe5dd) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 1dbecfa7a6a96832fa3c1578a4ac977b424a2b9d) @@ -600,9 +600,14 @@ userData.add(questionResultUid); userData.add(questionResult.getMaxMark()); userData.add(fullName); - //LDEV_NTU-11 Swapping Mark and Response columns in Assessment Monitor - userData.add(questionResult.getQbQuestion().getType().equals(QbQuestion.TYPE_ESSAY) - && questionResult.getMarkedBy() == null ? "-" : questionResult.getMark().toString()); + + String response = AssessmentEscapeUtils.printResponsesForJqgrid(questionResult); + if (StringUtils.isNotBlank(questionResult.getJustification())) { + response += "
" + service.getMessage("label.answer.justification") + "
" + + questionResult.getJustificationEscaped(); + } + userData.add(response); + // show confidence levels if this feature is turned ON if (assessment.isEnableConfidenceLevels()) { userData.add(questionResult.getQbQuestion().getType().equals(QbQuestion.TYPE_MARK_HEDGING) ? -1 @@ -636,14 +641,10 @@ userData.add(starString); } - String response = AssessmentEscapeUtils.printResponsesForJqgrid(questionResult); - if (StringUtils.isNotBlank(questionResult.getJustification())) { - response += "
" + service.getMessage("label.answer.justification") + "
" - + questionResult.getJustificationEscaped(); - } - - userData.add(response); + //LDEV_NTU-11 Swapping Mark and Response columns in Assessment Monitor + userData.add(questionResult.getQbQuestion().getType().equals(QbQuestion.TYPE_ESSAY) + && questionResult.getMarkedBy() == null ? "-" : questionResult.getMark().toString()); userData.add( questionResult.getMarkedBy() == null ? (questionResult.getQbQuestion().getType().equals(QbQuestion.TYPE_ESSAY) @@ -664,6 +665,7 @@ } userData.add("-"); userData.add(""); + userData.add(""); } userData.add(userDto.getUserId()); Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp =================================================================== diff -u -r4f1a37c96ff1b0aab43c11f24ba557ba0fdbe5dd -r1dbecfa7a6a96832fa3c1578a4ac977b424a2b9d --- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision 4f1a37c96ff1b0aab43c11f24ba557ba0fdbe5dd) +++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision 1dbecfa7a6a96832fa3c1578a4ac977b424a2b9d) @@ -103,14 +103,14 @@ 'questionResultUid', 'maxMark', "", - "", + "", "", "", - "", + "", "", "", 'userId', @@ -123,15 +123,15 @@ {name:'userName',index:'userName', width:83, searchoptions: { clearSearch: false }, formatter : function(cellvalue, options, rowObject) { return definePortraitPopover(rowObject[rowObject.length - 1], rowObject[rowObject.length - 2], rowObject[2]); }}, - {name:'grade', index:'grade', width:30, sorttype:"float", search:false, editable:true, - editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align', title : false}, + {name:'response', index:'response', width:400, sortable:false, search:false, formatter: responseFormatter}, {name:'confidence', index:'confidence', width: 80, search:false, classes: 'vertical-align', formatter: gradientNumberFormatter}, {name:'rating', index:'rating', width:120, align:"center", sortable:false, search:false}, - {name:'response', index:'response', width:400, sortable:false, search:false, formatter: responseFormatter}, + {name:'grade', index:'grade', width:30, sorttype:"float", search:false, editable:true, + editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align', title : false}, {name:'marker', index:'marker', width: 80, search:false, title: false}, {name:'markerComment', index:'markerComment', width:120, search:false, editable:true, sortable: false, editoptions: {maxlength: 100}, align:"left", classes: 'vertical-align', title : false }, Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp =================================================================== diff -u -r4f1a37c96ff1b0aab43c11f24ba557ba0fdbe5dd -r1dbecfa7a6a96832fa3c1578a4ac977b424a2b9d --- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision 4f1a37c96ff1b0aab43c11f24ba557ba0fdbe5dd) +++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision 1dbecfa7a6a96832fa3c1578a4ac977b424a2b9d) @@ -163,7 +163,15 @@ column:name }; } - } + }, + afterSubmitCell : function (serverresponse, rowid, name, value, iRow, iCol) { + if (serverresponse.statusText == "OK") { + if (serverresponse.responseText != "") { + $(this).setCell(rowid, 'marker', serverresponse.responseText, {}, {}); + } + return [true, ""]; + } + } }); Index: lams_tool_assessment/web/pages/monitoring/summary.jsp =================================================================== diff -u -r4f1a37c96ff1b0aab43c11f24ba557ba0fdbe5dd -r1dbecfa7a6a96832fa3c1578a4ac977b424a2b9d --- lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 4f1a37c96ff1b0aab43c11f24ba557ba0fdbe5dd) +++ lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 1dbecfa7a6a96832fa3c1578a4ac977b424a2b9d) @@ -113,24 +113,24 @@ '#', 'questionResultUid', "", - "", - - "", - "", + + "", + + "", "", "" ], colModel:[ {name:'id', index:'id', width:20, sorttype:"int"}, {name:'questionResultUid', index:'questionResultUid', 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:'response', index:'response', datatype:'html', width:400, sortable:false}, {name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter}, - {name:'response', index:'response', datatype:'html', width:400, sortable:false}, + {name:'grade', index:'grade', width:80, sorttype:"float", editable:true, + editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align', title : false }, {name:'marker', index:'marker', width: 80, title: false}, {name:'markerComment', index:'markerComment', width:120, editable:true, sortable: false, editoptions: {maxlength: 100}, align:"left", classes: 'vertical-align', title : false }