Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java =================================================================== diff -u -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644 -rf6108882d9ed650233167289b37e137b6b93d95b --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java (.../PeerreviewUserDAOHibernate.java) (revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java (.../PeerreviewUserDAOHibernate.java) (revision f6108882d9ed650233167289b37e137b6b93d95b) @@ -51,7 +51,7 @@ + " AS u WHERE u.userId =? AND u.session.sessionId=?"; private static final String FIND_BY_SESSION_ID = "FROM " + PeerreviewUser.class.getName() - + " AS u WHERE u.session.sessionId=?"; + + " AS u WHERE u.session.sessionId=? AND u.hidden=0"; private static final String GET_COUNT_USERS_FOR_SESSION_EXCLUDE_USER = "SELECT COUNT(*) FROM " + PeerreviewUser.class.getName() + " AS u WHERE u.session.sessionId=? AND u.userId!=? AND u.hidden=0"; Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java =================================================================== diff -u -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644 -rf6108882d9ed650233167289b37e137b6b93d95b --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision f6108882d9ed650233167289b37e137b6b93d95b) @@ -536,26 +536,26 @@ String fileName = peerreview.getTitle().replaceAll(" ", "_") + ".xlsx"; try { - fileName = FileUtil.encodeFilenameForDownload(request, fileName); - - if (log.isDebugEnabled()) { - log.debug("Exporting to a spreadsheet for toolContentId: " + toolContentId + "filename "+fileName); - } - - response.setContentType("application/x-download"); - response.setHeader("Content-Disposition", "attachment;filename=" + fileName); - ServletOutputStream out = response.getOutputStream(); - - LinkedHashMap dataToExport = service.exportTeamReportSpreadsheet(toolContentId); - - // set cookie that will tell JS script that export has been finished - String downloadTokenValue = WebUtil.readStrParam(request, "downloadTokenValue"); - Cookie fileDownloadTokenCookie = new Cookie("fileDownloadToken", downloadTokenValue); - fileDownloadTokenCookie.setPath("/"); - response.addCookie(fileDownloadTokenCookie); - - ExcelUtil.createExcel(out, dataToExport, "Exported on:", true); + fileName = FileUtil.encodeFilenameForDownload(request, fileName); + if (log.isDebugEnabled()) { + log.debug("Exporting to a spreadsheet for toolContentId: " + toolContentId + "filename " + fileName); + } + + response.setContentType("application/x-download"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + ServletOutputStream out = response.getOutputStream(); + + LinkedHashMap dataToExport = service.exportTeamReportSpreadsheet(toolContentId); + + // set cookie that will tell JS script that export has been finished + String downloadTokenValue = WebUtil.readStrParam(request, "downloadTokenValue"); + Cookie fileDownloadTokenCookie = new Cookie("fileDownloadToken", downloadTokenValue); + fileDownloadTokenCookie.setPath("/"); + response.addCookie(fileDownloadTokenCookie); + + ExcelUtil.createExcel(out, dataToExport, "Exported on:", true); + } catch (IOException e) { log.error("exportTeamReportExcelSpreadsheet i/o error occured: "+e.getMessage(), e); throw new ServletException(e);