Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.19 -r1.20
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	20 Mar 2009 16:39:38 -0000	1.19
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	25 Mar 2009 22:46:28 -0000	1.20
@@ -228,11 +228,17 @@
 label.monitoring.question.summary.average.mark  =Average mark
 label.monitoring.question.summary.group  =Group:
 label.monitoring.question.summary.ok  =Ok
+label.export.portfolio.activity.summary  =Activity Summary
+label.export.portfolio.question.summaries  =Question summaries
 label.resoruce.to.review  =Resources to view
-message.monitoring.edit.activity.not.editable  =This Activity is no longer editable
+message.monitoring.edit.activity.not.editable  =This Activity is no longer editable.
+output.desc.learner.total.score  =User's total score
+output.desc.learner.time.taken  =Time taken
+output.desc.learner.number.of.attempts  =Number of attempts made by user
+output.user.score.for.question  =User's score for the question: 
 export.label.resource  =Resource
 export.label.no.learning.object  =No offline package available
-export.title  =Export portfolio of Share Resource
+export.title  =Export portfolio of Assessment tool
 export.init.resource  =Initial Resources
 errors.header  =<b class="error">
 errors.footer  =</b>
Index: lams_tool_assessment/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/conf/xdoclet/struts-actions.xml,v
diff -u -r1.10 -r1.11
--- lams_tool_assessment/conf/xdoclet/struts-actions.xml	19 Mar 2009 22:06:53 -0000	1.10
+++ lams_tool_assessment/conf/xdoclet/struts-actions.xml	25 Mar 2009 22:46:29 -0000	1.11
@@ -224,6 +224,11 @@
 			parameter="summary" >
 			<forward name="success" path="/pages/monitoring/monitoring.jsp" />
 		</action>
+		<action path="/monitoring/userMasterDetail"
+			type="org.lamsfoundation.lams.tool.assessment.web.action.MonitoringAction"
+			parameter="userMasterDetail" >
+			<forward name="success" path="/pages/monitoring/parts/masterDetailLoadUp.jsp" />
+		</action>
 		<action path="/monitoring/questionSummary"
 			type="org.lamsfoundation.lams.tool.assessment.web.action.MonitoringAction"
 			parameter="questionSummary" >
Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/create_lams_tool_assessment.sql,v
diff -u -r1.11 -r1.12
--- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	11 Mar 2009 16:07:01 -0000	1.11
+++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	25 Mar 2009 22:46:28 -0000	1.12
@@ -62,8 +62,6 @@
    shuffle tinyint,
    case_sensitive tinyint,
    correct_answer tinyint DEFAULT 0,
-   hide tinyint,
-   create_by_author tinyint,
    create_date datetime,
    create_by bigint,
    assessment_uid bigint,
Index: lams_tool_assessment/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/tool_insert.sql,v
diff -u -r1.1 -r1.2
--- lams_tool_assessment/db/sql/tool_insert.sql	29 Jan 2009 05:59:05 -0000	1.1
+++ lams_tool_assessment/db/sql/tool_insert.sql	25 Mar 2009 22:46:28 -0000	1.2
@@ -30,7 +30,8 @@
 classpath_addition,
 context_file,
 create_date_time,
-modified_date_time
+modified_date_time,
+supports_outputs
 )
 VALUES
 (
@@ -60,5 +61,6 @@
 'lams-tool-laasse10.jar',
 '/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml',
 NOW(),
-NOW()
+NOW(),
+1
 )
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java,v
diff -u -r1.13 -r1.14
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	19 Mar 2009 22:06:53 -0000	1.13
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	25 Mar 2009 22:46:28 -0000	1.14
@@ -163,6 +163,8 @@
     public static final String ATTR_USER_SUMMARY = "userSummary";
     
     public static final String ATTR_QUESTION_SUMMARY = "questionSummary";
+    
+    public static final String ATTR_QUESTION_SUMMARY_LIST = "questionSummaryList";
 
     public static final String ATTR_USER_LIST = "userList";
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	19 Mar 2009 22:06:53 -0000	1.5
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	25 Mar 2009 22:46:28 -0000	1.6
@@ -34,6 +34,11 @@
         </property>
     </bean>
 
+    <!-- OutputFactory -->
+	<bean id="assessmentOutputFactory" class="org.lamsfoundation.lams.tool.assessment.service.AssessmentOutputFactory">  
+    	<property name="toolMessageService"><ref bean="messageService"/></property>  
+	</bean> 
+	
     <!-- core beans -->
     <bean id="assessmentDao" class="org.lamsfoundation.lams.tool.assessment.dao.hibernate.AssessmentDAOHibernate">
         <property name="sessionFactory">
@@ -131,6 +136,9 @@
 		<property name="lessonService">
    			<ref bean="lessonService"/>
    		</property>
+   		<property name="assessmentOutputFactory">
+   			<ref bean="assessmentOutputFactory"/>
+   		</property> 
 				
     </bean>
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java,v
diff -u -r1.6 -r1.7
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	20 Mar 2009 16:39:38 -0000	1.6
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	25 Mar 2009 22:46:28 -0000	1.7
@@ -26,7 +26,6 @@
 import java.util.List;
 
 import org.lamsfoundation.lams.tool.assessment.dao.AssessmentResultDAO;
