Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java,v diff -u -r1.18.2.3.2.3 -r1.18.2.3.2.4 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java 11 Mar 2010 19:30:00 -0000 1.18.2.3.2.3 +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java 11 Mar 2010 19:55:01 -0000 1.18.2.3.2.4 @@ -371,13 +371,14 @@ } // create DTO for the whole design Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID, true); + PedagogicalPlannerSequenceNode node = (nodeUid == null) ? null : getPedagogicalPlannerDAO().getByUid(nodeUid); PedagogicalPlannerTemplateDTO planner = new PedagogicalPlannerTemplateDTO(); planner.setActivitySupportingPlannerCount(activitySupportingPlannerCount); planner.setSequenceTitle(learningDesign.getTitle()); planner.setActivities(activities); planner.setLearningDesignID(learningDesign.getLearningDesignId()); - planner.setNodeUid(nodeUid); + planner.setNode(node); // Some additional options for submitting activity forms; should be moved to configuration file in the future planner.setSendInPortions(false); Index: lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java,v diff -u -r1.2.8.1 -r1.2.8.2 --- lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java 25 Feb 2010 19:13:23 -0000 1.2.8.1 +++ lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java 11 Mar 2010 19:54:58 -0000 1.2.8.2 @@ -25,6 +25,8 @@ import java.util.List; +import org.lamsfoundation.lams.planner.PedagogicalPlannerSequenceNode; + public class PedagogicalPlannerTemplateDTO { private String sequenceTitle; private Boolean sendInPortions; @@ -33,16 +35,8 @@ private List activities; private Long learningDesignID; private Integer activitySupportingPlannerCount = 0; - private Long nodeUid; + private PedagogicalPlannerSequenceNode node; - public Long getNodeUid() { - return nodeUid; - } - - public void setNodeUid(Long nodeUid) { - this.nodeUid = nodeUid; - } - public String getSequenceTitle() { return sequenceTitle; } @@ -98,4 +92,12 @@ public void setActivitySupportingPlannerCount(Integer activitySupportingPlannerCount) { this.activitySupportingPlannerCount = activitySupportingPlannerCount; } + + public PedagogicalPlannerSequenceNode getNode() { + return node; + } + + public void setNode(PedagogicalPlannerSequenceNode node) { + this.node = node; + } } \ No newline at end of file