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.4.2.1 -r1.8.2.4.2.2 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java 27 Jul 2009 04:14:13 -0000 1.8.2.4.2.1 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java 22 Sep 2009 10:34:01 -0000 1.8.2.4.2.2 @@ -511,18 +511,21 @@ userResultRow[6] = new ExcelCell(assessmentQuestionResult.getFinishDate(), false); userResultRow[7] = new ExcelCell(getAnswerObject(assessmentQuestionResult), false); - Date startDate = assessmentQuestionResult.getAssessmentResult().getStartDate(); + AssessmentResult assessmentResult = assessmentQuestionResult.getAssessmentResult(); Date finishDate = assessmentQuestionResult.getFinishDate(); - if (startDate != null && finishDate != null) { - Long seconds = (finishDate.getTime() - startDate.getTime()) / 1000; - userResultRow[8] = new ExcelCell(seconds, false); - timeTakenCount++; - timeTakenTotal += seconds; + if (assessmentResult != null && finishDate != null) { + Date startDate = assessmentResult.getStartDate(); + if (startDate != null) { + Long seconds = (finishDate.getTime() - startDate.getTime()) / 1000; + userResultRow[8] = new ExcelCell(seconds, false); + timeTakenCount++; + timeTakenTotal += seconds; + } } - userResultRow[9] = new ExcelCell(assessmentQuestionResult.getMark(), false); - - if (assessmentQuestionResult.getMark() != null) { + Float mark = assessmentQuestionResult.getMark(); + if (mark != null) { + userResultRow[9] = new ExcelCell(assessmentQuestionResult.getMark(), false); markCount++; markTotal += assessmentQuestionResult.getMark(); }