-import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestionResult;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentResult;
  
 public class AssessmentResultDAOHibernate extends BaseDAOHibernate implements AssessmentResultDAO {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/JQGridJSONModel.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/Attic/JQGridJSONModel.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/JQGridJSONModel.java	25 Mar 2009 22:46:28 -0000	1.1
@@ -0,0 +1,95 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */
+
+/* $Id: JQGridJSONModel.java,v 1.1 2009/03/25 22:46:28 andreyb Exp $ */
+package org.lamsfoundation.lams.tool.assessment.dto;
+
+import java.util.List;
+
+public class JQGridJSONModel {
+
+    private String page;
+    private String total;
+    private Integer records;
+    private List<JQGridRow> rows;
+
+    /**
+     * @return the page
+     */
+    public String getPage() {
+	return page;
+    }
+
+    /**
+     * @param page
+     *            the page to set
+     */
+    public void setPage(String page) {
+	this.page = page;
+    }
+
+    /**
+     * @return the total
+     */
+    public String getTotal() {
+	return total;
+    }
+
+    /**
+     * @param total
+     *            the total to set
+     */
+    public void setTotal(String total) {
+	this.total = total;
+    }
+
+    /**
+     * @return the records
+     */
+    public Integer getRecords() {
+	return records;
+    }
+
+    /**
+     * @param records
+     *            the records to set
+     */
+    public void setRecords(Integer records) {
+	this.records = records;
+    }
+
+    /**
+     * @return the rows
+     */
+    public List<JQGridRow> getRows() {
+	return rows;
+    }
+
+    /**
+     * @param rows
+     *            the rows to set
+     */
+    public void setRows(List<JQGridRow> rows) {
+	this.rows = rows;
+    }
+
+}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/JQGridRow.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/Attic/JQGridRow.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/JQGridRow.java	25 Mar 2009 22:46:28 -0000	1.1
@@ -0,0 +1,47 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id: JQGridRow.java,v 1.1 2009/03/25 22:46:28 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.assessment.dto;  
+
+import java.util.List;
+ 
+public class JQGridRow {
+    
+    private Integer id; 
+    private List<String> cell;
+    
+    public Integer getId() {
+        return id;
+    }
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public List<String> getCell() {
+        return cell;
+    }
+    public void setCell(List<String> cell) {
+        this.cell = cell;
+    }
+
+}
+ 
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java,v
diff -u -r1.1 -r1.2
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java	19 Mar 2009 22:06:53 -0000	1.1
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java	25 Mar 2009 22:46:28 -0000	1.2
@@ -23,12 +23,10 @@
 /* $Id$ */  
 package org.lamsfoundation.lams.tool.assessment.dto;  
 
-import java.util.Date;
 import java.util.List;
 
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestion;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestionResult;
-import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
  
 /**
  * List contains following element: <br>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/UserSummary.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/UserSummary.java,v
diff -u -r1.1 -r1.2
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/UserSummary.java	17 Mar 2009 22:40:48 -0000	1.1
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/UserSummary.java	25 Mar 2009 22:46:28 -0000	1.2
@@ -26,7 +26,6 @@
 import java.util.Date;
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.assessment.model.AssessmentResult;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
  
 /**
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/UserSummaryItem.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/UserSummaryItem.java,v
diff -u -r1.1 -r1.2
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/UserSummaryItem.java	17 Mar 2009 22:40:48 -0000	1.1
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/UserSummaryItem.java	25 Mar 2009 22:46:28 -0000	1.2
@@ -23,12 +23,10 @@
 /* $Id$ */  
 package org.lamsfoundation.lams.tool.assessment.dto;  
 
-import java.util.Date;
 import java.util.List;
 
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestion;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestionResult;
-import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
  
 /**
  * List contains following element: <br>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Attic/AssessmentQuestion.hbm.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml	25 Feb 2009 22:16:33 -0000	1.5
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml	25 Mar 2009 22:46:28 -0000	1.6
@@ -147,22 +147,6 @@
         />
 
         <property
-            name="hide"
-            type="boolean"
-            update="true"
-            insert="true"
-            column="hide"
-        />
-
-        <property
-            name="createByAuthor"
-            type="boolean"
-            update="true"
-            insert="true"
-            column="create_by_author"
-        />
-
-        <property
             name="createDate"
             type="java.util.Date"
             update="true"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java,v
diff -u -r1.10 -r1.11
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	10 Mar 2009 21:39:14 -0000	1.10
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	25 Mar 2009 22:46:28 -0000	1.11
@@ -74,9 +74,6 @@
     private boolean caseSensitive;
     
     private boolean correctAnswer;
-    
-    private boolean hide;
-    private boolean isCreateByAuthor;
 
     private Date createDate;
     private AssessmentUser createBy;
@@ -359,32 +356,8 @@
     public void setCorrectAnswer(boolean correctAnswer) {
 	this.correctAnswer = correctAnswer;
     }
-    
-    /**
-     * @hibernate.property column="hide"
-     * @return
-     */
-    public boolean isHide() {
-	return hide;
-    }
 
-    public void setHide(boolean hide) {
-	this.hide = hide;
-    }
-
     /**
-     * @hibernate.property column="create_by_author"
-     * @return
-     */
-    public boolean isCreateByAuthor() {
-	return isCreateByAuthor;
-    }
-
-    public void setCreateByAuthor(boolean isCreateByAuthor) {
-	this.isCreateByAuthor = isCreateByAuthor;
-    }
-
-    /**
      * @hibernate.property column="create_date"
      * @return
      */
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentApplicationException.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentApplicationException.java,v
diff -u -r1.1 -r1.2
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentApplicationException.java	29 Jan 2009 05:59:05 -0000	1.1
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentApplicationException.java	25 Mar 2009 22:46:28 -0000	1.2
@@ -23,8 +23,10 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.assessment.service;
 
-public class AssessmentApplicationException extends Exception {
+public class AssessmentApplicationException extends RuntimeException {
 
+    private static final long serialVersionUID = -6341565277044152316L;
+
     public AssessmentApplicationException() {
 	super();
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java	25 Mar 2009 22:46:28 -0000	1.1
@@ -0,0 +1,187 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id: AssessmentOutputFactory.java,v 1.1 2009/03/25 22:46:28 andreyb Exp $ */  
+package org.lamsfoundation.lams.tool.assessment.service;  
+
+import java.util.List;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import org.lamsfoundation.lams.tool.OutputFactory;
+import org.lamsfoundation.lams.tool.ToolOutput;
+import org.lamsfoundation.lams.tool.ToolOutputDefinition;
+import org.lamsfoundation.lams.tool.assessment.model.Assessment;
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestion;
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestionResult;
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentResult;
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentSession;
+
+public class AssessmentOutputFactory extends OutputFactory {
+
+    protected final static String OUTPUT_NAME_LEARNER_TOTAL_SCORE = "learner.total.score";
+    protected final static String OUTPUT_NAME_LEARNER_TIME_TAKEN = "learner.time.taken";
+    protected final static String OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS = "learner.number.of.attempts";
+
+    /**
+     * @see org.lamsfoundation.lams.tool.OutputDefinitionFactory#getToolOutputDefinitions(java.lang.Object)
+     */
+    public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Object toolContentObject) {
+
+	TreeMap<String, ToolOutputDefinition> definitionMap = new TreeMap<String, ToolOutputDefinition>();
+	
+	ToolOutputDefinition definition = buildRangeDefinition(OUTPUT_NAME_LEARNER_TOTAL_SCORE, new Long(0), null);
+	definitionMap.put(OUTPUT_NAME_LEARNER_TOTAL_SCORE, definition);
+
+	definition = buildRangeDefinition(OUTPUT_NAME_LEARNER_TIME_TAKEN, new Long(0), null);
+	definitionMap.put(OUTPUT_NAME_LEARNER_TIME_TAKEN, definition);
+	
+	definition = buildRangeDefinition(OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS, new Long(0), null);
+	definitionMap.put(OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS, definition);
+	
+	if (toolContentObject != null) {
+
+	    Assessment assessment = (Assessment) toolContentObject;
+	    
+	    Set<AssessmentQuestion> questions = assessment.getQuestions();
+	    for(AssessmentQuestion question : questions) {
+		definition = buildRangeDefinition(String.valueOf(question.getSequenceId()), new Long(0), null);
+		definition.setDescription(getI18NText("output.user.score.for.question", false) + question.getTitle());
+		definitionMap.put(String.valueOf(question.getSequenceId()), definition);		
+	    };
+	}
+
+	return definitionMap;
+    }
+
+    public SortedMap<String, ToolOutput> getToolOutput(List<String> names, IAssessmentService assessmentService, Long toolSessionId,
+	    Long learnerId) {
+
+	TreeMap<String, ToolOutput> output = new TreeMap<String, ToolOutput>();
+
+	AssessmentSession session = assessmentService.getAssessmentSessionBySessionId(toolSessionId);
+	if ((session != null) && (session.getAssessment() != null)) {
+	    Assessment assessment = session.getAssessment();
+
+	    if (names == null || names.contains(OUTPUT_NAME_LEARNER_TOTAL_SCORE)) {
+		output.put(OUTPUT_NAME_LEARNER_TOTAL_SCORE, getTotalScore(assessmentService, learnerId, assessment));
+	    }
+	    if (names == null || names.contains(OUTPUT_NAME_LEARNER_TIME_TAKEN)) {
+		output.put(OUTPUT_NAME_LEARNER_TIME_TAKEN, getTimeTaken(assessmentService, learnerId, assessment));
+	    }
+	    if (names == null || names.contains(OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS)) {
+		output.put(OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS, getNumberAttempts(assessmentService, learnerId, assessment));
+	    }	
+	    Set<AssessmentQuestion> questions = assessment.getQuestions();
+	    for(AssessmentQuestion question : questions) {
+		if (names == null || names.contains(String.valueOf(question.getSequenceId()))) {
+		    output.put(OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS, getQuestionScore(assessmentService, learnerId, assessment, question.getSequenceId()));
+		}
+	    }
+	}
+
+	return output;
+    }
+
+    public ToolOutput getToolOutput(String name, IAssessmentService assessmentService, Long toolSessionId, Long learnerId) {
+	if (name != null) {
+	    AssessmentSession session = assessmentService.getAssessmentSessionBySessionId(toolSessionId);
+	    
+	    if ((session != null) && (session.getAssessment() != null)) {
+		Assessment assessment = session.getAssessment();
+
+		if (name.equals(OUTPUT_NAME_LEARNER_TOTAL_SCORE)) {
+		    return getTotalScore(assessmentService, learnerId, assessment);
+		} else if (name.equals(OUTPUT_NAME_LEARNER_TIME_TAKEN)) {
+		    return getTimeTaken(assessmentService, learnerId, assessment);
+		} else if (name.equals(OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS)) {
+		    return getNumberAttempts(assessmentService, learnerId, assessment);
+		} else {
+		    Set<AssessmentQuestion> questions = assessment.getQuestions();
+		    for(AssessmentQuestion question : questions) {
+			if (name.equals(String.valueOf(question.getSequenceId()))) {
+			    return getQuestionScore(assessmentService, learnerId, assessment, question.getSequenceId());
+			}
+		    }
+		}
+	    }
+	}
+	return null;
+    }
+
+    /**
+     * Get total score for a user. Will always return a ToolOutput object.
+     */
+    private ToolOutput getTotalScore(IAssessmentService assessmentService, Long learnerId, Assessment assessment) {
+	AssessmentResult assessmentResult = assessmentService.getLastAssessmentResult(assessment.getUid(), learnerId);
+	
+	float totalScore = (assessmentResult == null) ? 0 : assessmentResult.getGrade();
+	
+	return new ToolOutput(AssessmentOutputFactory.OUTPUT_NAME_LEARNER_TOTAL_SCORE, getI18NText(
+		AssessmentOutputFactory.OUTPUT_NAME_LEARNER_TOTAL_SCORE, true), totalScore);
+    }
+
+    /**
+     * Get time taken for a specific user to accomplish this assessment. Will always return a ToolOutput object.
+     */
+    private ToolOutput getTimeTaken(IAssessmentService assessmentService, Long learnerId, Assessment assessment) {
+	AssessmentResult assessmentResult = assessmentService.getLastAssessmentResult(assessment.getUid(), learnerId);
+	
+	long timeTaken = 0;
+	if ((assessmentResult != null) && (assessmentResult.getFinishDate() != null)) {
+	    timeTaken = (assessmentResult.getFinishDate().getTime() - assessmentResult.getStartDate().getTime()) / 1000;
+	}
+	
+	return new ToolOutput(AssessmentOutputFactory.OUTPUT_NAME_LEARNER_TIME_TAKEN, getI18NText(
+		AssessmentOutputFactory.OUTPUT_NAME_LEARNER_TIME_TAKEN, true), timeTaken);
+    }
+    
+    /**
+     * Get the number of attempts done by user. Will always return a ToolOutput object.
+     */
+    private ToolOutput getNumberAttempts(IAssessmentService assessmentService, Long learnerId, Assessment assessment) {
+	int numberAttempts = assessmentService.getAssessmentResultCount(assessment.getUid(), learnerId);
+	
+	return new ToolOutput(AssessmentOutputFactory.OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS, getI18NText(
+		AssessmentOutputFactory.OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS, true), numberAttempts);
+    }
+    
+    /**
+     * Get user's score for the question. Will always return a ToolOutput object.
+     */
+    private ToolOutput getQuestionScore(IAssessmentService assessmentService, Long learnerId, Assessment assessment,
+	    int questionSequenceId) {
+	AssessmentResult assessmentResult = assessmentService.getLastAssessmentResult(assessment.getUid(), learnerId);
+
+	float questionScore = 0;
+	for (AssessmentQuestionResult questionResult : assessmentResult.getQuestionResults()) {
+	    if (questionResult.getAssessmentQuestion().getSequenceId() == questionSequenceId) {
+		questionScore = questionResult.getMark();
+		break;
+	    }
+	}
+
+	return new ToolOutput(String.valueOf(questionSequenceId), "description", questionScore);
+    }
+
+}
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.12 -r1.13
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	20 Mar 2009 16:39:38 -0000	1.12
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	25 Mar 2009 22:46:28 -0000	1.13
@@ -35,7 +35,6 @@
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
-import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.regex.Pattern;
 
@@ -129,6 +128,8 @@
     private AssessmentToolContentHandler assessmentToolContentHandler;
 
     private MessageService messageService;
+    
+    private AssessmentOutputFactory assessmentOutputFactory;
 
     // system services
     private IRepositoryService repositoryService;
@@ -310,80 +311,6 @@
 	return questions;
     }
 
-    public List<Summary> exportBySessionId(Long sessionId, boolean skipHide) {
-	AssessmentSession session = assessmentSessionDao.getSessionBySessionId(sessionId);
-	if (session == null) {
-	    AssessmentServiceImpl.log.error("Failed get AssessmentSession by ID [" + sessionId + "]");
-	    return null;
-	}
-	// initial assessment questions list
-	List<Summary> questionList = new ArrayList();
-//	Set<AssessmentQuestion> resList = session.getAssessment().getQuestions();
-//	for (AssessmentQuestion question : resList) {
-//	    if (skipHide && question.isHide()) {
-//		continue;
-//	    }
-//	    // if question is create by author
-//	    if (question.isCreateByAuthor()) {
-//		Summary sum = new Summary(session.getSessionId(), session.getSessionName(), question, false);
-//		questionList.add(sum);
-//	    }
-//	}
-//
-//	// get this session's all assessment questions
-//	Set<AssessmentQuestion> sessList = session.getAssessmentQuestions();
-//	for (AssessmentQuestion question : sessList) {
-//	    if (skipHide && question.isHide()) {
-//		continue;
-//	    }
-//
-//	    // to skip all question create by author
-//	    if (!question.isCreateByAuthor()) {
-//		Summary sum = new Summary(session.getSessionId(), session.getSessionName(), question, false);
-//		questionList.add(sum);
-//	    }
-//	}
-
-	return questionList;
-    }
-
-    public List<List<Summary>> exportByContentId(Long contentId) {
-	Assessment assessment = assessmentDao.getByContentId(contentId);
-	List<List<Summary>> groupList = new ArrayList();
-
-//	// create init assessment questions list
-//	List<Summary> initList = new ArrayList();
-//	groupList.add(initList);
-//	Set<AssessmentQuestion> resList = assessment.getQuestions();
-//	for (AssessmentQuestion question : resList) {
-//	    if (question.isCreateByAuthor()) {
-//		Summary sum = new Summary(null, null, question, true);
-//		initList.add(sum);
-//	    }
-//	}
-//
-//	// session by session
-//	List<AssessmentSession> sessionList = assessmentSessionDao.getByContentId(contentId);
-//	for (AssessmentSession session : sessionList) {
-//	    List<Summary> group = new ArrayList<Summary>();
-//	    // get this session's all assessment questions
-//	    Set<AssessmentQuestion> sessList = session.getAssessmentQuestions();
-//	    for (AssessmentQuestion question : sessList) {
-//		// to skip all question create by author
-//		if (!question.isCreateByAuthor()) {
-//		    Summary sum = new Summary(session.getSessionId(), session.getSessionName(), question, false);
-//		    group.add(sum);
-//		}
-//	    }
-//	    if (group.size() == 0) {
-//		group.add(new Summary(session.getSessionId(), session.getSessionName(), null, false));
-//	    }
-//	    groupList.add(group);
-//	}
-
-	return groupList;
-    }
-
     public Assessment getAssessmentBySessionId(Long sessionId) {
 	AssessmentSession session = assessmentSessionDao.getSessionBySessionId(sessionId);
 	// to skip CGLib problem
@@ -620,18 +547,30 @@
 	    summary.setAssessmentResults(assessmentResults);
 	    summaryList.add(summary);
 	}
+	
+	escapeQuotes(summaryList);
 
 	return summaryList;
     }
     
+    public AssessmentResult getUserMasterDetail(Long sessionId, Long userId) {
+	AssessmentResult lastFinishedResult = assessmentResultDao.getLastFinishedAssessmentResultBySessionId(sessionId, userId);
+	SortedSet questionResults = new TreeSet(new AssessmentQuestionResultComparator());
+	questionResults.addAll(lastFinishedResult.getQuestionResults());
+	lastFinishedResult.setQuestionResults(questionResults);
+	escapeQuotes(lastFinishedResult);
+
+	return lastFinishedResult;
+    }
+    
     public UserSummary getUserSummary(Long contentId, Long userId, Long sessionId) {
 	UserSummary userSummary = new UserSummary();
 	AssessmentUser user = assessmentUserDao.getUserByUserIDAndSessionID(userId, sessionId);
 	userSummary.setUser(user);
 	List<AssessmentResult> results = assessmentResultDao.getAssessmentResultsBySession(sessionId, userId);
 	userSummary.setNumberOfAttempts(results.size());
 	
-	AssessmentResult lastFinishedResult = assessmentResultDao.getLastFinishedAssessmentResult(sessionId, userId);
+	AssessmentResult lastFinishedResult = assessmentResultDao.getLastFinishedAssessmentResultBySessionId(sessionId, userId);
 	long timeTaken = (lastFinishedResult == null) ? 0 : (lastFinishedResult.getFinishDate().getTime() - lastFinishedResult.getStartDate().getTime()); 
 	userSummary.setTimeOfLastAttempt(new Date(timeTaken));
 	if (lastFinishedResult != null) {
@@ -659,6 +598,8 @@
 	    userSummaryItems.add(userSummaryItem);
 	}
 	userSummary.setUserSummaryItems(userSummaryItems);
+	
+	escapeQuotes(userSummary);
 
 	return userSummary;
     }
@@ -711,6 +652,8 @@
 	float averageMark = (count == 0) ? 0 : total/count;
 	questionSummary.setAverageMark(averageMark);
 	
+	escapeQuotes(questionSummary);
+	
 	return questionSummary;
     }
     
