Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
===================================================================
diff -u -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f -r5c770157545dea3dbc72e22a1dd1107c56cf22eb
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java	(.../AssessmentUserDAO.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java	(.../AssessmentUserDAO.java)	(revision 5c770157545dea3dbc72e22a1dd1107c56cf22eb)
@@ -43,7 +43,7 @@
     int getCountUsersBySession(Long sessionId, String searchString);
 
     List<AssessmentUserDTO> getPagedUsersBySessionAndQuestion(Long sessionId, Long questionUid, int page, int size,
-	    String sortBy, String sortOrder, String searchString);
+	    String sortBy, String sortOrder, String searchString, IUserManagementService userManagementService);
     
     List<Number> getRawUserMarksBySession(Long sessionId);
     
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
===================================================================
diff -u -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f -r5c770157545dea3dbc72e22a1dd1107c56cf22eb
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(.../AssessmentUserDAOHibernate.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(.../AssessmentUserDAOHibernate.java)	(revision 5c770157545dea3dbc72e22a1dd1107c56cf22eb)
@@ -209,8 +209,9 @@
     }
 
 
-    private static String LOAD_USERS_ORDERED_BY_SESSION_QUESTION = "SELECT DISTINCT question_result.uid, user.last_name, user.first_name, user.login_name, question_result.mark"
-		+ " FROM tl_laasse10_user user" + " INNER JOIN tl_laasse10_session session"
+    private static String LOAD_USERS_ORDERED_BY_SESSION_QUESTION_SELECT = "SELECT DISTINCT question_result.uid, user.last_name, user.first_name, user.login_name, question_result.mark";
+    private static String LOAD_USERS_ORDERED_BY_SESSION_QUESTION_FROM = " FROM tl_laasse10_user user";
+    private static String LOAD_USERS_ORDERED_BY_SESSION_QUESTION_JOIN = " INNER JOIN tl_laasse10_session session"
 		+ " ON user.session_uid=session.uid" +
 
 		" LEFT OUTER JOIN tl_laasse10_assessment_result result " + " ON result.user_uid = user.uid"
@@ -226,9 +227,15 @@
     @SuppressWarnings("unchecked")
     @Override
     public List<AssessmentUserDTO> getPagedUsersBySessionAndQuestion(Long sessionId, Long questionUid, int page,
-	    int size, String sortBy, String sortOrder, String searchString) {
+	    int size, String sortBy, String sortOrder, String searchString, IUserManagementService userManagementService) {
 
-	StringBuilder bldr = new StringBuilder(LOAD_USERS_ORDERED_BY_SESSION_QUESTION);
+	String[] portraitStrings = userManagementService.getPortraitSQL("user.user_id");
+
+	StringBuilder bldr = new StringBuilder(LOAD_USERS_ORDERED_BY_SESSION_QUESTION_SELECT)
+		.append(portraitStrings[0])
+		.append(LOAD_USERS_ORDERED_BY_SESSION_QUESTION_FROM)
+		.append(portraitStrings[1])
+		.append(LOAD_USERS_ORDERED_BY_SESSION_QUESTION_JOIN);
 	if ( "grade".equalsIgnoreCase(sortBy) )
 	    bldr.append(LOAD_USERS_ORDERED_ORDER_BY_RESULT);
 	else
@@ -254,6 +261,7 @@
 		String lastName = (String) element[2];
 		String login = (String) element[3];
 		float grade = element[4] == null ? 0 : ((Number) element[4]).floatValue();
+		Long portraitId  = element[5] == null ? null : ((Number) element[5]).longValue();
 
 		AssessmentUserDTO userDto = new AssessmentUserDTO();
 		userDto.setQuestionResultUid(questionResultUid);
@@ -262,6 +270,7 @@
 		userDto.setLastName(lastName);
 		userDto.setLogin(login);
 		userDto.setGrade(grade);
+		userDto.setPortraitId(portraitId);
 		userDtos.add(userDto);
 	    }
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -rf899620dd37f54eb375d29a5b15a7793c5dc3bb4 -r5c770157545dea3dbc72e22a1dd1107c56cf22eb
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision f899620dd37f54eb375d29a5b15a7793c5dc3bb4)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 5c770157545dea3dbc72e22a1dd1107c56cf22eb)
@@ -348,7 +348,7 @@
     public List<AssessmentUserDTO> getPagedUsersBySessionAndQuestion(Long sessionId, Long questionUid, int page,
 	    int size, String sortBy, String sortOrder, String searchString) {
 	return assessmentUserDao.getPagedUsersBySessionAndQuestion(sessionId, questionUid, page, size, sortBy,
-		sortOrder, searchString);
+		sortOrder, searchString, userManagementService);
     }
 
     @Override
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
===================================================================
diff -u -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f -r5c770157545dea3dbc72e22a1dd1107c56cf22eb
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 5c770157545dea3dbc72e22a1dd1107c56cf22eb)
@@ -500,14 +500,15 @@
 		userData.put(questionResult.getMaxMark());
 		userData.put(fullName);
 		userData.put(AssessmentEscapeUtils.printResponsesForJqgrid(questionResult));
