Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java,v diff -u -r1.4 -r1.5 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java 1 Oct 2006 06:44:18 -0000 1.4 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java 2 Oct 2006 00:50:50 -0000 1.5 @@ -33,7 +33,6 @@ import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.tool.scribe.model.Scribe; import org.lamsfoundation.lams.tool.scribe.model.ScribeAttachment; -import org.lamsfoundation.lams.tool.scribe.model.ScribeHeading; public class ScribeDTO { Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java,v diff -u -r1.3 -r1.4 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java 30 Sep 2006 10:18:45 -0000 1.3 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java 2 Oct 2006 00:50:52 -0000 1.4 @@ -107,10 +107,10 @@ ScribeSession scribeSession = scribeService .getSessionBySessionId(toolSessionID); + // get the scribe user UserDTO user = (UserDTO) SessionManager.getSession().getAttribute( AttributeNames.USER); - - // get the scribe user + ScribeUser scribeUser = scribeService.getUserByUserIdAndSessionId(new Long( user.getUserID()), toolSessionID); @@ -142,7 +142,7 @@ request.getSession().setAttribute("scribeDTO", scribeDTO); } - public void doTeacherExport(HttpServletRequest request, + private void doTeacherExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) throws ScribeException { Index: lams_tool_scribe/web/pages/export/exportPortfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/export/exportPortfolio.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/web/pages/export/exportPortfolio.jsp 29 Sep 2006 02:44:38 -0000 1.2 +++ lams_tool_scribe/web/pages/export/exportPortfolio.jsp 2 Oct 2006 00:50:52 -0000 1.3 @@ -1,11 +1,12 @@ - + <%@ include file="/common/taglibs.jsp"%> - <c:out value="${scribeDTO.title}" escapeXml="false" /> + <c:out value="${scribeDTO.title}" escapeXml="false" /> + @@ -16,71 +17,82 @@ -
+

-
+
-

- -

- -
- -
- - - -
-

- ${session.sessionName} -

- - -
- ${message.from} -
- -
+

+ +

+ +
+ +
+ + +
+

+ ${session.sessionName} +

+ +
+ ?Appointed Scribe?
- -

- -

- - +

+ ${session.appointedScribe} +

-

- ${user.firstName} - ${user.lastName} -
- ${user.notebookEntry} -

- - - - +
+ ?Report? +
+
+ +

+ +

+

+ +

+
+ +
-
+ +

+ +

+ + +

+ ${user.firstName} + ${user.lastName} +
+ ${user.notebookEntry} +

+ + + +
- +
+ - - + +