Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java,v diff -u -r1.4 -r1.5 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java 20 Apr 2006 05:31:42 -0000 1.4 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java 3 May 2006 04:01:16 -0000 1.5 @@ -32,7 +32,7 @@ public class ResourceSessionDAOHibernate extends BaseDAOHibernate implements ResourceSessionDAO{ private static final String FIND_BY_SESSION_ID = "from " + ResourceSession.class.getName() + " as p where p.sessionId=?"; - private static final String FIND_BY_CONTENT_ID = "from " + ResourceSession.class.getName() + " as p where p.resource_uid=?"; + private static final String FIND_BY_CONTENT_ID = "from " + ResourceSession.class.getName() + " as p where p.resource.uid=?"; public ResourceSession getSessionBySessionId(Long sessionId) { List list = getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java,v diff -u -r1.1 -r1.2 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java 3 May 2006 02:15:03 -0000 1.1 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java 3 May 2006 04:01:17 -0000 1.2 @@ -25,6 +25,7 @@ package org.lamsfoundation.lams.tool.rsrc.web.servlet; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.Cookie; @@ -103,7 +104,9 @@ throw new ResourceApplicationException(error); } List group = service.exportBySessionId(toolSessionID); - request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_LIST, group); + List groupList = new ArrayList(); + groupList.add(group); + request.getSession().setAttribute(ResourceConstants.ATTR_SUMMARY_LIST, groupList); } public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) @@ -127,7 +130,7 @@ List groupList = service.exportByContentId(toolContentID); // put it into HTTPSession - request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_LIST, groupList); + request.getSession().setAttribute(ResourceConstants.ATTR_SUMMARY_LIST, groupList); } } Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/export/exportportfolio.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_larsrc/web/pages/export/exportportfolio.jsp 3 May 2006 02:15:02 -0000 1.1 +++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp 3 May 2006 04:01:16 -0000 1.2 @@ -3,7 +3,6 @@ <fmt:message key="export.title" /> - @@ -30,18 +29,12 @@ - - - - - + + - - ${item.sessionName} - - - + + ${item.sessionName} @@ -85,14 +78,12 @@ ${item.itemTitle} - ${item.username} - - + Index: lams_tool_larsrc/web/pages/monitoring/statistic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/statistic.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_larsrc/web/pages/monitoring/statistic.jsp 2 May 2006 04:07:37 -0000 1.3 +++ lams_tool_larsrc/web/pages/monitoring/statistic.jsp 3 May 2006 04:01:16 -0000 1.4 @@ -8,8 +8,8 @@ - - ${item.sessionName} + + ${item.sessionName} Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/summary.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_larsrc/web/pages/monitoring/summary.jsp 3 May 2006 02:15:02 -0000 1.4 +++ lams_tool_larsrc/web/pages/monitoring/summary.jsp 3 May 2006 04:01:16 -0000 1.5 @@ -8,11 +8,13 @@ - - ${item.sessionName} - - - + + ${item.sessionName} + + + + +