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.1.10.7 -r1.1.10.8 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java 11 May 2016 07:15:07 -0000 1.1.10.7 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java 31 Aug 2016 14:54:22 -0000 1.1.10.8 @@ -72,7 +72,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" + " LEFT OUTER JOIN tl_laasse10_assessment_result result " + " ON result.user_uid = user.uid" + " AND result.finish_date IS NOT NULL" @@ -99,12 +99,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); } @@ -139,7 +141,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" + @@ -173,13 +175,15 @@ 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.2.4 -r1.1.2.5 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java 11 May 2016 07:15:08 -0000 1.1.2.4 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java 31 Aug 2016 14:54:23 -0000 1.1.2.5 @@ -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.48.2.35 -r1.48.2.36 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 31 Aug 2016 13:47:23 -0000 1.48.2.35 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 31 Aug 2016 14:54:23 -0000 1.48.2.36 @@ -1150,9 +1150,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); }