Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml,v diff -u -r1.40 -r1.41 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml 16 Oct 2007 02:19:52 -0000 1.40 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml 18 Oct 2007 07:26:13 -0000 1.41 @@ -274,6 +274,11 @@ @hibernate.class + + + + + @hibernate.set lazy="true" inverse="true" cascade="all-delete-orphan" @hibernate.collection-key column="sequence_activity_id" Index: lams_common/db/sql/insert_types_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_types_data.sql,v diff -u -r1.70 -r1.71 --- lams_common/db/sql/insert_types_data.sql 10 Oct 2007 07:11:35 -0000 1.70 +++ lams_common/db/sql/insert_types_data.sql 18 Oct 2007 07:26:31 -0000 1.71 @@ -204,6 +204,15 @@ 'monitoring/branchingExportPortfolio?mode=teacher', 'monitoring/toolBranching.do?method=viewBranching', 'monitoring/toolBranching.do?method=viewBranching', now()); +INSERT INTO lams_system_tool (system_tool_id, learning_activity_type_id, tool_display_name, description, + learner_url, learner_preview_url, learner_progress_url, export_pfolio_learner_url, + export_pfolio_class_url, monitor_url, contribute_url, create_date_time) +VALUES (9, 8, 'Sequence', 'A sequence of activities', + 'learning/SequenceActivity.do', 'learning/SequenceActivity.do', + NULL, NULL, + 'monitoring/sequenceExportPortfolio?mode=teacher', 'monitoring/sequence.do?method=viewSequence', + 'monitoring/sequence.do?method=viewSequence', now()); + -- Supported Locales INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction) VALUES (1, 'en', 'AU', 'English (Australia)', 'LTR'); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java,v diff -u -r1.37 -r1.38 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java 15 Oct 2007 07:55:45 -0000 1.37 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java 18 Oct 2007 07:26:05 -0000 1.38 @@ -35,18 +35,20 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO; import org.lamsfoundation.lams.learningdesign.strategy.SequenceActivityStrategy; +import org.lamsfoundation.lams.tool.SystemTool; import org.lamsfoundation.lams.util.MessageService; /** * @author Manpreet Minhas * @hibernate.class */ -public class SequenceActivity extends ComplexActivity implements Serializable { +public class SequenceActivity extends ComplexActivity implements Serializable, ISystemToolActivity { private static Logger log = Logger.getLogger(SequenceActivity.class); private Set branchEntries; + private SystemTool systemTool; /** full constructor */ public SequenceActivity(Long activityId, @@ -72,7 +74,8 @@ Set inputActivities, Set activities, Activity defaultActivity, - Set branchEntries) { + Set branchEntries, + SystemTool systemTool) { super(activityId, id, description, @@ -98,7 +101,7 @@ defaultActivity); super.activityStrategy = new SequenceActivityStrategy(this); this.branchEntries = branchEntries; - + this.systemTool = systemTool; } @@ -133,6 +136,7 @@ super.activityStrategy = new SequenceActivityStrategy(this); } + /** * Makes a copy of the SequenceActivity for authoring, preview and monitoring environment * @return SequenceActivity Returns a deep-copy of the originalActivity @@ -141,6 +145,7 @@ SequenceActivity newSequenceActivity = new SequenceActivity(); copyToNewComplexActivity(newSequenceActivity); newSequenceActivity.defaultActivity = this.defaultActivity; + newSequenceActivity.systemTool = this.systemTool; if ( this.getBranchEntries() != null && this.getBranchEntries().size() > 0) { newSequenceActivity.setBranchEntries(new HashSet()); @@ -165,7 +170,6 @@ .toString(); } - /** * @see org.lamsfoundation.lams.util.Nullable#isNull() */ @@ -174,6 +178,18 @@ return false; } + /** + * @hibernate.many-to-one lazy="false" + * @hibernate.column name="system_tool_id" + */ + public SystemTool getSystemTool() { + return systemTool; + } + + public void setSystemTool(SystemTool systemTool) { + this.systemTool = systemTool; + } + /** * Get the set of the branch to group mappings used for this branching activity. The set contains BranchActivityEntry entries * Index: lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java,v diff -u -r1.9 -r1.10 --- lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java 17 Jul 2007 01:33:31 -0000 1.9 +++ lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java 18 Oct 2007 07:26:05 -0000 1.10 @@ -49,6 +49,7 @@ public static final Long TEACHER_CHOSEN_BRANCHING = new Long(6); public static final Long GROUP_BASED_BRANCHING = new Long(7); public static final Long TOOL_BASED_BRANCHING = new Long(8); + public static final Long SEQUENCE = new Long(9); /** identifier field */ private Long systemToolId;