Index: lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r56d116683b7554e8ad3677cd0e12866ac3feb834 -r969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d
--- lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
+++ lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d)
@@ -93,6 +93,8 @@
 label.reviewitem.spreadsheet.sent.by  =Spreadsheet sent by
 label.reviewitem.user.hasnot.sent.spreadsheet  =User hasn't sent spreadsheet yet.
 label.reviewitem.title  =Review User's Spreadsheet
+label.export.marking.enabled  =Spreadsheet marking is enabled
+label.export.notebook.reflection.enabled  =Notebook Reflection is enabled
 label.description  =Description:
 authoring.exception  =There is a problem in shared resources authoring page, the reason is {0}
 error.summary.marks.blank  =Marks can not be blank.
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dto/ReflectDTO.java
===================================================================
diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -r969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dto/ReflectDTO.java	(.../ReflectDTO.java)	(revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dto/ReflectDTO.java	(.../ReflectDTO.java)	(revision 969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d)
@@ -12,7 +12,7 @@
 	private String fullName;
 	private String loginName;
 	private boolean hasRefection;
-	private String reflectInstrctions;
+	private String reflectInstructions;
 	private boolean finishReflection;
 	private String reflect;
 	
@@ -52,11 +52,11 @@
 	public void setReflect(String reflect) {
 		this.reflect = reflect;
 	}
-	public String getReflectInstrctions() {
-		return reflectInstrctions;
+	public String getReflectInstructions() {
+		return reflectInstructions;
 	}
-	public void setReflectInstrctions(String reflectInstrctions) {
-		this.reflectInstrctions = reflectInstrctions;
+	public void setReflectInstructions(String reflectInstructions) {
+		this.reflectInstructions = reflectInstructions;
 	}
 	public Long getUserUid() {
 		return userUid;
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dto/Summary.java
===================================================================
diff -u -ra7fed1be51941ace379dbb695d52bd08a315dae6 -r969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dto/Summary.java	(.../Summary.java)	(revision a7fed1be51941ace379dbb695d52bd08a315dae6)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dto/Summary.java	(.../Summary.java)	(revision 969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d)
@@ -54,8 +54,13 @@
 	private String sessionName;
 	private Spreadsheet spreadsheet;
     private List<SpreadsheetUser> users; 	
+    
+	//used for export purposes
+	private List<ReflectDTO> reflectDTOList;
 	
-	public Summary(){}
+	public Summary(){
+		this.reflectDTOList = new ArrayList<ReflectDTO>();
+	}
 	/**
 	 * Contruction method for monitoring summary function. 
 	 * 
@@ -73,37 +78,9 @@
 		} else {
 			this.users = new ArrayList<SpreadsheetUser>();
 		}
+		
+		this.reflectDTOList = new ArrayList<ReflectDTO>();
 	}
-//	/**
-//	 * Contruction method for export profolio function. 
-//	 * 
-//	 * <B>Don't not set sessionId and viewNumber fields</B>
-//	 * @param sessionName
-//	 * @param item
-//	 * @param isInitGroup
-//	 */
-//	public Summary(Long sessionId, String sessionName, SpreadsheetItem item,boolean isInitGroup){
-//		this.sessionId = sessionId;
-//		this.sessionName = sessionName;
-//		if(item != null){
-//			this.itemUid = item.getUid();
-//			this.itemType = item.getType();
-//			this.itemCreateByAuthor = item.isCreateByAuthor();
-//			this.itemHide = item.isHide();
-//			this.itemTitle = item.getTitle();
-//			this.username = item.getCreateBy() == null?"":item.getCreateBy().getLoginName();
-//			this.url = SpreadsheetWebUtils.protocol(item.getUrl());
-//			this.fileName = item.getFileName();
-//			this.fileUuid = item.getFileUuid();
-//			this.fileVersionId = item.getFileVersionId();
-//
-//			for (SpreadsheetItemInstruction instruction : (Set<SpreadsheetItemInstruction>)item.getItemInstructions()) {
-//				itemInstructions.add(instruction.getDescription());
-//			}
-//		}else
-//			this.itemUid = new Long(-1);
-//		this.isInitGroup = isInitGroup;
-//	}
 
 	public Long getSessionId() {
 		return sessionId;
@@ -129,4 +106,21 @@
 	public void setUsers(List<SpreadsheetUser> users) {
 		this.users = users;
 	}
+	
+	/**
+	 * Returns ReflectDTO.
+	 * 
+	 * @return ReflectDTO
+	 */
+	public List<ReflectDTO> getReflectDTOList() {
+		return reflectDTOList;
+	}
+	/**
+	 * Sets ReflectDTO.
+	 * 
+	 * @param reflectDTO ReflectDTO
+	 */
+	public void setReflectDTOList(List<ReflectDTO> reflectDTOList) {
+		this.reflectDTOList = reflectDTOList;
+	}
 }
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java
===================================================================
diff -u -ra7fed1be51941ace379dbb695d52bd08a315dae6 -r969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java	(.../ISpreadsheetService.java)	(revision a7fed1be51941ace379dbb695d52bd08a315dae6)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java	(.../ISpreadsheetService.java)	(revision 969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d)
@@ -185,8 +185,8 @@
 	 * 				  Otherwise, get all spreadsheet item  
 	 * @return
 	 */
-	public List<Summary> exportBySessionId(Long sessionId, boolean skipHide);
-	public List<List<Summary>> exportByContentId(Long contentId);
+	public List<Summary> exportForLearner(Long sessionId, SpreadsheetUser learner);
+	public List<Summary> exportForTeacher(Long contentId);
 
 	/**
 	 * Create refection entry into notebook tool.
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
===================================================================
diff -u -ra7fed1be51941ace379dbb695d52bd08a315dae6 -r969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	(.../SpreadsheetServiceImpl.java)	(revision a7fed1be51941ace379dbb695d52bd08a315dae6)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	(.../SpreadsheetServiceImpl.java)	(revision 969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d)
@@ -285,14 +285,51 @@
 		
 	}
 
-	public List<Summary> exportBySessionId(Long sessionId, boolean skipHide) {
+	public List<Summary> exportForLearner(Long sessionId, SpreadsheetUser learner) {
 		SpreadsheetSession session = spreadsheetSessionDao.getSessionBySessionId(sessionId);
 		if(session == null){
 			log.error("Failed get SpreadsheetSession by ID [" +sessionId + "]");
 			return null;
 		}
+		
+		Spreadsheet spreadsheet = session.getSpreadsheet();
+		List<Summary> summaryList = new ArrayList<Summary>();
+		
+		List<SpreadsheetUser> userList = new ArrayList<SpreadsheetUser>();
+		userList.add(learner);
+		Summary summary = new Summary(session, spreadsheet, userList);
+			
+		//Fill up reflect dto
+		NotebookEntry notebookEntry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, 
+				SpreadsheetConstants.TOOL_SIGNATURE, learner.getUserId().intValue());
+		ReflectDTO reflectDTO = new ReflectDTO(learner);
+		if(notebookEntry == null){
+			reflectDTO.setFinishReflection(false);
+			reflectDTO.setReflect(null);
+		}else{
+			reflectDTO.setFinishReflection(true);
+			reflectDTO.setReflect(notebookEntry.getEntry());
+		}
+		reflectDTO.setReflectInstructions(session.getSpreadsheet().getReflectInstructions());
+		summary.getReflectDTOList().add(reflectDTO);
+		summaryList.add(summary);
+		
+		return summaryList;
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
 		//initial spreadsheet items list
-		List<Summary> itemList = new ArrayList();
+//		List<Summary> itemList = new ArrayList();
 //		Set<SpreadsheetItem> resList = session.getSpreadsheet().getSpreadsheetItems();
 //		for(SpreadsheetItem item:resList){
 //			if(skipHide && item.isHide())
@@ -317,45 +354,42 @@
 //			}
 //		}
 		
-		return itemList;
+//		return itemList;
 	}
 	
-	public List<List<Summary>> exportByContentId(Long contentId) {
+	public List<Summary> exportForTeacher(Long contentId) {
 		Spreadsheet spreadsheet = spreadsheetDao.getByContentId(contentId);
-		List<List<Summary>> groupList = new ArrayList();
+		List<Summary> summaryList = new ArrayList<Summary>();
 		
-//		//create init spreadsheet items list
-//		List<Summary> initList = new ArrayList();
-//		groupList.add(initList);
-//		Set<SpreadsheetItem> resList = spreadsheet.getSpreadsheetItems();
-//		for(SpreadsheetItem item:resList){
-//			if(item.isCreateByAuthor()){
-//				Summary sum = new Summary(null, null,item,true);
-//				initList.add(sum);
-//			}
-//		}
-//		
-//		//session by session
-//		List<SpreadsheetSession> sessionList = spreadsheetSessionDao.getByContentId(contentId);
-//		for(SpreadsheetSession session:sessionList){
-//			List<Summary> group = new ArrayList<Summary>();
-//			//get this session's all spreadsheet items
-//			Set<SpreadsheetItem> sessList =session.getSpreadsheetItems();
-//			for(SpreadsheetItem item:sessList){
-//				//to skip all item create by author
-//				if(!item.isCreateByAuthor()){
-//					Summary sum = new Summary(session.getSessionId(), session.getSessionName(),item,false);
-//					group.add(sum);
-//				}
-//			}
-//			if(group.size() == 0){
-//				group.add(new Summary(session.getSessionId(), session.getSessionName(),null,false));
-//			}
-//			groupList.add(group);
-//		}
+		List<SpreadsheetSession> sessionList = spreadsheetSessionDao.getByContentId(contentId);		
+		//create the user list of all whom were started this task
+		for(SpreadsheetSession session:sessionList) {
+			List<SpreadsheetUser> userList = spreadsheetUserDao.getBySessionID(session.getSessionId());
+			Summary summary = new Summary(session, spreadsheet, userList);
+			
+			//Fill up reflect dto
+			for(SpreadsheetUser user : userList) {
+				NotebookEntry notebookEntry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, 
+						SpreadsheetConstants.TOOL_SIGNATURE, user.getUserId().intValue());
+				
+				ReflectDTO reflectDTO = new ReflectDTO(user);
+				if(notebookEntry == null){
+					reflectDTO.setFinishReflection(false);
+					reflectDTO.setReflect(null);
+				}else{
+					reflectDTO.setFinishReflection(true);
+					reflectDTO.setReflect(notebookEntry.getEntry());
+				}
+				reflectDTO.setReflectInstructions(session.getSpreadsheet().getReflectInstructions());
+				
+				summary.getReflectDTOList().add(reflectDTO);
+			}
+			summaryList.add(summary);
+		}
 		
-		return groupList;
+		return summaryList;
 	}
+	
 	public Spreadsheet getSpreadsheetBySessionId(Long sessionId){
 		SpreadsheetSession session = spreadsheetSessionDao.getSessionBySessionId(sessionId);
 		//to skip CGLib problem
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java
===================================================================
diff -u -ra7fed1be51941ace379dbb695d52bd08a315dae6 -r969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision a7fed1be51941ace379dbb695d52bd08a315dae6)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d)
@@ -418,7 +418,7 @@
 			refDTO.setFinishReflection(true);
 			refDTO.setReflect(notebookEntry.getEntry());
 		}
-		refDTO.setReflectInstrctions(session.getSpreadsheet().getReflectInstructions());
+		refDTO.setReflectInstructions(session.getSpreadsheet().getReflectInstructions());
 		
 		request.setAttribute("userDTO", refDTO);
 		return mapping.findForward("success");
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/servlet/ExportServlet.java
===================================================================
diff -u -ra7fed1be51941ace379dbb695d52bd08a315dae6 -r969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision a7fed1be51941ace379dbb695d52bd08a315dae6)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision 969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d)
@@ -62,19 +62,17 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- * Export portfolio servlet to export all shared spreadsheet into offline HTML
+ * Export portfolio servlet to export all spreadsheets into offline HTML
  * package.
  * 
- * @author Steve.Ni
- * 
- * @version $Revision$
+ * @author Andrey Balan
  */
 public class ExportServlet extends AbstractExportPortfolioServlet {
 	private static final long serialVersionUID = -4529093489007108143L;
 
 	private static Logger logger = Logger.getLogger(ExportServlet.class);
 
-	private final String FILENAME = "shared_spreadsheet_main.html";
+	private final String FILENAME = "spreadsheet_main.html";
 
 	private SpreadsheetToolContentHandler handler;
 	
@@ -88,26 +86,24 @@
 	
 	public String doExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) {
 
-//		initial sessionMap
+		//initial sessionMap
 		SessionMap sessionMap = new SessionMap();
 		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 		
 		try {
 			if (StringUtils.equals(mode, ToolAccessMode.LEARNER.toString())) {
-				sessionMap.put(AttributeNames.ATTR_MODE,ToolAccessMode.LEARNER);
-				learner(request, response, directoryName, cookies,sessionMap);
+				sessionMap.put(AttributeNames.ATTR_MODE, ToolAccessMode.LEARNER);
+				learner(request, response, directoryName, cookies, sessionMap);
 			} else if (StringUtils.equals(mode, ToolAccessMode.TEACHER.toString())) {
-				sessionMap.put(AttributeNames.ATTR_MODE,ToolAccessMode.TEACHER);
-				teacher(request, response, directoryName, cookies,sessionMap);
+				sessionMap.put(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER);
+				teacher(request, response, directoryName, cookies, sessionMap);
 			}
 		} catch (SpreadsheetApplicationException e) {
 			logger.error("Cannot perform export for spreadsheet tool.");
 		}
 
-		String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()
-				+ request.getContextPath();
-		writeResponseToFile(basePath + "/pages/export/exportportfolio.jsp?sessionMapID="+sessionMap.getSessionID()
-				, directoryName, FILENAME, cookies);
+		String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()	+ request.getContextPath();
+		writeResponseToFile(basePath + "/pages/export/exportportfolio.jsp?sessionMapID=" + sessionMap.getSessionID(), directoryName, FILENAME, cookies);
 
 		return FILENAME;
 	}
@@ -132,11 +128,8 @@
         return super.doOfflineExport(request, response, directoryName, cookies);
 	}
 
+	public void learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies, HashMap sessionMap) throws SpreadsheetApplicationException {
 
-
-	public void learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies, HashMap sessionMap)
-			throws SpreadsheetApplicationException {
-
 		if (userID == null || toolSessionID == null) {
 			String error = "Tool session Id or user Id is null. Unable to continue";
 			logger.error(error);
@@ -159,37 +152,33 @@
 			throw new SpreadsheetApplicationException(error);
 		}
 		
+		List<Summary> summaryList = service.exportForLearner(toolSessionID, learner);
+//		saveFileToLocal(summaryList, directoryName);
 		
-		List<Summary> group = service.exportBySessionId(toolSessionID,true);
-		saveFileToLocal(group, directoryName);
-		
-		List<List> groupList = new ArrayList<List>();
-		if(group.size() > 0)
-			groupList.add(group);
-		
 		// Add flag to indicate whether to render user notebook entries
 		sessionMap.put(SpreadsheetConstants.ATTR_REFLECTION_ON, content.isReflectOnActivity());
 		
-		// Create reflectList if reflection is enabled.
-		if (content.isReflectOnActivity()) {
-			// Create reflectList, need to follow same structure used in teacher
-			// see service.getReflectList();
-			Map<Long, Set<ReflectDTO>> map = new HashMap<Long, Set<ReflectDTO>>();  
-			Set<ReflectDTO> reflectDTOSet = new TreeSet<ReflectDTO>(new ReflectDTOComparator());
-			reflectDTOSet.add(getReflectionEntry(learner));
-			map.put(toolSessionID, reflectDTOSet);
-			
-			// Add reflectList to sessionMap
-			sessionMap.put(SpreadsheetConstants.ATTR_REFLECT_LIST, map);
-		}
+//		// Create reflectList if reflection is enabled.
+//		if (content.isReflectOnActivity()) {
+//			// Create reflectList, need to follow same structure used in teacher
+//			// see service.getReflectList();
+//			Map<Long, Set<ReflectDTO>> map = new HashMap<Long, Set<ReflectDTO>>();  
+//			Set<ReflectDTO> reflectDTOSet = new TreeSet<ReflectDTO>(new ReflectDTOComparator());
+//			reflectDTOSet.add(getReflectionEntry(learner));
+//			map.put(toolSessionID, reflectDTOSet);
+//			
+//			// Add reflectList to sessionMap
+//			sessionMap.put(SpreadsheetConstants.ATTR_REFLECT_LIST, map);
+//		}
 		
+		
+		sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE, content);
 		sessionMap.put(SpreadsheetConstants.ATTR_TITLE, content.getTitle());
 		sessionMap.put(SpreadsheetConstants.ATTR_INSTRUCTIONS, content.getInstructions());
-		sessionMap.put(SpreadsheetConstants.ATTR_SUMMARY_LIST, groupList);
+		sessionMap.put(SpreadsheetConstants.ATTR_SUMMARY_LIST, summaryList);
 	}
 
-	public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies, HashMap sessionMap)
-			throws SpreadsheetApplicationException {
+	public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies, HashMap sessionMap) throws SpreadsheetApplicationException {
 
 		// check if toolContentId exists in db or not
 		if (toolContentID == null) {
@@ -205,27 +194,28 @@
 			logger.error(error);
 			throw new SpreadsheetApplicationException(error);
 		}
-		List<List<Summary>> groupList = service.exportByContentId(toolContentID);
-		if(groupList != null) {
-			for (List<Summary> list : groupList) {
-				saveFileToLocal(list, directoryName);
-			}
-		}
+		List<Summary> summaryList = service.exportForTeacher(toolContentID);
+//		if(summaryList != null) {
+//			for (List<Summary> list : summaryList) {
+//				saveFileToLocal(list, directoryName);
+//			}
+//		}
 		
 		// Add flag to indicate whether to render user notebook entries
 		sessionMap.put(SpreadsheetConstants.ATTR_REFLECTION_ON, content.isReflectOnActivity());
 		
-		// Create reflectList if reflection is enabled.
-		if (content.isReflectOnActivity()) {
-			Map<Long, Set<ReflectDTO>> reflectList = service.getReflectList(content.getContentId(), true);
-			// Add reflectList to sessionMap
-			sessionMap.put(SpreadsheetConstants.ATTR_REFLECT_LIST, reflectList);
-		}
+//		// Create reflectList if reflection is enabled.
+//		if (content.isReflectOnActivity()) {
+//			Map<Long, Set<ReflectDTO>> reflectList = service.getReflectList(content.getContentId(), true);
+//			// Add reflectList to sessionMap
+//			sessionMap.put(SpreadsheetConstants.ATTR_REFLECT_LIST, reflectList);
+//		}
 		
 		// put it into HTTPSession
+		sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE, content);
 		sessionMap.put(SpreadsheetConstants.ATTR_TITLE, content.getTitle());
 		sessionMap.put(SpreadsheetConstants.ATTR_INSTRUCTIONS, content.getInstructions());