@@ -732,6 +675,67 @@
     // *****************************************************************************
     // private methods
     // *****************************************************************************
+    
+    private static void escapeQuotes(Object object) {
+	if (object instanceof UserSummary) {
+	    UserSummary userSummary = (UserSummary) object;
+	    for (UserSummaryItem userSummaryItem : userSummary.getUserSummaryItems()) {
+		for (AssessmentQuestionResult questionResult : userSummaryItem.getQuestionResults()) {
+		    escapeQuotesInQuestionResult(questionResult);
+		}
+	    }
+	} else if (object instanceof QuestionSummary) {
+	    QuestionSummary questionSummary = (QuestionSummary) object;
+
+	    for (List<AssessmentQuestionResult> sessionQuestionResults : questionSummary.getQuestionResultsPerSession()) {
+		for (AssessmentQuestionResult questionResult : sessionQuestionResults) {
+		    escapeQuotesInQuestionResult(questionResult);
+		}
+	    }
+	} else if (object instanceof List) {
+	    List<Summary> summaryList = (List<Summary>) object;
+
+	    for (Summary summary : summaryList) {
+		for (AssessmentResult result : summary.getAssessmentResults()) {
+		    for (AssessmentQuestionResult questionResult : result.getQuestionResults()) {
+			escapeQuotesInQuestionResult(questionResult);
+		    }
+		}
+	    }
+	} else if (object instanceof AssessmentResult) {
+	    AssessmentResult assessmentResult = (AssessmentResult) object;
+
+	    for (AssessmentQuestionResult questionResult : assessmentResult.getQuestionResults()) {
+		escapeQuotesInQuestionResult(questionResult);
+	    }
+	}
+    }
+    
+    private static void escapeQuotesInQuestionResult(AssessmentQuestionResult questionResult) {
+	String answerString = questionResult.getAnswerString();
+	if (answerString != null) {
+	    questionResult.setAnswerString(answerString.replaceAll("[\"]", "&quot;"));
+	}
+
+	AssessmentQuestion question = questionResult.getAssessmentQuestion();
+	String title = question.getTitle();
+	if (title != null) {
+	    question.setTitle(title.replaceAll("[\"]", "&quot;"));
+	}
+
+	for (AssessmentQuestionOption questionOption : question.getQuestionOptions()) {
+	    String questionStr = questionOption.getQuestion();
+	    if (questionStr != null) {
+		questionOption.setQuestion(questionStr.replaceAll("[\"]", "&quot;"));
+	    }
+
+	    String optionStr = questionOption.getOptionString();
+	    if (optionStr != null) {
+		questionOption.setOptionString(optionStr.replaceAll("[\"]", "&quot;"));
+	    }
+	}
+    }
+    
     private Assessment getDefaultAssessment() throws AssessmentApplicationException {
 	Long defaultAssessmentId = getToolDefaultContentIdBySignature(AssessmentConstants.TOOL_SIGNATURE);
 	Assessment defaultAssessment = getAssessmentByContentId(defaultAssessmentId);
@@ -922,7 +926,11 @@
      * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition
      */
     public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId) throws ToolException {
-	return new TreeMap<String, ToolOutputDefinition>();
+	Assessment assessment = getAssessmentByContentId(toolContentId);
+	if (assessment == null) {
+	    assessment = getDefaultAssessment();
+	}
+	return getAssessmentOutputFactory().getToolOutputDefinitions(assessment);
     }
 
     public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException {
@@ -1038,7 +1046,7 @@
      *      java.lang.Long)
      */
     public SortedMap<String, ToolOutput> getToolOutput(List<String> names, Long toolSessionId, Long learnerId) {
-	return new TreeMap<String, ToolOutput>();
+	return assessmentOutputFactory.getToolOutput(names, this, toolSessionId, learnerId);
     }
 
     /**
@@ -1048,7 +1056,7 @@
      *      java.lang.Long)
      */
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
-	return null;
+	return assessmentOutputFactory.getToolOutput(name, this, toolSessionId, learnerId);
     }
 
     /* ===============Methods implemented from ToolContentImport102Manager =============== */
@@ -1107,7 +1115,15 @@
     public String getLocalisedMessage(String key, Object[] args) {
 	return messageService.getMessage(key, args);
     }
+    
+    public AssessmentOutputFactory getAssessmentOutputFactory() {
+	return assessmentOutputFactory;
+    }
 
+    public void setAssessmentOutputFactory(AssessmentOutputFactory assessmentOutputFactory) {
+	this.assessmentOutputFactory = assessmentOutputFactory;
+    }
+
     public ILessonService getLessonService() {
 	return lessonService;
     }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java,v
diff -u -r1.8 -r1.9
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	19 Mar 2009 22:06:53 -0000	1.8
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	25 Mar 2009 22:46:28 -0000	1.9
@@ -200,6 +200,8 @@
      */
     List<Summary> getSummaryList(Long contentId);
     
