Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -rfcd6f2e0e64ffccf8c7bbfb60911c1bc5991c440 -r2870ba9d3f788670624a32d6e5a1fe05c026d47a
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (.../Activity.hbm.xml) (revision fcd6f2e0e64ffccf8c7bbfb60911c1bc5991c440)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (.../Activity.hbm.xml) (revision 2870ba9d3f788670624a32d6e5a1fe05c026d47a)
@@ -79,6 +79,11 @@
@hibernate.property column="learning_activity_type_id" length="11"
+
+
+ @hibernate.property column="activity_category_id" length="11"
+
+
@hibernate.property column="library_activity_ui_image" length="255"
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
diff -u -r6753e585772b555f5070050085fd1675a59242bc -r2870ba9d3f788670624a32d6e5a1fe05c026d47a
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 6753e585772b555f5070050085fd1675a59242bc)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 2870ba9d3f788670624a32d6e5a1fe05c026d47a)
@@ -56,6 +56,16 @@
public static final int SEQUENCE_ACTIVITY_TYPE = 9;
/******************************************************************/
+ /**
+ * static final variables indicating the the category of activities
+ *******************************************************************/
+ public static final int CATEGORY_SYSTEM = 1;
+ public static final int CATEGORY_COLLABORATION = 2;
+ public static final int CATEGORY_ASSESSMENT = 3;
+ public static final int CATEGORY_CONTENT = 4;
+ public static final int CATEGORY_SPLIT = 5;
+ /******************************************************************/
+
/** WDDX packet specific attribute created to identify the
* type of object being passed.*/
public static final String OBJECT_TYPE ="Activity";
@@ -133,6 +143,9 @@
/** The type of activity */
private Integer activityTypeId;
+
+ /** The category of activity */
+ private Integer activityCategoryID;
/** persistent field */
private Transition transitionTo;
@@ -595,4 +608,10 @@
{
return activityStrategy.getNextActivityByParent(this,currentChild);
}
+ public Integer getActivityCategoryID() {
+ return activityCategoryID;
+ }
+ public void setActivityCategoryID(Integer activityCategoryID) {
+ this.activityCategoryID = activityCategoryID;
+ }
}
\ No newline at end of file