Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java =================================================================== diff -u -r893a9fc55bf32709c48cc4c1e235d1191beaf085 -raee0cad2ca403ec58fcfcfd4070747bac2a0cd9d --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java (.../ScribeDTO.java) (revision 893a9fc55bf32709c48cc4c1e235d1191beaf085) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java (.../ScribeDTO.java) (revision aee0cad2ca403ec58fcfcfd4070747bac2a0cd9d) @@ -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 =================================================================== diff -u -r84283f3449a27ed45130e07c53d2cefc451ba537 -raee0cad2ca403ec58fcfcfd4070747bac2a0cd9d --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 84283f3449a27ed45130e07c53d2cefc451ba537) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision aee0cad2ca403ec58fcfcfd4070747bac2a0cd9d) @@ -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 =================================================================== diff -u -ra344998a96d6e983d83047656f74c9f15183643e -raee0cad2ca403ec58fcfcfd4070747bac2a0cd9d --- lams_tool_scribe/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision a344998a96d6e983d83047656f74c9f15183643e) +++ lams_tool_scribe/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision aee0cad2ca403ec58fcfcfd4070747bac2a0cd9d) @@ -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} +

+ + + +
- +
+ - - + +