+    AssessmentResult getUserMasterDetail(Long sessionId, Long userId);
+    
     /**
      * Return user summary. This summary contains list of all attempts made by user.
      * 
@@ -214,19 +216,6 @@
     void changeQuestionResultMark(Long questionResultUid, float newMark);
 
     /**
-     * Get assessment question <code>Summary</code> list according to sessionId and skipHide flag.
-     * 
-     * @param sessionId
-     * @param skipHide
-     *            true, don't get assessment question if its <code>isHide</code> flag is true. Otherwise, get all assessment
-     *            question
-     * @return
-     */
-    public List<Summary> exportBySessionId(Long sessionId, boolean skipHide);
-
-    public List<List<Summary>> exportByContentId(Long contentId);
-
-    /**
      * Get user by UID
      * 
      * @param uid
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentBundler.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentBundler.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentBundler.java	25 Mar 2009 22:46:28 -0000	1.1
@@ -0,0 +1,135 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */
+
+/* $Id: AssessmentBundler.java,v 1.1 2009/03/25 22:46:28 andreyb Exp $ */
+package org.lamsfoundation.lams.tool.assessment.util;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+
+import org.lamsfoundation.lams.learning.export.web.action.Bundler;
+import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.HttpUrlConnectionUtil;
+
+public class AssessmentBundler extends Bundler {
+
+    public AssessmentBundler() {
+    }
+
+    /**
+     * This method bundles the files to the given output dir
+     * 
+     * @param request
+     *            the request for the export
+     * @param cookies
+     *            cookies for the request
+     * @param outputDirectory
+     *            the location where the files should be written
+     * @throws Exception
+     */
+    public void bundle(HttpServletRequest request, Cookie[] cookies, String outputDirectory) throws Exception {
+	bundleViaHTTP(request, cookies, outputDirectory);
+    }
+
+    /**
+     * See bundle
+     * 
+     * @param request
+     * @param cookies
+     * @param outputDirectory
+     * @throws MalformedURLException
+     * @throws FileNotFoundException
+     * @throws IOException
+     */
+    private void bundleViaHTTP(HttpServletRequest request, Cookie[] cookies, String outputDirectory)
+	    throws MalformedURLException, FileNotFoundException, IOException {
+	String[] directoriesNames = { "jqGrid" + File.separator + "min",
+		"images" + File.separator + "jqGrid.basic.theme", "css" };
+	List<String> directories = new ArrayList<String>();
+	for (String directoryName : directoriesNames) {
+	    directories.add(outputDirectory + File.separator + "javascript" + File.separator + directoryName);
+	}
+	this.createDirectories(directories);
+
+	String[] imageNames = new String[] { "cd_run.gif", "dirty.gif", "down.gif",
+		"find.gif", "first.gif", "folder.png", "grid-blue-ft.gif", "grid-blue-hd.gif", "headerbg.gif",
+		"headerleft.gif", "headerright.gif", "ico-close.gif", "last.gif", "leaf.gif", "line3.gif",
+		"loading.gif", "minus.gif", "next.gif", "nochild.gif", "off-first.gif", "off-last.gif", "off-next.gif",
+		"off-prev.gif", "plus.gif", "prev.gif", "refresh.gif", "resize.gif", "row_add.gif", "row_delete.gif",
+		"row_edit.gif", "sort_asc.gif", "sort_desc.gif", "spacer.gif", "tab_close-on.gif", "tree_leaf.gif",
+		"tree_minus.gif", "tree_plus.gif", "up.gif" };
+	
+	for (String imageName : imageNames) {
+	    String urlToConnectTo = getIncludesFolder() + "images" + File.separator + "jqGrid.basic.theme" + File.separator + imageName;
+	    String directoryToStoreFile = outputDirectory + File.separator + "javascript" + File.separator  + "images" + File.separator + "jqGrid.basic.theme";
+	    HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, directoryToStoreFile, imageName, cookies);// cookies aren't really needed here.
+	}
+	
+	String urlToConnectTo = getIncludesFolder() + "javascript" + File.separator + "jquery.jqGrid.js";
+	String directoryToStoreFile = outputDirectory + File.separator + "javascript";
+	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, directoryToStoreFile, "jquery.jqGrid.js", cookies); 
+
+	urlToConnectTo = getIncludesFolder() + "javascript" + File.separator + "jquery-1.2.6.pack.js";
+	directoryToStoreFile = outputDirectory + File.separator + "javascript";
+	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, directoryToStoreFile, "jquery-1.2.6.pack.js", cookies); 
+	
+	String[] jsFileNames = new String[] { "grid.locale-en-min.js", "grid.base-min.js", "grid.celledit-min.js", "grid.common-min.js",
+		"grid.custom-min.js", "grid.formedit-min.js", "grid.import-min.js", "grid.inlinedit-min.js",
+		"grid.postext-min.js", "grid.setcolumns-min.js", "grid.subgrid-min.js", "grid.tbltogrid-min.js",
+		"grid.treegrid-min.js", "jquery.fmatter-min.js", "json2-min.js", "JsonXml-min.js" };
+	
+	for (String jsFileName : jsFileNames) {
+	    urlToConnectTo = getIncludesFolder() + "javascript" + File.separator + "jqGrid" + File.separator + "min" + File.separator + jsFileName;
+	    directoryToStoreFile = outputDirectory + File.separator + "javascript" + File.separator + "jqGrid" + File.separator + "min";
+	    HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, directoryToStoreFile, jsFileName, cookies);// cookies aren't really needed here.
+	}
+	
+	urlToConnectTo = getIncludesFolder() + "css" + File.separator + "jqGrid.grid.css";
+	directoryToStoreFile = outputDirectory + File.separator + "javascript" + File.separator + "css";
+	HttpUrlConnectionUtil.writeResponseToFile(urlToConnectTo, directoryToStoreFile, "jqGrid.grid.css", cookies); 
+
+    }
+
+    private String getIncludesFolder() {
+	String spreadsheetUrlPath = Configuration.get(ConfigurationKeys.SERVER_URL);
+	if (spreadsheetUrlPath == null) {
+	    log.error("Unable to get path to the LAMS Spreadsheet URL from the configuration table. Spreadsheet javascript files export failed");
+	    return "";
+	} else {
+	    spreadsheetUrlPath = spreadsheetUrlPath + File.separator + "tool" + File.separator
+		    + AssessmentConstants.TOOL_SIGNATURE + File.separator + "includes" + File.separator;
+	    return spreadsheetUrlPath;
+	}
+    }
+
+}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java,v
diff -u -r1.14 -r1.15
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	11 Mar 2009 16:07:01 -0000	1.14
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	25 Mar 2009 22:46:28 -0000	1.15
@@ -1196,8 +1196,6 @@
 
 	question.setTitle(questionForm.getTitle());
 	question.setQuestion(questionForm.getQuestion());
-	question.setCreateByAuthor(true);
-	question.setHide(false);
 	
 	question.setDefaultGrade(Integer.parseInt(questionForm.getDefaultGrade()));
 	question.setGeneralFeedback(questionForm.getGeneralFeedback());
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java,v
diff -u -r1.11 -r1.12
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	17 Mar 2009 22:37:16 -0000	1.11
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	25 Mar 2009 22:46:28 -0000	1.12
@@ -197,9 +197,7 @@
 		if (question.getCreateBy() != null) {
 		    question.getCreateBy().getLoginName();
 		}
-		if (!question.isHide()) {
-		    questionList.add(question);
-		}
+		questionList.add(question);
 	    }
 	}
 
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.6 -r1.7
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	20 Mar 2009 16:39:38 -0000	1.6
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	25 Mar 2009 22:46:28 -0000	1.7
@@ -25,6 +25,7 @@
 package org.lamsfoundation.lams.tool.assessment.web.action;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.ServletException;
@@ -38,6 +39,8 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
+import org.lamsfoundation.lams.tool.assessment.dto.JQGridJSONModel;
+import org.lamsfoundation.lams.tool.assessment.dto.JQGridRow;
 import org.lamsfoundation.lams.tool.assessment.dto.QuestionSummary;
 import org.lamsfoundation.lams.tool.assessment.dto.Summary;
 import org.lamsfoundation.lams.tool.assessment.dto.UserSummary;
@@ -66,6 +69,9 @@
 	if (param.equals("summary")) {
 	    return summary(mapping, form, request, response);
 	}
+	if (param.equals("userMasterDetail")) {
+	    return userMasterDetail(mapping, form, request, response);
+	}
 	if (param.equals("questionSummary")) {
 	    return questionSummary(mapping, form, request, response);
 	}
@@ -89,14 +95,6 @@
 	Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	IAssessmentService service = getAssessmentService();
 	List<Summary> summaryList = service.getSummaryList(contentId);
-	
-	for (Summary summary : summaryList) {
-	    for (AssessmentResult result : summary.getAssessmentResults()) {
-		for (AssessmentQuestionResult questionResult : result.getQuestionResults()) {
-		    escapeQuotesInQuestionResult(questionResult);
-		}
-	    }
-	}
 
 	Assessment assessment = service.getAssessmentByContentId(contentId);
 	assessment.toDTO();
@@ -110,7 +108,44 @@
 		AttributeNames.PARAM_CONTENT_FOLDER_ID));	
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
+    
+    private ActionForward userMasterDetail(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	Long userId = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID);
+	Long sessionId = WebUtil.readLongParam(request, AssessmentConstants.PARAM_SESSION_ID);
+	IAssessmentService service = getAssessmentService();
+	AssessmentResult result = service.getUserMasterDetail(sessionId, userId);
+	
+//	// Construct the json data
+//	JQGridJSONModel json = new JQGridJSONModel(); 
+//	json.setPage("1"); 
+//	int records = (result.getQuestionResults() == null) ? 0 : result.getQuestionResults().size();
+//	json.setRecords(records); 
+//	json.setTotal("1");
+//	
+//	List<JQGridRow> rows = new ArrayList<JQGridRow>(); 
+//	     
+//	for (AssessmentQuestionResult questionResult : result.getQuestionResults()) { 
+//	  JQGridRow row = new JQGridRow(); 
+//	  row.setId(questionResult.getAssessmentQuestion().getSequenceId()); 
+//	  List<String> cells = new ArrayList<String>(); 
+//	  cells.add(questionResult.getUid().toString()); 
+//	  cells.add(questionResult.getFinishDate().toString()); 
+//	  cells.add(questionResult.getAnswerString());
+//	  cells.add(questionResult.getMark().toString());
+//	  row.setCell(cells); 
+//	  rows.add(row); 
+//	} 
+//	json.setRows(rows);
+//
+//	JSONSerializer serializer = new JSONSerializer(); 
+//	String jsonResult = serializer.exclude("*.class").deepSerialize(json); 
+	
+	request.setAttribute(AssessmentConstants.ATTR_ASSESSMENT_RESULT, result);
 
+	return mapping.findForward(AssessmentConstants.SUCCESS);
+    }
+
     private ActionForward questionSummary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	String sessionMapID = request.getParameter(AssessmentConstants.ATTR_SESSION_MAP_ID);
@@ -125,12 +160,6 @@
 	IAssessmentService service = getAssessmentService();
 	QuestionSummary questionSummary = service.getQuestionSummary(contentId, questionUid);
 	
-	for (List<AssessmentQuestionResult> sessionQuestionResults : questionSummary.getQuestionResultsPerSession()) {
-	    for (AssessmentQuestionResult questionResult : sessionQuestionResults) {
-		escapeQuotesInQuestionResult(questionResult);
-	    }
-	}
-	
 	request.setAttribute(AssessmentConstants.ATTR_QUESTION_SUMMARY, questionSummary);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
@@ -147,12 +176,6 @@
 	IAssessmentService service = getAssessmentService();
 	UserSummary userSummary = service.getUserSummary(contentId, userId, sessionId);
 	
-	for (UserSummaryItem userSummaryItem : userSummary.getUserSummaryItems()) {
-	    for (AssessmentQuestionResult questionResult : userSummaryItem.getQuestionResults()) {
-		escapeQuotesInQuestionResult(questionResult);
-	    }
-	}
-	
 	request.setAttribute(AssessmentConstants.ATTR_USER_SUMMARY, userSummary);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
@@ -179,29 +202,5 @@
 		.getServletContext());
 	return (IAssessmentService) wac.getBean(AssessmentConstants.ASSESSMENT_SERVICE);
     }
-    
-    private void escapeQuotesInQuestionResult(AssessmentQuestionResult questionResult) {
-	String answerString = questionResult.getAnswerString();
-	if (answerString != null) {
-	    questionResult.setAnswerString(answerString.replaceAll("[\"]", "&quot;"));
-	}
 
-	AssessmentQuestion question = questionResult.getAssessmentQuestion();
-	String title = question.getTitle();
-	if (title != null) {
-	    question.setTitle(title.replaceAll("[\"]", "&quot;"));
-	}
-
-	for (AssessmentQuestionOption questionOption : question.getQuestionOptions()) {
-	    String questionStr = questionOption.getQuestion();
-	    if (questionStr != null) {
-		questionOption.setQuestion(questionStr.replaceAll("[\"]", "&quot;"));
-	    }
-
-	    String optionStr = questionOption.getOptionString();
-	    if (optionStr != null) {
-		questionOption.setOptionString(optionStr.replaceAll("[\"]", "&quot;"));
-	    }
-	}
-    }
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java,v
diff -u -r1.4 -r1.5
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java	17 Mar 2009 22:40:50 -0000	1.4
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java	25 Mar 2009 22:46:28 -0000	1.5
@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
@@ -38,14 +39,19 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
+import org.lamsfoundation.lams.tool.assessment.dto.QuestionSummary;
 import org.lamsfoundation.lams.tool.assessment.dto.Summary;
