Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java =================================================================== diff -u -r2f8affa73dc2ce8ce6defaa3d42efcba35e05750 -r01b83879c6046c2e7e37b7d16937b7d4d4fbbc25 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 2f8affa73dc2ce8ce6defaa3d42efcba35e05750) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 01b83879c6046c2e7e37b7d16937b7d4d4fbbc25) @@ -637,7 +637,7 @@ ratingJSON.add(session.getSessionName()); ratingJSON.add(DateUtil.convertToStringForJSON(comment.getPostedDate(), locale)); ratingJSON.add(NumberUtil.formatLocalisedNumberForceDecimalPlaces(rating.getRating(), null, 2)); - ratingJSON.add(HtmlUtils.htmlEscape(comment.getComment())); + ratingJSON.add(comment.getComment()); ratingJSON.add(userId); ratingJSON.add(learner.getPortraitUuid() == null ? "" : learner.getPortraitUuid().toString()); Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp =================================================================== diff -u -r2f8affa73dc2ce8ce6defaa3d42efcba35e05750 -r01b83879c6046c2e7e37b7d16937b7d4d4fbbc25 --- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision 2f8affa73dc2ce8ce6defaa3d42efcba35e05750) +++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision 01b83879c6046c2e7e37b7d16937b7d4d4fbbc25) @@ -97,10 +97,10 @@ 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 : function(cellvalue, options, rowObject) { + {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:80, sorttype:"float", search:false, editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' }, + {name:'grade', index:'grade', width:30, sorttype:"float", search:false, editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' }, {name:'confidence', index:'confidence', width: 80, search:false, classes: 'vertical-align', formatter: gradientNumberFormatter}, @@ -177,7 +177,7 @@ colNames:[ 'ratingId', '', - "", + '', '', '', '', @@ -186,13 +186,13 @@ ], colModel:[ {name:'ratingId', index:'ratingId', width:0, hidden:true}, - {name:'userName',index:'userName', width: 120, formatter : function(cellvalue, options, rowObject) { + {name:'userName',index:'userName', width: 35, formatter : function(cellvalue, options, rowObject) { // get portrait UUID, user ID and user name return definePortraitPopover(rowObject[rowObject.length - 1], rowObject[rowObject.length - 2], rowObject[1]); }}, - {name:'group', index:'group', title:false}, - {name:'date', index:'date', title:false}, - {name:'rating', index:'rating', align:"center", title:false}, + {name:'group', index:'group', width: 25, title:false}, + {name:'date', index:'date', width: 39, title:false}, + {name:'rating', index:'rating', width: 20, align:"center", title:false}, {name:'comment', index:'comment', title:false}, {name:'userId', index:'userId', width:0, hidden: true}, {name:'portraitId', index:'portraitId', width:0, hidden: true}