Index: lams_tool_larsrc/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r594dfea9886f7b6d6fee256bf2a0070679833d95 -r2f3123819df4f065b86f1efc486f04622bd71281 --- lams_tool_larsrc/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 594dfea9886f7b6d6fee256bf2a0070679833d95) +++ lams_tool_larsrc/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 2f3123819df4f065b86f1efc486f04622bd71281) @@ -91,6 +91,7 @@ monitoring.summary.note =Note: number of learners is the number of learners who have viewed the resource. monitoring.label.type =Type monitoring.label.title =Title +monitoring.label.instructions =Instructions monitoring.label.suggest =Suggested By monitoring.label.number.learners =Number of Learners monitoring.label.hide =Hide Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java =================================================================== diff -u -r8866fad0319e8d4f337bc9d276f0c03ba976a2aa -r2f3123819df4f065b86f1efc486f04622bd71281 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java (.../Summary.java) (revision 8866fad0319e8d4f337bc9d276f0c03ba976a2aa) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java (.../Summary.java) (revision 2f3123819df4f065b86f1efc486f04622bd71281) @@ -24,7 +24,12 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.rsrc.dto; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem; +import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction; import org.lamsfoundation.lams.tool.rsrc.util.ResourceWebUtils; /** @@ -52,6 +57,7 @@ private boolean itemCreateByAuthor; private boolean itemHide; private String itemTitle; + private List itemInstructions = new ArrayList(); private String username; private int viewNumber; @@ -113,6 +119,10 @@ this.fileName = item.getFileName(); this.fileUuid = item.getFileUuid(); this.fileVersionId = item.getFileVersionId(); + + for (ResourceItemInstruction instruction : (Set)item.getItemInstructions()) { + itemInstructions.add(instruction.getDescription()); + } }else this.itemUid = new Long(-1); this.isInitGroup = isInitGroup; @@ -209,5 +219,11 @@ public void setFileName(String fileName) { this.fileName = fileName; } + public List getItemInstructions() { + return itemInstructions; + } + public void setItemInstructions(List itemInstructions) { + this.itemInstructions = itemInstructions; + } } Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp =================================================================== diff -u -r4fa914b7cc5b4c7416f7ed1387406702f9679e7a -r2f3123819df4f065b86f1efc486f04622bd71281 --- lams_tool_larsrc/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 4fa914b7cc5b4c7416f7ed1387406702f9679e7a) +++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 2f3123819df4f065b86f1efc486f04622bd71281) @@ -62,21 +62,24 @@ - - - + - - @@ -96,7 +99,7 @@ - + +
+ + + + + + +
+
@@ -128,6 +131,23 @@
${item.itemTitle} + + +
    + +
  1. + ${itemInstruction} +
  2. +
    +
+
+ +   + +
+
${item.username}