+import org.lamsfoundation.lams.tool.assessment.dto.UserSummary;
 import org.lamsfoundation.lams.tool.assessment.model.Assessment;
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestion;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentSession;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
 import org.lamsfoundation.lams.tool.assessment.service.AssessmentApplicationException;
 import org.lamsfoundation.lams.tool.assessment.service.AssessmentServiceProxy;
 import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService;
+import org.lamsfoundation.lams.tool.assessment.util.AssessmentBundler;
 import org.lamsfoundation.lams.tool.assessment.util.AssessmentToolContentHandler;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -95,6 +101,16 @@
 
 	String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()
 		+ request.getContextPath();
+	
+	// Attempting to export required js and image files
+	try {
+	    AssessmentBundler imageBundler = new AssessmentBundler();
+	    imageBundler.bundle(request, cookies, directoryName);
+	} catch (Exception e) {
+	    logger.error(
+		    "Could not export spreadsheet javascript files, some files may be missing in export portfolio", e);
+	}
+	
 	writeResponseToFile(basePath + "/pages/export/exportportfolio.jsp?sessionMapID=" + sessionMap.getSessionID(),
 		directoryName, FILENAME, cookies);
 
@@ -146,17 +162,18 @@
 	    logger.error(error);
 	    throw new AssessmentApplicationException(error);
 	}
+	
+	AssessmentSession session = service.getAssessmentSessionBySessionId(toolSessionID);
+	if (session == null) {
+	    String error = "Failed get AssessmentSession by ID [" + toolSessionID + "]";
+	    logger.error(error);
+	    throw new AssessmentApplicationException(error);
+	}
 
-	List<Summary> group = service.exportBySessionId(toolSessionID, true);
-	saveFileToLocal(group, directoryName);
+	UserSummary userSummary = service.getUserSummary(content.getContentId(), userID, toolSessionID);
 
-	List<List> groupList = new ArrayList<List>();
-	if (group.size() > 0)
-	    groupList.add(group);
-
-	sessionMap.put(AssessmentConstants.ATTR_TITLE, content.getTitle());
-	sessionMap.put(AssessmentConstants.ATTR_INSTRUCTIONS, content.getInstructions());
-	sessionMap.put(AssessmentConstants.ATTR_SUMMARY_LIST, groupList);
+	sessionMap.put(AssessmentConstants.ATTR_ASSESSMENT, content);
+	sessionMap.put(AssessmentConstants.ATTR_USER_SUMMARY, userSummary);
     }
 
     public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName,
@@ -176,50 +193,22 @@
 	    logger.error(error);
 	    throw new AssessmentApplicationException(error);
 	}
-	List<List<Summary>> groupList = service.exportByContentId(toolContentID);
-	if (groupList != null) {
-	    for (List<Summary> list : groupList) {
-		saveFileToLocal(list, directoryName);
-	    }
+	
+	List<Summary> summaryList = service.getSummaryList(toolContentID);
+	
+	ArrayList<QuestionSummary> questionSummaryList = new ArrayList<QuestionSummary>();
+	Set<AssessmentQuestion> questions = content.getQuestions();
+	for (AssessmentQuestion question : questions) {
+	    QuestionSummary questionSummary = service.getQuestionSummary(toolContentID, question.getUid());
+	    questionSummaryList.add(questionSummary);
 	}
 
-	// put it into HTTPSession
-	sessionMap.put(AssessmentConstants.ATTR_TITLE, content.getTitle());
-	sessionMap.put(AssessmentConstants.ATTR_INSTRUCTIONS, content.getInstructions());
-	sessionMap.put(AssessmentConstants.ATTR_SUMMARY_LIST, groupList);
+	// cache into sessionMap
+	sessionMap.put(AssessmentConstants.ATTR_ASSESSMENT, content);	
+	sessionMap.put(AssessmentConstants.ATTR_SUMMARY_LIST, summaryList);
+	sessionMap.put(AssessmentConstants.ATTR_QUESTION_SUMMARY_LIST, questionSummaryList);
     }
 
