Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -ra92e6d07a437f70d76d3927293986933ccce3fbe -r2f8affa73dc2ce8ce6defaa3d42efcba35e05750
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision a92e6d07a437f70d76d3927293986933ccce3fbe)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 2f8affa73dc2ce8ce6defaa3d42efcba35e05750)
@@ -630,8 +630,11 @@
long userId = learner.getUserId();
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(NumberUtil.formatLocalisedNumberForceDecimalPlaces(rating.getRating(), null, 2));
ratingJSON.add(HtmlUtils.htmlEscape(comment.getComment()));
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -ra92e6d07a437f70d76d3927293986933ccce3fbe -r2f8affa73dc2ce8ce6defaa3d42efcba35e05750
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision a92e6d07a437f70d76d3927293986933ccce3fbe)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision 2f8affa73dc2ce8ce6defaa3d42efcba35e05750)
@@ -177,6 +177,7 @@
colNames:[
'ratingId',
'',
+ "",
'',
'',
'',
@@ -185,12 +186,13 @@
],
colModel:[
{name:'ratingId', index:'ratingId', width:0, hidden:true},
- {name:'userName',index:'userName', width:45, formatter : function(cellvalue, options, rowObject) {
+ {name:'userName',index:'userName', width: 120, 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:'date', index:'date', width:45, align:"center", title:false},
- {name:'rating', index:'rating', width:31, align:"center", title:false},
+ {name:'group', index:'group', title:false},
+ {name:'date', index:'date', title:false},
+ {name:'rating', index:'rating', 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}