-		sessionMap.put(SpreadsheetConstants.ATTR_SUMMARY_LIST, groupList);
+		sessionMap.put(SpreadsheetConstants.ATTR_SUMMARY_LIST, summaryList);
 	}
 
     private void saveFileToLocal(List<Summary> list, String directoryName) {
Index: lams_tool_spreadsheet/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -r969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d
--- lams_tool_spreadsheet/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8)
+++ lams_tool_spreadsheet/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d)
@@ -7,32 +7,21 @@
 <c:set var="mode" value="${sessionMap.mode}" />
 <c:set var="title" value="${sessionMap.title}" />
 <c:set var="instructions" value="${sessionMap.instructions}" />
+<c:set var="spreadsheet" value="${sessionMap.spreadsheet}" />
 
+
 <lams:html>
 <lams:head>
-	<title><fmt:message key="export.title" />
+	<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="../" />
 
-	<style type="text/css">
-		.spreadsheet-boldtext {
-			font-weight: bold;
-		}
-	</style>
-
 </lams:head>
 <body class="stripes">
 
@@ -45,176 +34,49 @@
 		<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="spreadsheet-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>
+		
+		<c:if test="${spreadsheet.lockWhenFinished || spreadsheet.learnerAllowedToSave || spreadsheet.markingEnabled || spreadsheet.reflectOnActivity}">
+			<br>
+			<ul>
+				<c:if test="${spreadsheet.lockWhenFinished}">
+					<li>
+						<fmt:message key="label.authoring.advance.lock.on.finished" />
+					</li>
+				</c:if>
+				
+				<c:if test="${spreadsheet.learnerAllowedToSave}">
+					<li>
+						<fmt:message key="label.authoring.advanced.learners.are.allowed.to.save" />
+					</li>
+				</c:if>
 							
