+ +
-
+
-
-
Index: lams_learning/conf/language/ApplicationResources.properties =================================================================== diff -u -rdff0b0618eea86d86bdf3d5d3f56d85c8569f6fe -r810a3898f726d0eae005128cde246c8e0d3c0ed3 --- lams_learning/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision dff0b0618eea86d86bdf3d5d3f56d85c8569f6fe) +++ lams_learning/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 810a3898f726d0eae005128cde246c8e0d3c0ed3) @@ -66,3 +66,7 @@ error.export.portfolio.not.supported=The activity {0} does not support portfolio export. # Export portfolio: Message displayed in portfolio if there aren't any activities on which to report. export.portfolio.noneAttempted.message=No activities have been attempted. +export.portfolio.for.user.heading=Portfolio For +export.portfolio.for.class.heading=Class Portfolio +export.portfolio.lesson.started.date.label=Lesson started: +export.portfolio.generated.date.label=Portfolio generated: Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/Portfolio.java =================================================================== diff -u -r6f11dd80335ff2b8a2d06d21f1a49b307ed233c1 -r810a3898f726d0eae005128cde246c8e0d3c0ed3 --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/Portfolio.java (.../Portfolio.java) (revision 6f11dd80335ff2b8a2d06d21f1a49b307ed233c1) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/Portfolio.java (.../Portfolio.java) (revision 810a3898f726d0eae005128cde246c8e0d3c0ed3) @@ -24,7 +24,10 @@ /* $$Id$$ */ package org.lamsfoundation.lams.learning.export; +import java.util.Date; + + /** * @author mtruong */ @@ -35,12 +38,16 @@ private String lessonName; private String lessonDescription; private ActivityPortfolio[] activityPortfolios; + private String learnerName; + private Date lessonStartDate; + private Date portfolioCreatedDate; public Portfolio(String exportID) { this.exportTmpDir = null; this.activityPortfolios = null; this.exportID = exportID; + this.portfolioCreatedDate = new Date(); } /** @@ -92,4 +99,28 @@ public void setExportID(String exportID) { this.exportID = exportID; } + + public String getLearnerName() { + return learnerName; + } + + public void setLearnerName(String learnerName) { + this.learnerName = learnerName; + } + + public Date getLessonStartDate() { + return lessonStartDate; + } + + public void setLessonStartDate(Date lessonStartDate) { + this.lessonStartDate = lessonStartDate; + } + + public Date getPortfolioCreatedDate() { + return portfolioCreatedDate; + } + + public void setPortfolioCreatedDate(Date portfolioCreatedDate) { + this.portfolioCreatedDate = portfolioCreatedDate; + } } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java =================================================================== diff -u -r250486f86b66ac04cece0001879c3dc39c96ed98 -r810a3898f726d0eae005128cde246c8e0d3c0ed3 --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java (.../ExportPortfolioService.java) (revision 250486f86b66ac04cece0001879c3dc39c96ed98) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java (.../ExportPortfolioService.java) (revision 810a3898f726d0eae005128cde246c8e0d3c0ed3) @@ -191,7 +191,7 @@ if ( portfolios.size() >= 0 ) { exports = doExport(portfolios, cookies,lesson); - + exports.setLearnerName(learner.getFirstName()+" "+learner.getLastName()+" ("+learner.getLogin()+")"); } else { log.error("The learner has not completed or attempted any activities"); } @@ -270,6 +270,7 @@ portfolio.setExportTmpDir(tempDirectoryName); portfolio.setLessonName(lesson.getLessonName()); portfolio.setLessonDescription(lesson.getLessonDescription()); + portfolio.setLessonStartDate(lesson.getStartDateTime()); processPortfolios(portfolios, cookies, tempDirectoryName); portfolio.setActivityPortfolios((ActivityPortfolio[])portfolios.toArray(new ActivityPortfolio[portfolios.size()])); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java =================================================================== diff -u -r42d714810532ea8752ea62583ba513a1e1aeef0c -r810a3898f726d0eae005128cde246c8e0d3c0ed3 --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java (.../MainExportServlet.java) (revision 42d714810532ea8752ea62583ba513a1e1aeef0c) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java (.../MainExportServlet.java) (revision 810a3898f726d0eae005128cde246c8e0d3c0ed3) @@ -153,6 +153,8 @@ private void bundleStylesheetWithExportPackage(String directory, HttpServletRequest request, Cookie[] cookies) throws IOException { + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort(); + List themeList = CSSThemeUtil.getAllUserThemes(); Iterator i = themeList.iterator(); @@ -161,10 +163,14 @@ { String theme = (String)i.next(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort(); String url = basePath + "/lams/css/" + theme + ".css"; HttpUrlConnectionUtil.writeResponseToFile(url, directory, theme + ".css", cookies); //cookies aren't really needed here. } + + // include the special IE stylesheet + String url = basePath + "/lams/css/ie-styles.css"; + HttpUrlConnectionUtil.writeResponseToFile(url, directory, "ie-styles.css", cookies); //cookies aren't really needed here. + } } Index: lams_learning/web/exportPortfolio/main.jsp =================================================================== diff -u -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 -r810a3898f726d0eae005128cde246c8e0d3c0ed3 --- lams_learning/web/exportPortfolio/main.jsp (.../main.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) +++ lams_learning/web/exportPortfolio/main.jsp (.../main.jsp) (revision 810a3898f726d0eae005128cde246c8e0d3c0ed3) @@ -34,7 +34,16 @@
+ +