Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Attic/AssessmentQuestionResult.hbm.xml,v
diff -u -r1.5 -r1.5.4.1
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml	10 Mar 2009 21:39:14 -0000	1.5
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml	15 Jun 2009 05:49:13 -0000	1.5.4.1
@@ -35,9 +35,11 @@
             column="assessment_question_uid"
         />
 
-        <property
-            name="resultUid"
-            type="java.lang.Long"
+        <many-to-one
+            name="assessmentResult"
+            class="org.lamsfoundation.lams.tool.assessment.model.AssessmentResult"
+            cascade="none"
+            outer-join="auto"
             update="true"
             insert="true"
             column="result_uid"
@@ -109,6 +111,14 @@
 
         </set>
 
+        <property
+            name="finishDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="finish_date"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-AssessmentQuestionResult.xml
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.2 -r1.8.2.3
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	15 Jun 2009 00:42:50 -0000	1.8.2.2
+++ 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
@@ -399,10 +399,19 @@
 				    }
 				}
 
-				ExcelCell[] userTotalRow = new ExcelCell[5];
-				userTotalRow[3] = new ExcelCell(service.getMessage("label.monitoring.summary.total"),
-					true);
-				userTotalRow[4] = new ExcelCell(assessmentResult.getGrade(), false);
+				ExcelCell[] userTotalRow;
+				if (showUserNames) {
+				    userTotalRow = new ExcelCell[6];
+				    userTotalRow[4] = new ExcelCell(service
+					    .getMessage("label.monitoring.summary.total"), true);
+				    userTotalRow[5] = new ExcelCell(assessmentResult.getGrade(), false);
+				} else {
+				    userTotalRow = new ExcelCell[5];
+				    userTotalRow[3] = new ExcelCell(service
+					    .getMessage("label.monitoring.summary.total"), true);
+				    userTotalRow[4] = new ExcelCell(assessmentResult.getGrade(), false);
+				}
+
 				data.add(userTotalRow);
 				data.add(EMPTY_ROW);
 			    }
