Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r4408585338b297854bb7e8a81b3927b4e181bf54 -re914c457094df1826693bd4fcf1cb89bf49d98bc Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java =================================================================== diff -u -rebd021b90e8100f21a316744a9187cb2812a9fd0 -re914c457094df1826693bd4fcf1cb89bf49d98bc --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision ebd021b90e8100f21a316744a9187cb2812a9fd0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision e914c457094df1826693bd4fcf1cb89bf49d98bc) @@ -41,6 +41,7 @@ */ public class AuthoringActivityDTO extends BaseDTO{ + /***************************************************************************** * Attributes *****************************************************************************/ @@ -125,6 +126,12 @@ /** The tool_content_id of the tool */ private Long toolContentID; + /** The tool's display name */ + private String toolDisplayName; + + /** The url of the tool's authoring screen. */ + private String authoringURL; + /** The category of activity */ private Integer activityCategoryID; @@ -305,7 +312,9 @@ } private void addToolActivityAttributes(ToolActivity toolActivity){ this.toolContentID = toolActivity.getToolContentId(); - this.toolID = toolActivity.getTool().getToolId(); + this.toolID = toolActivity.getTool().getToolId(); + this.authoringURL = toolActivity.getTool().getAuthorUrl(); + this.toolDisplayName = toolActivity.getTool().getToolDisplayName(); } private void addGateActivityAttributes(Object activity){ if(activity instanceof SynchGateActivity) @@ -824,4 +833,19 @@ public void setGroupingDTO(GroupingDTO groupingDTO) { this.groupingDTO = groupingDTO; } */ + + /** Get the authoring url related to this tool */ + public String getAuthoringURL() { + return authoringURL; + } + public void setAuthoringURL(String toolAuthoringURL) { + this.authoringURL = toolAuthoringURL; + } + /** Get the tool's display name */ + public String getToolDisplayName() { + return toolDisplayName; + } + public void setToolDisplayName(String toolDisplayName) { + this.toolDisplayName = toolDisplayName; + } }