-							<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 test="${spreadsheet.markingEnabled}">
+				    <ul>
+						<li>
+							<fmt:message key="label.export.marking.enabled" />
+						</li>
+					</ul>
 				</c:if>
-
-			</c:if>
-
+							
+				<c:if test="${spreadsheet.reflectOnActivity}">
+					<li>
+						<fmt:message key="label.export.notebook.reflection.enabled" />
+					</li>
+				</c:if>
+				
+			</ul>
+		</c:if>
+		<br>
+		<br>
+		
+		<c:forEach var="summary" items="${summaryList}">
+			<%@ include file="summarylist.jsp"%>
 		</c:forEach>
 
-	</div>
-	<!--closes content-->
+	</div>  <!--closes content-->
 
-	<div id="footer"></div>
-	<!--closes footer-->
-
+	<div id="footer">
+	</div><!--closes footer-->
+	
 </body>
 </lams:html>
Index: lams_tool_spreadsheet/web/pages/export/summarylist.jsp
===================================================================
diff -u
--- lams_tool_spreadsheet/web/pages/export/summarylist.jsp	(revision 0)
+++ lams_tool_spreadsheet/web/pages/export/summarylist.jsp	(revision 969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d)
@@ -0,0 +1,99 @@
+<table cellpadding="0" >
+
+	<tr>
+		<td class="field-name" colspan="2">
+				<h1><fmt:message key="monitoring.label.group" /> ${summary.sessionName}	</h1>
+		</td>
+	</tr>
+
+	<c:forEach var="user" items="${summary.users}">
+						
+		<tr>
+			<td class="field-name" style="width:250px">
+				<fmt:message key="label.monitoring.vieawallmarks.learner" />
+			</td>
+			<td>
+				<c:out value="${user.loginName}" />
+			</td>
+		</tr>	
+					
+		<c:if test="${spreadsheet.learnerAllowedToSave}">
+			<tr>
+				<td class="field-name" style="width:250px">
+					<fmt:message key="label.monitoring.vieawallmarks.spreadsheet.submitted" />
+				</td>
+				<td>
+					<c:choose>
+						<c:when test="${user.userModifiedSpreadsheet != null}">
+							<fmt:message key="label.monitoring.vieawallmarks.true" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.monitoring.vieawallmarks.false" />
+						</c:otherwise>
+					</c:choose>
+				</td>
+			</tr>					
+		</c:if>	
+			
+		<c:if test="${spreadsheet.markingEnabled}">					
+			<tr>
+				<td class="field-name" style="width:250px">
+					<fmt:message key="label.monitoring.vieawallmarks.marks" />
+				</td>
+				<td>
+					<c:choose>
+						<c:when test="${(user.userModifiedSpreadsheet != null) && (user.userModifiedSpreadsheet.mark != null)}">
+							<c:out value="${user.userModifiedSpreadsheet.mark.marks}" escapeXml="false" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.learning.not.available" />
+						</c:otherwise>
+					</c:choose>
+				</td>
+			</tr>
+						
+			<tr>
+				<td class="field-name" style="width:250px">
+					<fmt:message key="label.monitoring.vieawallmarks.comments" />
+				</td>
+				<td>
+					<c:choose>
+						<c:when test="${(user.userModifiedSpreadsheet != null) && (user.userModifiedSpreadsheet.mark != null)}">
+							<c:out value="${user.userModifiedSpreadsheet.mark.comments}" escapeXml="false" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.learning.not.available" />
+						</c:otherwise>
+					</c:choose>
+				</td>
+			</tr>
+		</c:if>		
+					
+		<tr>
+			<td colspan="2">
+				<hr size="1" style="width:250px;" align="left"/>
+			</td>
+		</tr>
+		<br><br>
+						
+	</c:forEach>
+</table>
+
+<%-- Display reflection entries --%>
+<c:if test="${sessionMap.reflectOn}">
+	<h3>
+		<fmt:message key="label.export.reflection" />
+	</h3>
+		
+	<c:forEach var="reflectDTO" items="${summary.reflectDTOList}">
+			<h4>
+				${reflectDTO.fullName}
+			</h4>
+			<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
+	</c:forEach>
+</c:if>
+<br>
+<br>
+<br>
+<br>
+
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp
===================================================================
diff -u -r56d116683b7554e8ad3677cd0e12866ac3feb834 -r969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d
--- lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp	(.../notebook.jsp)	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp	(.../notebook.jsp)	(revision 969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d)
@@ -17,7 +17,7 @@
 				<table class="alternative-color" cellspacing="0">
 					<tr>
 						<th class="first">
-							<lams:out value="${userDTO.reflectInstrctions}"/>
+							<lams:out value="${userDTO.reflectInstructions}"/>
 						</th>
 					</tr>
 					<tr>
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/viewallmarks.jsp
===================================================================
diff -u -r56d116683b7554e8ad3677cd0e12866ac3feb834 -r969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d
--- lams_tool_spreadsheet/web/pages/monitoring/parts/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision 56d116683b7554e8ad3677cd0e12866ac3feb834)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision 969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d)
@@ -25,7 +25,7 @@
 		</h1>
 
 			<table cellpadding="0">
-				<c:forEach var="user" items="${userList}" varStatus="status">
+				<c:forEach var="user" items="${userList}">
 						
 						
 					<tr>