-    private void saveFileToLocal(List<Summary> list, String directoryName) {
-	handler = getToolContentHandler();
-	for (Summary summary : list) {
-	    // for learning object, it just display "No offlice pakcage avaliable" information.
-//	    if (summary.getQuestionType() == AssessmentConstants.QUESTION_TYPE_FILL_THE_GAP
-//		    || summary.getQuestionType() == AssessmentConstants.QUESTION_TYPE_CHOICE)
-//		continue;
-//	    try {
-//		int idx = 1;
-//		String userName = summary.getUsername();
-//		String localDir;
-//		while (true) {
-//		    localDir = FileUtil.getFullPath(directoryName, userName + "/" + idx);
-//		    File local = new File(localDir);
-//		    if (!local.exists()) {
-//			local.mkdirs();
-//			break;
-//		    }
-//		    idx++;
-//		}
-//		summary.setAttachmentLocalUrl(userName + "/" + idx + "/" + summary.getFileUuid() + '.'
-//			+ FileUtil.getFileExtension(summary.getFileName()));
-//		handler.saveFile(summary.getFileUuid(), FileUtil.getFullPath(directoryName, summary
-//			.getAttachmentLocalUrl()));
-//	    } catch (Exception e) {
-//		logger.error("Export forum topic attachment failed: " + e.toString());
-//	    }
-	}
-
-    }
-
     private AssessmentToolContentHandler getToolContentHandler() {
 	if (handler == null) {
 	    WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(this
Index: lams_tool_assessment/web/pages/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/export/exportportfolio.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_assessment/web/pages/export/exportportfolio.jsp	29 Jan 2009 05:59:06 -0000	1.1
+++ lams_tool_assessment/web/pages/export/exportportfolio.jsp	25 Mar 2009 22:46:28 -0000	1.2
@@ -1,220 +1,18 @@
-<%@ include file="/common/taglibs.jsp"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-	"http://www.w3.org/TR/html4/loose.dtd">
-<c:set var="sessionMapID" value="${param.sessionMapID}" />
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<c:set var="summaryList" value="${sessionMap.summaryList}" />
-<c:set var="mode" value="${sessionMap.mode}" />
-<c:set var="title" value="${sessionMap.title}" />
-<c:set var="instructions" value="${sessionMap.instructions}" />
+		"http://www.w3.org/TR/html4/loose.dtd">
 
-<lams:html>
-<lams:head>
-	<title><fmt:message key="export.title" />
-	</title>
-	<c:set var="lams">
-		<lams:LAMSURL />
-	</c:set>
-	<script type="text/javascript">
-		function launchPopup(url,title) {
-			var wd = null;
-			if(wd && wd.open && !wd.closed){
-				wd.close();
-			}
-			wd = window.open(url,title,'resizable,width=796,height=570,scrollbars');
-			wd.window.focus();
-		}
-	</script>
-	<lams:css localLinkPath="../" />
+<%@ include file="/common/taglibs.jsp"%>
 
-	<style type="text/css">
-		.assessment-boldtext {
-			font-weight: bold;
-		}
-	</style>
+<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="mode" value="${sessionMap.mode}"/>
 
-</lams:head>
-<body class="stripes">
-
-	<div id="content">
-
-		<h1>
-			${title}
-		</h1>
-		
-		<div>
-			${instructions}
-		</div>
-
-		<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
-			<!-- 'group' always contains at least one Summary element  -->
-			<h2>
-				<c:choose>
-					<c:when test="${group[0].initGroup}">
-						<fmt:message key="export.init.resource" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="monitoring.label.group" />
-						${group[0].sessionName}
-				</c:otherwise>
-				</c:choose>
-			</h2>
-
-			<table cellspacing="0" width="98%" class="alternative-color">
-				<tr>
-					<th>
-						<fmt:message key="monitoring.label.type" />
-					</th>
-					<th width="20%">
-						<fmt:message key="monitoring.label.title" />
-					</th>
-					<th width="45%">
-						<fmt:message key="monitoring.label.instructions" />
-					</th>
-					<th>
-						<fmt:message key="monitoring.label.suggest" />
-					</th>
-					<th align="center">
-						<fmt:message key="export.label.resource" />
-					</th>
-
-					<c:if test="${mode == 'teacher'}">
-						<th align="center">
-							<!-- hide/show -->
-						</th>
-					</c:if>
-				</tr>
-
-				<c:forEach var="item" items="${group}" varStatus="status">
-
-					<%-- Bold styling is to indicate an item created by the author --%>
-					<c:choose>
-						<c:when test="${item.itemCreateByAuthor}">
-							<c:set var="itemRowStyle" value="assessment-boldtext" />
-						</c:when>
-						<c:otherwise>
-							<c:set var="itemRowStyle" value="" />
-						</c:otherwise>
-					</c:choose>
-
-					<c:if test="${item.itemUid == -1}">
-						<tr>
-							<td colspan="5">
-								<div align="left">
-									<fmt:message
-										key="message.monitoring.summary.no.resource.for.group" />
-								</div>
-							</td>
-						</tr>
-					</c:if>
-
-					<c:if test="${item.itemUid != -1}">
-						<tr class="${itemRowStyle}">
-							<td>
-								<c:choose>
-									<c:when test="${item.itemType == 1}">
-										<fmt:message key="label.authoring.basic.resource.url" />
-									</c:when>
-									<c:when test="${item.itemType == 2}">
-										<fmt:message key="label.authoring.basic.resource.file" />
-									</c:when>
-									<c:when test="${item.itemType == 3}">
-										<fmt:message key="label.authoring.basic.resource.website" />
-									</c:when>
-									<c:when test="${item.itemType == 4}">
-										<fmt:message
-											key="label.authoring.basic.resource.learning.object" />
-									</c:when>
-								</c:choose>
-							</td>
-
-							<td>
-								${item.itemTitle}
-							</td>
-							
-							<td>
-								<c:choose>
-									<c:when test="${not empty item.itemInstructions}">
-										<ol>
-											<c:forEach var="itemInstruction" items="${item.itemInstructions}">
-												<li>
-													${itemInstruction}
-												</li>
-											</c:forEach>
-										</ol>
-									</c:when>									
-									<c:otherwise>
-										&nbsp;
-									</c:otherwise>								
-								</c:choose>								
-							</td>
-
-							<td>
-								${item.username}
-							</td>
-
-							<td align="center">
-								<c:choose>
-									<c:when test="${item.itemType == 1}">
-										<a href="javascript:;"
-											onclick="launchPopup('${item.url}','openurl');"> <fmt:message
-												key="label.authoring.basic.resource.preview" /> </a>
-									</c:when>
-									<c:when test="${item.itemType == 2}">
-										<a href="${item.attachmentLocalUrl}"> <fmt:message
-												key="label.download" /> </a>
-									</c:when>
-									<c:when test="${item.itemType == 3}">
-										<a href="${item.attachmentLocalUrl}"> <fmt:message
-												key="label.download" /> </a>
-									</c:when>
-									<c:when test="${item.itemType == 4}">
-										<fmt:message key="export.label.no.learning.object" />
-									</c:when>
-								</c:choose>
-							</td>
-
-							<c:if test="${mode == 'teacher'}">
-								<td align="center">
-									<c:if test="${item.itemHide}">
-										<fmt:message key="monitoring.label.hidden" />
-									</c:if>
-								</td>
-							</c:if>
-						</tr>
-					</c:if>
-				</c:forEach>
-			</table>
-
-			<%-- Display reflection entries --%>
-			<c:if test="${not group[0].initGroup}">
-
-				<c:if test="${sessionMap.reflectOn}">
-					<%-- End all answers for this question --%>
-					<h3>
-						<fmt:message key="label.export.reflection" />
-					</h3>
-					<c:set var="reflectDTOSet"
-						value="${sessionMap.reflectList[group[0].sessionId]}" />
-					<c:forEach var="reflectDTO" items="${reflectDTOSet}">
-						<h4>
-							${reflectDTO.fullName}
-						</h4>
-						<p>
-							<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
-						</p>
-					</c:forEach>
-				</c:if>
-
-			</c:if>
-
-		</c:forEach>
-
-	</div>
-	<!--closes content-->
-
-	<div id="footer"></div>
-	<!--closes footer-->
-
-</body>
-</lams:html>
+<c:choose>
+	<c:when test="${mode == 'learner'}">
+		<%@ include file="parts/exportlearner.jsp"%>
+	</c:when>
+										
+	<c:when test="${mode == 'teacher'}">
+		<%@ include file="parts/exportteacher.jsp"%>
+	</c:when>
+</c:choose>
Index: lams_tool_assessment/web/pages/export/parts/exportlearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/export/parts/exportlearner.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_assessment/web/pages/export/parts/exportlearner.jsp	25 Mar 2009 22:46:28 -0000	1.1
@@ -0,0 +1,158 @@
+<lams:html>
+	<lams:head>
+		<title><fmt:message key="export.title" /></title>
+		<lams:css localLinkPath="../"/>
+
+		<c:set var="lams">	<lams:LAMSURL /></c:set>
+		<c:set var="userSummary" value="${sessionMap.userSummary}"/>
+		<c:set var="assessment" value="${sessionMap.assessment}"/>
+		
+		<link rel="stylesheet" type="text/css" href="./javascript/css/jqGrid.grid.css" />
+		<script type="text/javascript" src="./javascript/jquery-1.2.6.pack.js"></script>
+		<script type="text/javascript"> 
+			var pathToJsFolder = "./javascript/"; 
+		</script>
+	 	<script type="text/javascript" src="./javascript/jquery.jqGrid.js"></script>
+
+  	    <script>
+  	    	<!--
+	  	  	$(document).ready(function(){
+	  			<c:forEach var="userSummaryItem" items="${userSummary.userSummaryItems}" varStatus="status">
+	  				<c:set var="question" value="${userSummaryItem.question}"/>
+	  			
+	  				jQuery("#user${question.uid}").jqGrid({
+	  					datatype: "local",
+	  					height: 'auto',
+	  					width: 500,
+	  					shrinkToFit: true,
+	  					
+	  				   	colNames:['<fmt:message key="label.monitoring.user.summary.attempt" />',
+	  							'<fmt:message key="label.monitoring.user.summary.time" />',
+	  							'<fmt:message key="label.monitoring.user.summary.response" />',
+	  						    '<fmt:message key="label.monitoring.user.summary.grade" />'],
+	  						    
+	  				   	colModel:[
+	  				   		{name:'id', index:'id', width:55, sorttype:"int"},
+	  				   		{name:'time', index:'time', width:150, sorttype:'date', datefmt:'Y-m-d'},
+	  				   		{name:'response', index:'response', width:200, sortable:false},
+	  				   		{name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4} }		
+	  				   	],
+	  				   	
+	  				   	imgpath:  "./javascript/images/jqGrid.basic.theme", 
+	  				   	multiselect: false,
+	  				   	caption: "${question.title}"
+  						/*  resetSelection() doesn't work in this version
+						    hope it'll be fixed in the next one
+						    
+	  					,
+	  					onSelectRow: function (rowid){
+	  						$("[id^='user']").resetSelection();
+	  					},
+	  					onCellSelect: function (rowid, iCol, cellcontent){
+	  						jQuery("#user${question.uid+1}").resetSelection();
+	  					}*/ 	  				  	
+	  				});
+	  				
+	  	   	        <c:forEach var="questionResult" items="${userSummaryItem.questionResults}" varStatus="i">
+	  	   	        	var responseStr = "";
+	  	   	       		<%@ include file="userresponse.jsp"%>
+	  	   	     		jQuery("#user${question.uid}").addRowData(${i.index + 1}, {
+	  	   	   	     		id:"${i.index + 1}",
+	  	   	   	   			time:"${questionResult.finishDate}",
+	  	   	   	   			response:responseStr,
+	  	   	   	   			grade:"<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>"
+	  	   	   	   	    });
+	  		        </c:forEach>			
+	  				
+	  			</c:forEach>
+	  		});  	
+  			-->
+  		</script>
+		
+		
+	</lams:head>
+	
+	<body class="stripes" >
+		<div id="content" >
+		
+			<h1>${assessment.title} </h1>
+			
+			<h2>${assessment.instructions} </h2>
+			
+			<br><br>		
+			
+			<table class="forum" style="background:none; border: 1px solid #cacdd1; margin-bottom:60px; padding-top:0px; margin-bottom: 10px;" cellspacing="0">
+				<tr>
+					<th style="width: 180px; border-left: none; padding-top:0px; " >
+						<fmt:message key="label.monitoring.user.summary.user.name" />
+					</th>
+					<td >
+						${userSummary.user.lastName}, ${userSummary.user.firstName}
+					</td>
+				</tr>
+				
+				<tr>
+					<th style="width: 180px;" >
+						<fmt:message key="label.monitoring.user.summary.number.attempts" />
+					</th>
+					<td>
+						${userSummary.numberOfAttempts}
+					</td>
+				</tr>
+					
+				<tr>
+					<th style="width: 180px;" >
+						<fmt:message key="label.monitoring.user.summary.time.last.attempt" />
+					</th>
+					<td>
+						<fmt:formatDate value="${userSummary.timeOfLastAttempt}" pattern="H" timeZone="GMT" /> <fmt:message key="label.learning.summary.hours" />
+						<fmt:formatDate value="${userSummary.timeOfLastAttempt}" pattern="m" timeZone="GMT" /> <fmt:message key="label.learning.summary.minutes" />
+					</td>
+				</tr>
+					
+				<tr>
+					<th style="width: 180px;" >
+						<fmt:message key="label.monitoring.user.summary.last.attempt.grade" />
+					</th>
+					<td>
+						${userSummary.lastAttemptGrade}
+					</td>
+				</tr>
+			</table>
+			<br><br>
+			
+			<c:forEach var="userSummaryItem" items="${userSummary.userSummaryItems}" varStatus="status">
+				<div style="padding-left: 0px; padding-bottom: 30px;">
+					<table style="font-size: small; padding-bottom: 5px;">
+						<tr>
+							<td width="50px;">
+								<fmt:message key="label.monitoring.user.summary.title" />
+							</td>
+							<td>
+								 ${userSummaryItem.question.title}
+							</td>
+						</tr>					
+						<tr>
+							<td width="50px;">
+								<fmt:message key="label.monitoring.user.summary.question" />
+							</td>
+							<td>
+								${userSummaryItem.question.question}
+							</td>
+						</tr>
+					</table>
+					
+					<table id="user${userSummaryItem.question.uid}" class="scroll" cellpadding="0" cellspacing="0" ></table>
+				</div>	
+			</c:forEach>	
+
+		</div>
+		<!--closes content-->
+	
+		<div id="footer">
+		</div>
+		<!--closes footer-->		
+		
+	</body>
+</lams:html>
+	
\ No newline at end of file
Index: lams_tool_assessment/web/pages/export/parts/exportteacher.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/export/parts/exportteacher.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_assessment/web/pages/export/parts/exportteacher.jsp	25 Mar 2009 22:46:27 -0000	1.1
@@ -0,0 +1,234 @@
+<lams:html>
+	<lams:head>
+		<title><fmt:message key="export.title" /></title>
+		<lams:css localLinkPath="../"/>
+
+		<c:set var="lams">	<lams:LAMSURL /></c:set>
+		<c:set var="summaryList" value="${sessionMap.summaryList}"/>
+		<c:set var="questionSummaryList" value="${sessionMap.questionSummaryList}"/>
+		<c:set var="assessment" value="${sessionMap.assessment}"/>
+		
+		<link rel="stylesheet" type="text/css" href="./javascript/css/jqGrid.grid.css" />
+		<script type="text/javascript" src="./javascript/jquery-1.2.6.pack.js"></script>
+		<script type="text/javascript"> 
+			var pathToJsFolder = "./javascript/"; 
+		</script>
+	 	<script type="text/javascript" src="./javascript/jquery.jqGrid.js"></script>
+
+  	    <script>
+  			<!--	
+  	    	var numberOfValues = 0;
+	  		$(document).ready(function(){
+	  			<c:forEach var="summary" items="${summaryList}" varStatus="status">
+	  			
+	  				jQuery("#list${summary.sessionId}").jqGrid({
+	  					datatype: "local",
+	  					height: 'auto',
+	  					width: 630,
+	  					shrinkToFit: false,
+	  					
+	  				   	colNames:['#',
+	  							'<fmt:message key="label.monitoring.summary.user.name" />',
+	  				   	        <c:forEach var="question" items="${assessment.questions}">
+	  				   	     		"${question.title}", 
+	  				   	        </c:forEach>
+	  						    '<fmt:message key="label.monitoring.summary.total" />'],
+	  						    
+	  				   	colModel:[
+	  				   		{name:'id',index:'id', width:20, sorttype:"int"},
+	  				   		{name:'userName',index:'userName', width:100},
+	  			   	        <c:forEach var="question" items="${assessment.questions}">
+	  			   	     		{name:'${question.uid}', index:'${question.uid}', width:60, align:"right", sorttype:"float"},
+	  		   	        	</c:forEach>			   				
+	  				   		{name:'total',index:'total', width:50,align:"right",sorttype:"float"}		
+	  				   	],
+	  				   	
+	  				   	imgpath:  "./javascript/images/jqGrid.basic.theme", 
+	  				   	multiselect: false,
+	  				   	caption: "${summary.sessionName}"
+	  				});
+	  				
+	  	   	        <c:forEach var="assessmentResult" items="${summary.assessmentResults}" varStatus="i">
+	  	   	     		jQuery("#list${summary.sessionId}").addRowData(${i.index + 1}, {
+	  	   	   	     		id:"${i.index + 1}",
+	  	   	   	     		userName:"${assessmentResult.user.lastName}, ${assessmentResult.user.firstName}",
+	  			   	   	  	<c:choose>
+	  			   	   			<c:when test="${not empty assessmentResult.questionResults}">
+	  					   	        <c:forEach var="questionResult" items="${assessmentResult.questionResults}">
+	  				   	    			${questionResult.assessmentQuestion.uid}:"<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>",
+	  		   	        			</c:forEach>		
+	  			   	   			</c:when>
+	  			   	   			<c:otherwise>
+	  					   	        <c:forEach var="question" items="${assessment.questions}">
+	  					   	     		${question.uid}:"-",
+	  			   	        		</c:forEach>		   	   			
+	  			   	   			</c:otherwise>
+	  			   	   		</c:choose>	
+	  	   	   	     		
+	  	   	   	     		total:"<fmt:formatNumber value='${assessmentResult.grade}' maxFractionDigits='3'/>"
+	  	   	   	   	    });
+	  		        </c:forEach>			
+	  				
+	  			</c:forEach>
+
+	  			<c:forEach var="questionSummary" items="${questionSummaryList}">
+	  				<c:forEach var="questionResultsPerSession" items="${questionSummary.questionResultsPerSession}" varStatus="status">
+		  				<c:set var="session" value="${questionResultsPerSession[0].user.session}"/>
+			  			
+		  				jQuery("#session${questionSummary.question.uid}_${session.sessionId}").jqGrid({
+		  					datatype: "local",
+		  					height: 'auto',
+		  					width: 500,
+		  					shrinkToFit: true,
+		  					
+		  				   	colNames:['<fmt:message key="label.monitoring.summary.user.name" />',
+		  							'<fmt:message key="label.monitoring.user.summary.response" />',
+		  						    '<fmt:message key="label.monitoring.user.summary.grade" />'],
+		  						    
+		  				   	colModel:[
+								{name:'userName',index:'userName', width:100},
+		  				   		{name:'response', index:'response', width:200, sortable:false},
+		  				   		{name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4} }		
+		  				   	],
+		  				   	
+		  				   	imgpath:   "./javascript/images/jqGrid.basic.theme", 
+		  				   	multiselect: false,
+		  				   	caption: "<fmt:message key='label.monitoring.question.summary.group' /> ${session.sessionName}"
+								/*  resetSelection() doesn't work in this version
+							    hope it'll be fixed in the next one
+							    
+		  					,
+		  					onSelectRow: function (rowid){
+		  						$("[id^='user']").resetSelection();
+		  					},
+		  					onCellSelect: function (rowid, iCol, cellcontent){
+		  						jQuery("#session${session.sessionId}}").resetSelection();
+		  					}*/ 	  				  	
+		  				});
+		  				
+		  	   	        <c:forEach var="questionResult" items="${questionResultsPerSession}" varStatus="i">
+				   	   	  	<c:choose>
+				   	   			<c:when test="${questionResult.uid != null}">
+				  	   	        	var responseStr = "";
+									numberOfValues++;
+				  	   	       		<c:set var="question" value="${questionResult.assessmentQuestion}"/>			  	   	        	
+				  	   	       		<%@ include file="userresponse.jsp"%>	
+				  	   	       		var grade = "<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>";	
+				   	   			</c:when>
+				   	   			<c:otherwise>
+				  	   	        	var responseStr = "-";
+				  	   	       		var grade = "-";	
+				   	   			</c:otherwise>
+			   	   			</c:choose>		  	   	        
+		
+		  	   	     		jQuery("#session${questionSummary.question.uid}_${session.sessionId}").addRowData(${i.index + 1}, {
+		  	   	     			userName:"${questionResult.user.lastName}, ${questionResult.user.firstName}",
+		  	   	   	   			response:responseStr,
+		  	   	   	   			grade:grade
+		  	   	   	   	    });
+		  		        </c:forEach>			
+		  				
+		  			</c:forEach>
+
+				</c:forEach>	
+	  		});
+	  		-->		
+  		</script>
+		
+		
+	</lams:head>
+	
+	<body class="stripes" >
+		<div id="content" >
+		
+			<h1>${assessment.title} </h1>
+			
+			<h2>${assessment.instructions} </h2>
+			
+			<br>		
+			<h3><fmt:message key="label.export.portfolio.activity.summary" /></h3>
+			<br>
+			
+			<c:forEach var="summary" items="${summaryList}">
+				<div style="padding-left: 30px; padding-bottom: 30px;">
+					<div style="padding-bottom: 5px; font-size: small;">
+						<B><fmt:message key="monitoring.label.group" /></B> ${summary.sessionName}
+					</div>
+						
+					<table id="list${summary.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
+				</div>	
+			</c:forEach>			
+
+			<h3><fmt:message key="label.export.portfolio.question.summaries" /></h3>
+			<br>
+			
+			<div style="margin-left: 30px;">
+			<c:forEach var="questionSummary" items="${questionSummaryList}">
+				<table class="forum" style="background:none; border: 1px solid #cacdd1; margin-bottom:60px; padding-top:0px; margin-bottom: 10px; width: 640px;" cellspacing="0">
+					<tr>
+						<th style="width: 180px; border-left: none; padding-top:0px; " >
+							<fmt:message key="label.monitoring.question.summary.title" />
+						</th>
+						<td >
+							${questionSummary.question.title}
+						</td>
+					</tr>
+					
+					<tr>
+						<th style="width: 180px;" >
+							<fmt:message key="label.monitoring.question.summary.question" />
+						</th>
+						<td>
+							${questionSummary.question.question}
+						</td>
+					</tr>
+						
+					<tr>
+						<th style="width: 180px;" >
+							<fmt:message key="label.monitoring.question.summary.default.mark" />
+						</th>
+						<td>
+							${questionSummary.question.defaultGrade}
+						</td>
+					</tr>
+						
+					<tr>
+						<th style="width: 180px;" >
+							<fmt:message key="label.monitoring.question.summary.penalty" />
+						</th>
+						<td>
+							${questionSummary.question.penaltyFactor}
+						</td>
+					</tr>
+					
+					<tr>
+						<th style="width: 180px;" >
+							<fmt:message key="label.monitoring.question.summary.average.mark" />
+						</th>
+						<td>
+							<div id="averageMark">${questionSummary.averageMark}</div>
+						</td>
+					</tr>				
+				</table>
+				<br><br>
+				
+				<c:forEach var="questionResultsPerSession" items="${questionSummary.questionResultsPerSession}" varStatus="status">
+					<c:set var="session" value="${questionResultsPerSession[0].user.session}"/>
+					<div style="padding-left: 0px; padding-bottom: 30px;">
+						<table id="session${questionSummary.question.uid}_${session.sessionId}" class="scroll" cellpadding="0" cellspacing="0" ></table>
+					</div>	
+				</c:forEach>	
+				<br><br><br><br><br>
+			</c:forEach>
+			</div>
+	
+		</div>
+		<!--closes content-->
+	
+		<div id="footer">
+		</div>
+		<!--closes footer-->		
+		
+	</body>
+</lams:html>
+	
\ No newline at end of file
Index: lams_tool_assessment/web/pages/export/parts/userresponse.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/export/parts/userresponse.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_assessment/web/pages/export/parts/userresponse.jsp	25 Mar 2009 22:46:28 -0000	1.1
@@ -0,0 +1,62 @@
+					<c:choose>
+						<c:when test="${question.type == 1}">
+							<c:forEach var="questionOption" items="${question.questionOptions}">
+								<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+									<c:if test="${optionAnswer.answerBoolean && (optionAnswer.questionOptionUid == questionOption.uid)}">
+										responseStr += "${questionOption.optionString}";
+									</c:if>
+								</c:forEach>					
+							</c:forEach>						
+						</c:when>
+						<c:when test="${question.type == 2}">
+							responseStr +='<table style="padding: 0px; margin: 0px; border: none; " cellspacing="0" cellpadding="0">';
+								<c:forEach var="questionOption" items="${question.questionOptions}">
+									responseStr +='<tr>';
+										responseStr +='<td style="width:40%; background: none; padding: 0px; margin: 0px; border: none;">';
+											responseStr +="${questionOption.question}";
+										responseStr +='</td>';
+										responseStr +='<td style="background: none; padding: 0px; margin: 0px; border: none; vertical-align: middle;">';
+											responseStr +='-'; 
+											<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+												<c:if test="${questionOption.uid == optionAnswer.questionOptionUid}">
+													<c:forEach var="questionOption2" items="${question.questionOptions}">
+														<c:if test="${questionOption2.uid == optionAnswer.answerInt}">
+															responseStr +="${questionOption2.optionString}";
+														</c:if>
+													</c:forEach>
+												</c:if>
+											</c:forEach>										
+										responseStr +='</td>';
+									responseStr +='</tr>';
+								</c:forEach>
+							responseStr +='</table>';
+						</c:when>
+						<c:when test="${question.type == 3}">
+							responseStr +="${questionResult.answerString}";
+						</c:when>
+						<c:when test="${question.type == 4}">
+							responseStr +="${questionResult.answerString}";
+						</c:when>
+						<c:when test="${question.type == 5}">
+							<c:if test="${questionResult.answerString != null}">			
+								responseStr +="${questionResult.answerBoolean}";
+							</c:if>
+						</c:when>
+						<c:when test="${question.type == 6}">
+							responseStr +="${questionResult.answerString}";
+						</c:when>
+						<c:when test="${question.type == 7}">
+							<c:forEach var="j" begin="0" end="${fn:length(questionResult.optionAnswers) - 1}" step="1">
+								<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+									<c:if test="${optionAnswer.answerInt == j}">		
+										<c:forEach var="questionOption" items="${question.questionOptions}">
+											<c:if test="${optionAnswer.questionOptionUid == questionOption.uid}">
+												responseStr +="${questionOption.optionString}";
+											</c:if>
+										</c:forEach>
+									</c:if>								
+								</c:forEach>
+							</c:forEach>
+						</c:when>						
+	
+					</c:choose>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/summary.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	20 Mar 2009 16:39:38 -0000	1.5
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	25 Mar 2009 22:46:28 -0000	1.6
@@ -39,22 +39,41 @@
 			   	multiselect: false,
 			   	caption: "${summary.sessionName}",
 			   	ondblClickRow: function(rowid) {
-				   	
 			   		var userId = jQuery("#list${summary.sessionId}").getCell(rowid, 'userId');
 			   		var sessionId = jQuery("#list${summary.sessionId}").getCell(rowid, 'sessionId');
 					var userSummaryUrl = '<c:url value="/monitoring/userSummary.do?sessionMapID=${sessionMapID}"/>';
 					var newUserSummaryHref = userSummaryUrl + "&userID=" + userId + "&sessionId=" + sessionId + "&KeepThis=true&TB_iframe=true&height=540&width=650&modal=true";
 					$("#userSummaryHref").attr("href", newUserSummaryHref);	
 					$("#userSummaryHref").click(); 		
-			  	} 
+			  	},
+			  	onSelectRow: function(rowid) { 
+			  	    if(rowid == null) { 
+			  	    	rowid=0; 
+			  	    } 
+			   		var userId = jQuery("#list${summary.sessionId}").getCell(rowid, 'userId');
+			   		var sessionId = jQuery("#list${summary.sessionId}").getCell(rowid, 'sessionId');
+					var userMasterDetailUrl = '<c:url value="/monitoring/userMasterDetail.do"/>';
+					//userMasterDetailUrl += "?userID=" + userId + "&sessionId=" + sessionId;
+		  	        jQuery("#userSummary${summary.sessionId}").clearGridData().setGridParam({gridstate: "visible",caption:"ss"}).trigger("reloadGrid");
+		  	   //   jQuery("#userSummary${summary.sessionId}").setGridParam({caption:"ss"});
+		  	     // jQuery("#userSummary${summary.sessionId}").trigger("reloadGrid");
+		  	        $("#masterDetailArea").load(
+		  	        	userMasterDetailUrl,
+		  	        	{
+		  	        		userID: userId,
+		  	        		sessionId: sessionId
+		  	       		}
+		  	       	);
+				  	        
+	  	  		} 
 			}).hideCol("userId").hideCol("sessionId");
 			
    	        <c:forEach var="assessmentResult" items="${summary.assessmentResults}" varStatus="i">
    	     		jQuery("#list${summary.sessionId}").addRowData(${i.index + 1}, {
    	   	     		id:"${i.index + 1}",
    	   	     		userId:"${assessmentResult.user.userId}",
    	   	     		sessionId:"${assessmentResult.user.session.sessionId}",
-   	   	     		userName:"${assessmentResult.user.loginName}",
+   	   	     		userName:"${assessmentResult.user.lastName}, ${assessmentResult.user.firstName}",
 		   	   	  	<c:choose>
 		   	   			<c:when test="${not empty assessmentResult.questionResults}">
 				   	        <c:forEach var="questionResult" items="${assessmentResult.questionResults}">
@@ -70,7 +89,49 @@
    	   	     		
    	   	     		total:"<fmt:formatNumber value='${assessmentResult.grade}' maxFractionDigits='3'/>"
    	   	   	    });
