Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java,v diff -u -r1.5 -r1.6 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java 8 Dec 2015 19:44:07 -0000 1.5 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java 28 Apr 2016 10:05:30 -0000 1.6 @@ -63,7 +63,7 @@ public List getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder, String searchString) { - String LOAD_USERS_ORDERED_BY_NAME = "SELECT DISTINCT user.user_id, user.last_name, user.first_name, result.grade" + + String LOAD_USERS_ORDERED_BY_NAME = "SELECT DISTINCT user.user_id, user.last_name, user.first_name, user.login_name, result.grade" + " FROM tl_laasse10_user user" + " INNER JOIN tl_laasse10_session session" + " ON user.session_uid=session.uid" + @@ -96,12 +96,14 @@ Long userId = ((Number) element[0]).longValue(); String firstName = (String) element[1]; String lastName = (String) element[2]; - float grade = element[3] == null ? 0 : ((Number) element[3]).floatValue(); + String login = (String) element[3]; + float grade = element[4] == null ? 0 : ((Number) element[4]).floatValue(); AssessmentUserDTO userDto = new AssessmentUserDTO(); userDto.setUserId(userId); userDto.setFirstName(firstName); userDto.setLastName(lastName); + userDto.setLogin(login); userDto.setGrade(grade); userDtos.add(userDto); } @@ -136,7 +138,7 @@ public List getPagedUsersBySessionAndQuestion(Long sessionId, Long questionUid, int page, int size, String sortBy, String sortOrder, String searchString) { - String LOAD_USERS_ORDERED_BY_NAME = "SELECT DISTINCT question_result.uid, user.last_name, user.first_name, question_result.mark" + + String LOAD_USERS_ORDERED_BY_NAME = "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" + " ON user.session_uid=session.uid" + @@ -176,12 +178,14 @@ Long questionResultUid = ((Number) element[0]).longValue(); String firstName = (String) element[1]; String lastName = (String) element[2]; - float grade = element[3] == null ? 0 : ((Number) element[3]).floatValue(); + String login = (String) element[3]; + float grade = element[4] == null ? 0 : ((Number) element[4]).floatValue(); AssessmentUserDTO userDto = new AssessmentUserDTO(); userDto.setQuestionResultUid(questionResultUid);; userDto.setFirstName(firstName); userDto.setLastName(lastName); + userDto.setLogin(login); userDto.setGrade(grade); userDtos.add(userDto); } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java,v diff -u -r1.1 -r1.2 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java 11 Nov 2015 01:16:44 -0000 1.1 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java 28 Apr 2016 10:02:20 -0000 1.2 @@ -27,6 +27,7 @@ private Long userId; private String firstName; private String lastName; + private String login; private float grade; private Long questionResultUid; @@ -47,6 +48,14 @@ this.lastName = lastName; } + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + public float getGrade() { return grade; } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java,v diff -u -r1.71 -r1.72 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 20 Apr 2016 09:46:55 -0000 1.71 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 28 Apr 2016 10:03:56 -0000 1.72 @@ -1111,9 +1111,10 @@ sessionTitle[0] = new ExcelCell(sessionDTO.getSessionName(), true); summaryTab.add(sessionTitle); - ExcelCell[] summaryRowTitle = new ExcelCell[2]; - summaryRowTitle[0] = new ExcelCell(getMessage("label.monitoring.summary.user.name"), true); - summaryRowTitle[1] = new ExcelCell(getMessage("label.monitoring.summary.total"), true); + ExcelCell[] summaryRowTitle = new ExcelCell[3]; + summaryRowTitle[0] = new ExcelCell(getMessage("label.export.user.id"), true); + summaryRowTitle[1] = new ExcelCell(getMessage("label.monitoring.summary.user.name"), true); + summaryRowTitle[2] = new ExcelCell(getMessage("label.monitoring.summary.total"), true); summaryTab.add(summaryRowTitle); List userDtos = new ArrayList(); @@ -1143,9 +1144,10 @@ } for (AssessmentUserDTO userDto : userDtos) { - ExcelCell[] userResultRow = new ExcelCell[2]; - userResultRow[0] = new ExcelCell(userDto.getFirstName() + " " + userDto.getLastName(), false); - userResultRow[1] = new ExcelCell(userDto.getGrade(), false); + ExcelCell[] userResultRow = new ExcelCell[3]; + userResultRow[0] = new ExcelCell(userDto.getLogin(), false); + userResultRow[1] = new ExcelCell(userDto.getFirstName() + " " + userDto.getLastName(), false); + userResultRow[2] = new ExcelCell(userDto.getGrade(), false); summaryTab.add(userResultRow); } @@ -1214,7 +1216,7 @@ Float maxMark = (questionResult.getMaxMark() == null) ? 0 : new Float(questionResult.getMaxMark()); userResultRow[3] = new ExcelCell(maxMark, false); - userResultRow[4] = new ExcelCell(questionResult.getUser().getUserId(), false); + userResultRow[4] = new ExcelCell(questionResult.getUser().getLoginName(), false); userResultRow[5] = new ExcelCell(questionResult.getUser().getFullName(), false); userResultRow[6] = new ExcelCell(questionResult.getFinishDate(), false); userResultRow[7] = new ExcelCell( @@ -1450,7 +1452,7 @@ if (showUserNames) { ExcelCell[] userResultRow = new ExcelCell[6]; - userResultRow[0] = new ExcelCell(assessmentUser.getUserId(), false); + userResultRow[0] = new ExcelCell(assessmentUser.getLoginName(), false); userResultRow[1] = new ExcelCell(assessmentUser.getFullName(), false); userResultRow[2] = new ExcelCell(assessmentResult.getStartDate(), false); userResultRow[3] = new ExcelCell(