-		
 		// show confidence levels if this feature is turned ON 
 		if (assessment.isEnableConfidenceLevels()) {
 		    userData.put(questionResult.getConfidenceLevel());
 		}
 		
 		userData.put(questionResult.getMark());
-
+		if (userDto.getPortraitId() != null ) 
+		    userData.put(userDto.getPortraitId());
+		
 	    } else {
 		userData.put("");
 		userData.put("");
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f -r5c770157545dea3dbc72e22a1dd1107c56cf22eb
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 5c770157545dea3dbc72e22a1dd1107c56cf22eb)
@@ -16,6 +16,7 @@
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/jqGrid.confidenceLevelFormattter.js"></script>
+	 	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
   	    <script>
   	    	var isEdited = false;
   	    	var previousCellValue = "";
@@ -40,18 +41,20 @@
 		  			   		<c:if test="${assessment.enableConfidenceLevels}">
 		  			   			"<fmt:message key="label.confidence" />",
 		  			  		</c:if>
-	  						"<fmt:message key="label.monitoring.user.summary.grade" />"
+	  						"<fmt:message key="label.monitoring.user.summary.grade" />",
+	  						'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 }},
+							{name:'userName',index:'userName', width:120, searchoptions: { clearSearch: false }, formatter:userNameFormatter},
 	  				   		{name:'response', index:'response', width:427, sortable:false, search:false},
 	  		  			   	<c:if test="${sessionMap.assessment.enableConfidenceLevels}">
 			  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
 			  			  	</c:if>
-	  				   		{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:80, sorttype:"float", search:false, editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' },
+		  				   	{name:'portraitId', index:'portraitId', width:0, hidden: true}
 	  				   	],
 	  				   	multiselect: false,
 	  				   	caption: "${sessionDto.sessionName}",
@@ -86,7 +89,10 @@
 	  							var questionResultUid = jQuery("#session${sessionDto.sessionId}").getCell(rowid, 'questionResultUid');
 	  							return {questionResultUid:questionResultUid};		  				  		
 	  				  		}
-	  					}
+	  					},
+  						loadComplete: function () {
+  					   	 	initializePortraitPopover('<lams:LAMSURL/>');
+  					    	}
   						/*  resetSelection() doesn't work in this version
 						    hope it'll be fixed in the next one
 						    
@@ -128,6 +134,17 @@
         			self.parent.tb_remove();
         		}
     		}
+    		
+    		function userNameFormatter (cellvalue, options, rowObject) {
+    			debugger;
+    			<c:choose><c:when test="${assessment.enableConfidenceLevels}">
+    			var portraitId = rowObject[6];
+    			</c:when><c:otherwise>
+    			var portraitId = rowObject[5];
+    			</c:otherwise></c:choose>
+    			return definePortraitPopover(portraitId, rowObject[0], rowObject[2]);
+    		}
+
   		</script>
 	</lams:head>