Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.java,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.java 29 Jan 2009 05:59:04 -0000 1.1 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.java 16 Jun 2009 06:51:37 -0000 1.1.4.1 @@ -228,5 +228,13 @@ public void setAccessDate(Date accessDate) { this.accessDate = accessDate; } + + public String getFullName() { + if (firstName == null || lastName == null) { + return null; + } else { + return lastName + " " + firstName; + } + } } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java,v diff -u -r1.8.2.3 -r1.8.2.4 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java 15 Jun 2009 05:48:04 -0000 1.8.2.3 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java 16 Jun 2009 06:51:37 -0000 1.8.2.4 @@ -377,7 +377,7 @@ if (showUserNames) { ExcelCell[] userResultRow = new ExcelCell[6]; userResultRow[0] = new ExcelCell(assessmentUser.getUserId(), false); - userResultRow[1] = new ExcelCell(assessmentUser.getLoginName(), false); + userResultRow[1] = new ExcelCell(assessmentUser.getFullName(), false); userResultRow[2] = new ExcelCell(assessmentResult.getStartDate(), false); userResultRow[3] = new ExcelCell(assessmentQuestionResult .getAssessmentQuestion().getTitle(), false); @@ -491,7 +491,7 @@ userResultRow[2] = new ExcelCell(new Float(assessmentQuestionResult.getAssessmentQuestion().getPenaltyFactor()), false); userResultRow[3] = new ExcelCell(new Long(assessmentQuestionResult.getAssessmentQuestion().getDefaultGrade()), false); userResultRow[4] = new ExcelCell(assessmentQuestionResult.getUser().getUserId(), false); - userResultRow[5] = new ExcelCell(assessmentQuestionResult.getUser().getLoginName(),false); + userResultRow[5] = new ExcelCell(assessmentQuestionResult.getUser().getFullName(),false); userResultRow[6] = new ExcelCell(assessmentQuestionResult.getFinishDate(), false); userResultRow[7] = new ExcelCell(getAnswerObject(assessmentQuestionResult), false);