Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r0900f6205f981ea5f35d55444917c55121c39ef5 -r9007e50ca508c5ec3312cd880e6df2d1ec3dab1e --- lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0900f6205f981ea5f35d55444917c55121c39ef5) +++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 9007e50ca508c5ec3312cd880e6df2d1ec3dab1e) @@ -387,7 +387,7 @@ label.comment.textarea.tip =Type your comment here then click on the green tick label.rating = Rating label.comment =Comment -label.comment.date = Date +label.comment.name = Name, group, date label.your.team = Your team label.not.yet.disclosed = The teacher has not disclosed other teams' answers yet error.resource.image.comment.blank =Comment can not be blank. Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java =================================================================== diff -u -r01b83879c6046c2e7e37b7d16937b7d4d4fbbc25 -r9007e50ca508c5ec3312cd880e6df2d1ec3dab1e --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 01b83879c6046c2e7e37b7d16937b7d4d4fbbc25) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 9007e50ca508c5ec3312cd880e6df2d1ec3dab1e) @@ -631,11 +631,10 @@ RatingCommentDTO comment = commentsByUserId.get(userId); AssessmentSession session = service.getSessionBySessionId(rating.getToolSessionId()); - + ratingJSON.add(rating.getUid()); - ratingJSON.add(comment.getUserFullName()); - ratingJSON.add(session.getSessionName()); - ratingJSON.add(DateUtil.convertToStringForJSON(comment.getPostedDate(), locale)); + ratingJSON.add(comment.getUserFullName() + "
" + session.getSessionName() + "
" + + DateUtil.convertToStringForJSON(comment.getPostedDate(), locale)); ratingJSON.add(NumberUtil.formatLocalisedNumberForceDecimalPlaces(rating.getRating(), null, 2)); ratingJSON.add(comment.getComment()); ratingJSON.add(userId); Index: lams_tool_assessment/web/pages/learning/results/essay.jsp =================================================================== diff -u -r895ea2f831126b405959b0d82cb16c06c22fa684 -r9007e50ca508c5ec3312cd880e6df2d1ec3dab1e --- lams_tool_assessment/web/pages/learning/results/essay.jsp (.../essay.jsp) (revision 895ea2f831126b405959b0d82cb16c06c22fa684) +++ lams_tool_assessment/web/pages/learning/results/essay.jsp (.../essay.jsp) (revision 9007e50ca508c5ec3312cd880e6df2d1ec3dab1e) @@ -46,7 +46,7 @@ <%-- Show answers for all other teams, and just rating if someone has already commented on this team's answer --%> - +   Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp =================================================================== diff -u -r01b83879c6046c2e7e37b7d16937b7d4d4fbbc25 -r9007e50ca508c5ec3312cd880e6df2d1ec3dab1e --- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision 01b83879c6046c2e7e37b7d16937b7d4d4fbbc25) +++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision 9007e50ca508c5ec3312cd880e6df2d1ec3dab1e) @@ -105,7 +105,7 @@ {name:'confidence', index:'confidence', width: 80, search:false, classes: 'vertical-align', formatter: gradientNumberFormatter}, - {name:'rating', index:'rating', width:120, align:"center", search:false}, + {name:'rating', index:'rating', width:120, align:"center", sortable:false, search:false}, {name:'response', index:'response', width:400, sortable:false, search:false}, {name:'userId', index:'userId', width:0, hidden: true}, @@ -172,13 +172,12 @@ height: "100%", autowidth:true, autoencode:false, + cmTemplate: { title: false, search: false, sortable: false}, guiStyle: "bootstrap", iconSet: 'fontAwesome', colNames:[ 'ratingId', - '', - '', - '', + '', '', '', 'userId', @@ -187,13 +186,16 @@ colModel:[ {name:'ratingId', index:'ratingId', width:0, hidden:true}, {name:'userName',index:'userName', width: 35, formatter : function(cellvalue, options, rowObject) { + var columnParts = rowObject[1].split('
'), + userName = columnParts[0]; // get portrait UUID, user ID and user name - return definePortraitPopover(rowObject[rowObject.length - 1], rowObject[rowObject.length - 2], rowObject[1]); + userName = definePortraitPopover(rowObject[rowObject.length - 1], rowObject[rowObject.length - 2], userName); + columnParts[0] = userName; + columnParts[1] = '' + columnParts[1] + ''; + return columnParts.join('
'); }}, - {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:'rating', index:'rating', width: 10, align:"center"}, + {name:'comment', index:'comment'}, {name:'userId', index:'userId', width:0, hidden: true}, {name:'portraitId', index:'portraitId', width:0, hidden: true} ],