Index: lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -reeaec5d1e9dedb2349cabff878dfae20be73c585
--- lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java	(.../DateUtil.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java	(.../DateUtil.java)	(revision eeaec5d1e9dedb2349cabff878dfae20be73c585)
@@ -105,7 +105,7 @@
      */
     public static Date convertToTimeZoneFromDefault(TimeZone targetTimeZone, Date date) {
 	TimeZone defaultTz = TimeZone.getDefault();
-	Integer rawOffset = new Integer(defaultTz.getOffset(date.getTime()) - targetTimeZone.getOffset(date.getTime()));
+	Integer rawOffset = defaultTz.getOffset(date.getTime()) - targetTimeZone.getOffset(date.getTime());
 
 	return new Date(date.getTime() - rawOffset);
     }
@@ -121,7 +121,7 @@
      */
     public static Date convertFromTimeZoneToDefault(TimeZone targetTimeZone, Date date) {
 	TimeZone defaultTz = TimeZone.getDefault();
-	Integer rawOffset = new Integer(defaultTz.getOffset(date.getTime()) - targetTimeZone.getOffset(date.getTime()));
+	Integer rawOffset = defaultTz.getOffset(date.getTime()) - targetTimeZone.getOffset(date.getTime());
 
 	return new Date(date.getTime() + rawOffset);
     }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
===================================================================
diff -u -r0a46648d9547d3fca73e1931d4e628be7e1acd7b -reeaec5d1e9dedb2349cabff878dfae20be73c585
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java	(.../ResourceItemVisitDAOHibernate.java)	(revision 0a46648d9547d3fca73e1931d4e628be7e1acd7b)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java	(.../ResourceItemVisitDAOHibernate.java)	(revision eeaec5d1e9dedb2349cabff878dfae20be73c585)
@@ -140,7 +140,7 @@
 		.setMaxResults(size);
 	List<Object[]> list = query.list();
 
-	ArrayList<VisitLogDTO> visitLogDto = new ArrayList<VisitLogDTO>();
+	ArrayList<VisitLogDTO> visitLogDtos = new ArrayList<VisitLogDTO>();
 	if (list != null && list.size() > 0) {
 	    for (Object[] element : list) {
 
@@ -152,18 +152,18 @@
 			: new Date(completeDate.getTime() - accessDate.getTime());
 		Long portraitId =  element[4] == null ? null : ((Number) element[4]).longValue();
 
-		VisitLogDTO userDto = new VisitLogDTO();
-		userDto.setUserId(userId);
-		userDto.setUserFullName(userFullName);
-		userDto.setCompleteDate(completeDate);
-		userDto.setAccessDate(accessDate);
-		userDto.setTimeTaken(timeTaken);
-		userDto.setPortraitId(portraitId);;
-		visitLogDto.add(userDto);
+		VisitLogDTO visitLogDto = new VisitLogDTO();
+		visitLogDto.setUserId(userId);
+		visitLogDto.setUserFullName(userFullName);
+		visitLogDto.setCompleteDate(completeDate);
+		visitLogDto.setAccessDate(accessDate);
+		visitLogDto.setTimeTaken(timeTaken);
+		visitLogDto.setPortraitId(portraitId);;
+		visitLogDtos.add(visitLogDto);
 	    }
 	}
 
-	return visitLogDto;
+	return visitLogDtos;
     }
 
     @Override
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -reeaec5d1e9dedb2349cabff878dfae20be73c585
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision eeaec5d1e9dedb2349cabff878dfae20be73c585)
@@ -34,7 +34,6 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
@@ -64,15 +63,13 @@
 @Controller
 @RequestMapping("/monitoring")
 public class MonitoringController {
-    public static Logger log = Logger.getLogger(MonitoringController.class);
-
     @Autowired
     private IResourceService resourceService;
 
     @RequestMapping("/summary")
-    private String summary(HttpServletRequest request) {
+    public String summary(HttpServletRequest request) {
 	// initial Session Map
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	// save contentFolderID into session
@@ -100,21 +97,20 @@
     }
 
     @RequestMapping("/listuser")
-    private String listuser(HttpServletRequest request) {
+    public String listuser(HttpServletRequest request) {
 	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 	Long itemUid = WebUtil.readLongParam(request, ResourceConstants.PARAM_RESOURCE_ITEM_UID);
 
 	// get user list by given item uid
-	List list = resourceService.getUserListBySessionItem(sessionId, itemUid);
+	List<ResourceUser> list = resourceService.getUserListBySessionItem(sessionId, itemUid);
 
 	// set to request
 	request.setAttribute(ResourceConstants.ATTR_USER_LIST, list);
 	return "pages/monitoring/userlist";
     }
 
     @RequestMapping("/getSubgridData")
-    private String getSubgridData(HttpServletRequest request, HttpServletResponse response) throws IOException {
-
+    public String getSubgridData(HttpServletRequest request, HttpServletResponse response) throws IOException {
 	Long itemUid = WebUtil.readLongParam(request, ResourceConstants.ATTR_RESOURCE_ITEM_UID);
 	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 
@@ -139,8 +135,8 @@
 	DateFormat timeTakenFormatter = new SimpleDateFormat("H:mm:ss");
 	DateFormat dateFormatter = new SimpleDateFormat("d-MMM-yyyy h:mm a");
 	HttpSession ss = SessionManager.getSession();
-	UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
-	TimeZone monitorTimeZone = learnerDto.getTimeZone();
+	UserDTO monitorDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	TimeZone monitorTimeZone = monitorDto.getTimeZone();
 	int i = 1;
 	for (VisitLogDTO visitLogDto : visitLogDtos) {
 
@@ -157,7 +153,8 @@
 			    DateUtil.convertToTimeZoneFromDefault(monitorTimeZone, visitLogDto.getCompleteDate()));
 	    visitLogData.add(completeDate);
 	    String timeTaken = (visitLogDto.getTimeTaken() == null) ? ""
-		    : timeTakenFormatter.format(visitLogDto.getTimeTaken());
+		    : timeTakenFormatter
+			    .format(DateUtil.convertToTimeZoneFromDefault(monitorTimeZone, visitLogDto.getTimeTaken()));
 	    visitLogData.add(timeTaken);
 	    visitLogData.add(visitLogDto.getPortraitId());
 
@@ -180,7 +177,7 @@
     }
 
     @RequestMapping("/changeItemVisibility")
-    private String changeItemVisibility(HttpServletRequest request) {
+    public String changeItemVisibility(HttpServletRequest request) {
 	Long itemUid = WebUtil.readLongParam(request, ResourceConstants.PARAM_RESOURCE_ITEM_UID);
 	boolean isHideItem = WebUtil.readBooleanParam(request, ResourceConstants.PARAM_IS_HIDE_ITEM);
 	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -191,7 +188,7 @@
     }
 
     @RequestMapping("/viewReflection")
-    private String viewReflection(HttpServletRequest request) {
+    public String viewReflection(HttpServletRequest request) {
 
 	Long uid = WebUtil.readLongParam(request, ResourceConstants.ATTR_USER_UID);
 	Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -216,9 +213,9 @@
 	return "pages/monitoring/reflections";
     }
 
+    @SuppressWarnings("unchecked")
     @RequestMapping("/viewComments")
-    private String viewComments(HttpServletRequest request) {
-
+    public String viewComments(HttpServletRequest request) {
 	Long itemUid = WebUtil.readLongParam(request, ResourceConstants.ATTR_RESOURCE_ITEM_UID);
 	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);