-	        </c:forEach>			
+	        </c:forEach>		
+
+			jQuery("#userSummary${summary.sessionId}").jqGrid({
+				datatype: "local",
+				
+				hiddengrid: true,
+				height: 90,
+				width: 530,
+				shrinkToFit: false,
+				
+			   	colNames:['#',
+						'questionResultUid',
+  						'Question',
+  						'<fmt:message key="label.monitoring.user.summary.response" />',
+  						'<fmt:message key="label.monitoring.user.summary.grade" />'],
+					    
+			   	colModel:[
+	  			   		{name:'id', index:'id', width:25, sorttype:"int"},
+	  			   		{name:'questionResultUid', index:'questionResultUid', width:0},
+	  			   		{name:'title', index:'title', width:200},
+	  			   		{name:'response', index:'response', width:200, sortable:false},
+	  			   		{name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4} }
+			   	],
+			   	
+			   	imgpath:  pathToImageFolder + "jqGrid.basic.theme", 
+			   	multiselect: false,
+			   	caption: "User summary",
+				cellurl: '<c:url value="/monitoring/saveUserGrade.do?sessionMapID=${sessionMapID}"/>',
+  				cellEdit: true,
+  				afterSaveCell : function (rowid,name,val,iRow,iCol){
+  					if (isNaN(val)) {
+  						jQuery("#userSummary${summary.sessionId}").restoreCell(iRow,iCol); 
+  					}
+				},	  		
+  				beforeSubmitCell : function (rowid,name,val,iRow,iCol){
+  					if (isNaN(val)) {
+  						return {nan:true};
+  					} else {
+  						var questionResultUid = jQuery("#userSummary${summary.sessionId}").getCell(rowid, 'questionResultUid');
+  						return {questionResultUid:questionResultUid};		  				  		
+  				  	}
+  				}
+			}).hideCol("questionResultUid");	
 			
 		</c:forEach>
 