@@ -437,37 +446,26 @@
 		    // Adding the question summary 
 		    if (showUserNames) {
 			ExcelCell[] summaryRowTitle = new ExcelCell[10];
-			summaryRowTitle[0] = new ExcelCell(service
-				.getMessage("label.monitoring.question.summary.question"), true);
-			summaryRowTitle[1] = new ExcelCell(
-				service.getMessage("label.authoring.basic.list.header.type"), true);
-			summaryRowTitle[2] = new ExcelCell(service.getMessage("label.export.user.id"), true);
-			summaryRowTitle[3] = new ExcelCell(service
-				.getMessage("label.monitoring.user.summary.user.name"), true);
-			summaryRowTitle[4] = new ExcelCell(service.getMessage("label.export.date.attempted"), true);
-			summaryRowTitle[5] = new ExcelCell(service.getMessage("label.authoring.basic.penalty.factor"),
-				true);
-			summaryRowTitle[6] = new ExcelCell(service
-				.getMessage("label.monitoring.question.summary.default.mark"), true);
-			summaryRowTitle[7] = new ExcelCell(service.getMessage("label.authoring.basic.option.answer"),
-				true);
+			summaryRowTitle[0] = new ExcelCell(service.getMessage("label.monitoring.question.summary.question"), true);
+			summaryRowTitle[1] = new ExcelCell(service.getMessage("label.authoring.basic.list.header.type"), true);
+			summaryRowTitle[2] = new ExcelCell(service.getMessage("label.authoring.basic.penalty.factor"),true);
+			summaryRowTitle[3] = new ExcelCell(service.getMessage("label.monitoring.question.summary.default.mark"), true);
+			summaryRowTitle[4] = new ExcelCell(service.getMessage("label.export.user.id"), true);
+			summaryRowTitle[5] = new ExcelCell(service.getMessage("label.monitoring.user.summary.user.name"), true);
+			summaryRowTitle[6] = new ExcelCell(service.getMessage("label.export.date.attempted"), true);
+			summaryRowTitle[7] = new ExcelCell(service.getMessage("label.authoring.basic.option.answer"),true);
 			summaryRowTitle[8] = new ExcelCell(service.getMessage("label.export.time.taken"), true);
 			summaryRowTitle[9] = new ExcelCell(service.getMessage("label.export.mark"), true);
 			data.add(summaryRowTitle);
 		    } else {
 			ExcelCell[] summaryRowTitle = new ExcelCell[9];
-			summaryRowTitle[0] = new ExcelCell(service
-				.getMessage("label.monitoring.question.summary.question"), true);
-			summaryRowTitle[1] = new ExcelCell(
-				service.getMessage("label.authoring.basic.list.header.type"), true);
-			summaryRowTitle[2] = new ExcelCell(service.getMessage("label.export.user.id"), true);
-			summaryRowTitle[3] = new ExcelCell(service.getMessage("label.export.date.attempted"), true);
-			summaryRowTitle[4] = new ExcelCell(service.getMessage("label.authoring.basic.penalty.factor"),
-				true);
-			summaryRowTitle[5] = new ExcelCell(service
-				.getMessage("label.monitoring.question.summary.default.mark"), true);
-			summaryRowTitle[6] = new ExcelCell(service.getMessage("label.authoring.basic.option.answer"),
-				true);
+			summaryRowTitle[0] = new ExcelCell(service.getMessage("label.monitoring.question.summary.question"), true);
+			summaryRowTitle[1] = new ExcelCell(service.getMessage("label.authoring.basic.list.header.type"), true);
+			summaryRowTitle[2] = new ExcelCell(service.getMessage("label.authoring.basic.penalty.factor"),true);
+			summaryRowTitle[3] = new ExcelCell(service.getMessage("label.monitoring.question.summary.default.mark"), true);
+			summaryRowTitle[4] = new ExcelCell(service.getMessage("label.export.user.id"), true);
+			summaryRowTitle[5] = new ExcelCell(service.getMessage("label.export.date.attempted"), true);
+			summaryRowTitle[6] = new ExcelCell(service.getMessage("label.authoring.basic.option.answer"),true);
 			summaryRowTitle[7] = new ExcelCell(service.getMessage("label.export.time.taken"), true);
 			summaryRowTitle[8] = new ExcelCell(service.getMessage("label.export.mark"), true);
 			data.add(summaryRowTitle);
@@ -488,18 +486,13 @@
 
 			    if (showUserNames) {
 				ExcelCell[] userResultRow = new ExcelCell[10];
-				userResultRow[0] = new ExcelCell(assessmentQuestionResult.getAssessmentQuestion()
-					.getTitle(), false);
-				userResultRow[1] = new ExcelCell(getQuestionTypeLanguageLabel(assessmentQuestionResult
-					.getAssessmentQuestion().getType()), false);
-				userResultRow[2] = new ExcelCell(assessmentQuestionResult.getUser().getUserId(), false);
-				userResultRow[3] = new ExcelCell(assessmentQuestionResult.getUser().getLoginName(),
-					false);
-				userResultRow[4] = new ExcelCell(assessmentQuestionResult.getFinishDate(), false);
-				userResultRow[5] = new ExcelCell(new Float(assessmentQuestionResult
-					.getAssessmentQuestion().getPenaltyFactor()), false);
-				userResultRow[6] = new ExcelCell(new Long(assessmentQuestionResult
-					.getAssessmentQuestion().getDefaultGrade()), false);
+				userResultRow[0] = new ExcelCell(assessmentQuestionResult.getAssessmentQuestion().getTitle(), false);
+				userResultRow[1] = new ExcelCell(getQuestionTypeLanguageLabel(assessmentQuestionResult.getAssessmentQuestion().getType()), false);
+				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[6] = new ExcelCell(assessmentQuestionResult.getFinishDate(), false);
 				userResultRow[7] = new ExcelCell(getAnswerObject(assessmentQuestionResult), false);
 
 				Date startDate = assessmentQuestionResult.getAssessmentResult().getStartDate();
@@ -521,16 +514,12 @@
 				data.add(userResultRow);
 			    } else {
 				ExcelCell[] userResultRow = new ExcelCell[9];
-				userResultRow[0] = new ExcelCell(assessmentQuestionResult.getAssessmentQuestion()
-					.getTitle(), false);
-				userResultRow[1] = new ExcelCell(getQuestionTypeLanguageLabel(assessmentQuestionResult
-					.getAssessmentQuestion().getType()), false);
-				userResultRow[2] = new ExcelCell(assessmentQuestionResult.getUser().getUserId(), false);
-				userResultRow[3] = new ExcelCell(assessmentQuestionResult.getFinishDate(), false);
-				userResultRow[4] = new ExcelCell(new Float(assessmentQuestionResult
-					.getAssessmentQuestion().getPenaltyFactor()), false);
-				userResultRow[5] = new ExcelCell(new Long(assessmentQuestionResult
-					.getAssessmentQuestion().getDefaultGrade()), false);
+				userResultRow[0] = new ExcelCell(assessmentQuestionResult.getAssessmentQuestion().getTitle(), false);
+				userResultRow[1] = new ExcelCell(getQuestionTypeLanguageLabel(assessmentQuestionResult.getAssessmentQuestion().getType()), false);
+				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.getFinishDate(), false);
 				userResultRow[6] = new ExcelCell(getAnswerObject(assessmentQuestionResult), false);
 
 				Date startDate = assessmentQuestionResult.getAssessmentResult().getStartDate();
@@ -556,18 +545,37 @@
 		    }
 
 		    // Calculating the averages
-		    ExcelCell[] averageRow = new ExcelCell[9];
-		    averageRow[6] = new ExcelCell(service.getMessage("label.export.average"), true);
+		    ExcelCell[] averageRow;
 
-		    if (timeTakenTotal > 0) {
-			averageRow[7] = new ExcelCell(new Long(timeTakenTotal / timeTakenCount), false);
-		    }
-		    if (markTotal > 0) {
-			Float averageMark = new Float(markTotal / markCount);
-			averageRow[8] = new ExcelCell(averageMark, false);
+		    if (showUserNames) {
+			averageRow = new ExcelCell[10];
+
+			averageRow[7] = new ExcelCell(service.getMessage("label.export.average"), true);
+
+			if (timeTakenTotal > 0) {
+			    averageRow[8] = new ExcelCell(new Long(timeTakenTotal / timeTakenCount), false);
+			}
+			if (markTotal > 0) {
+			    Float averageMark = new Float(markTotal / markCount);
+			    averageRow[9] = new ExcelCell(averageMark, false);
+			} else {
+			    averageRow[9] = new ExcelCell(new Float(0.0), false);
+			}
 		    } else {
-			averageRow[8] = new ExcelCell(new Float(0.0), false);
+			averageRow = new ExcelCell[9];
+			averageRow[6] = new ExcelCell(service.getMessage("label.export.average"), true);
+
+			if (timeTakenTotal > 0) {
+			    averageRow[7] = new ExcelCell(new Long(timeTakenTotal / timeTakenCount), false);
+			}
+			if (markTotal > 0) {
+			    Float averageMark = new Float(markTotal / markCount);
+			    averageRow[8] = new ExcelCell(averageMark, false);
+			} else {
+			    averageRow[8] = new ExcelCell(new Float(0.0), false);
+			}
 		    }
+
 		    data.add(averageRow);
 		    data.add(EMPTY_ROW);
 		}