@@ -82,14 +143,6 @@
 			$("#questionSummaryHref").click(); 		 
 	    }); 
 	});
-/*
-	function createQuestionSummaryHref() {
-
-	};
-*/
-	function updateRowData(rowid){   
-		jQuery("#list").setRowData( rowid, { tax:"5", total:"205" }) 
-	};
 	
 	function refreshThickbox(){   
 		tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
@@ -114,24 +167,6 @@
 		}
 	};
 	window.onresize = resizeIframe;
-
-	/*
-	function resizeIframe() {
-		
-		    var width = this.window.innerWidth;
-		    alert(width);
-		    if ( width == undefined || width == 0 ) {
-		    	// IE doesn't use window.innerWidth.
-		    	width = document.documentElement.clientWidth;
-		    	// alert("using clientWidth");
-		    }
-			alert("doc width "+width);
-			var newWidth = width * 0.8;
-			
-		    jQuery("#list4").setGridWidth(newWidth, true);
-	};
-	window.onresize = resizeIframe;	
-	*/
 	-->		
 </script>
 
@@ -146,10 +181,13 @@
 	</c:when>
 	<c:otherwise>
 	
+		<div id="masterDetailArea">
+			<%@ include file="parts/masterDetailLoadUp.jsp"%>
+		</div>
+	
 		<a onclick="" href="return false;" class="thickbox" id="userSummaryHref" style="display: none;"></a>	
 	
 		<!-- Dropdown menu for choosing a question type -->
-	
 		<div style="padding-left: 30px; margin-bottom: 50px; margin-top: 15px;">	
 			<div style="margin-bottom: 5px; font-size: small;">
 				<fmt:message key="label.monitoring.summary.results.question" />
@@ -163,11 +201,6 @@
 			</select>
 			
 			<a onclick="" href="return false;" class="thickbox" id="questionSummaryHref" style="display: none;"></a>
-			<!--
-			<a onclick="createQuestionSummaryHref();return false;" href="" class="button space-left thickbox" id="questionSummaryHref">  
-				<fmt:message key="label.monitoring.summary.see.results" />
-			</a>
-			-->
 		</div>
 		
 		<c:forEach var="summary" items="${summaryList}" varStatus="status">
@@ -177,6 +210,9 @@
 				</div>
 				
 				<table id="list${summary.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
+				<div style="margin-top: 10px;">
+					<table id="userSummary${summary.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
+				</div>
 			</div>	
 		</c:forEach>	
 	
Index: lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	25 Mar 2009 22:46:28 -0000	1.1
@@ -0,0 +1,19 @@
+<%@ include file="/common/taglibs.jsp"%>
+<script type="text/javascript" event="">
+	function masterDetailLoadUp(){   
+ 	        <c:forEach var="questionResult" items="${assessmentResult.questionResults}" varStatus="i">
+	       		<c:set var="question" value="${questionResult.assessmentQuestion}"/>
+ 	        	var responseStr = "";
+ 	       		<%@ include file="userresponse.jsp"%>
+ 	     		jQuery("#userSummary${assessmentResult.sessionId}").addRowData(${i.index + 1}, {
+ 	   	     		id:"${i.index + 1}",
+ 	   	   			questionResultUid:"${questionResult.uid}",
+ 	   	   			title:"${questionResult.assessmentQuestion.title}",
+ 	   	   			response:responseStr,
+ 	   	   			grade:"<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>"
+ 	   	   	    });
+	        </c:forEach>
+	};	  	   	  
+	masterDetailLoadUp();
+</script>
+   	  
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	20 Mar 2009 16:39:38 -0000	1.2
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	25 Mar 2009 22:46:28 -0000	1.3
@@ -53,10 +53,10 @@
 	  				  	},
 	  				  	afterSaveCell : function (rowid,name,val,iRow,iCol){
 	  				  		var questionResultUid = jQuery("#session${session.sessionId}").getCell(rowid, 'questionResultUid');
-	  				  		alert(isNaN(val));
+	  				  		//alert(isNaN(val));
 	  				  		if (isNaN(val) || (questionResultUid=="")) {
 	  				  			jQuery("#session${session.sessionId}").restoreCell(iRow,iCol); 
-	  				  			alert(jQuery("#session${session.sessionId}").getCell(iRow,iCol));
+	  				  			//alert(jQuery("#session${session.sessionId}").getCell(iRow,iCol));
 	  				  		} else {
 	  				  			var averageMark = (eval($("#averageMark").html())*numberOfValues - eval(previousCellValue) + eval(val))/numberOfValues;
 	  				  			$("#averageMark").html(averageMark);
@@ -99,7 +99,7 @@
 
 	  	   	     		jQuery("#session${session.sessionId}").addRowData(${i.index + 1}, {
 	  	   	     			questionResultUid:"${questionResult.uid}",
-	  	   	     			userName:"${questionResult.user.firstName} ${questionResult.user.lastName}",
+	  	   	     			userName:"${questionResult.user.lastName}, ${questionResult.user.firstName}",
 	  	   	   	   			response:responseStr,
 	  	   	   	   			grade:grade
 	  	   	   	   	    });
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	20 Mar 2009 16:39:38 -0000	1.4
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	25 Mar 2009 22:46:28 -0000	1.5
@@ -36,7 +36,7 @@
 	  						    '<fmt:message key="label.monitoring.user.summary.grade" />'],
 	  						    
 	  				   	colModel:[
-	  				   		{name:'id', index:'id', width:50, sorttype:"int"},
+	  				   		{name:'id', index:'id', width:55, sorttype:"int"},
 	  				   		{name:'questionResultUid', index:'questionResultUid', width:0},
 	  				   		{name:'time', index:'time', width:150, sorttype:'date', datefmt:'Y-m-d'},
 	  				   		{name:'response', index:'response', width:200, sortable:false},
@@ -112,7 +112,7 @@
 						<fmt:message key="label.monitoring.user.summary.user.name" />
 					</th>
 					<td >
-						${userSummary.user.firstName} ${userSummary.user.lastName}
+						${userSummary.user.lastName}, ${userSummary.user.firstName}
 					</td>
 				</tr>