Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
===================================================================
diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -rc6274262a61a40b34f77cd8db35f374cfbcc17b4
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java	(.../Grouping.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java	(.../Grouping.java)	(revision c6274262a61a40b34f77cd8db35f374cfbcc17b4)
@@ -68,6 +68,8 @@
     /** nullable persistent field */
     private Integer groupingUIID;
     
+    private Integer groupingTypeId;
+    
    
     /** persistent field */
     private Set groups;
@@ -137,13 +139,20 @@
      */
     public Integer getGroupingTypeId()
     {
-        if(this instanceof LessonClass)
+     /* if(this instanceof LessonClass)
             return CLASS_GROUPING_TYPE;
         else if(this instanceof ChosenGrouping)
             return CHOSEN_GROUPING_TYPE;
         else
-            return RANDOM_GROUPING_TYPE;
+            return RANDOM_GROUPING_TYPE; */
+        return this.groupingTypeId;
+        
     }
+    
+    public void setGroupingTypeId(Integer groupingTypeID)
+    {
+        this.groupingTypeId = groupingTypeID;
+    }
 
     /**
      *            
@@ -337,4 +346,19 @@
 		else
 			return new LessonClass();
 	}
+	
+	public boolean isRandomGrouping()
+	{
+	    return getGroupingTypeId().intValue() == RANDOM_GROUPING_TYPE.intValue();
+	}
+	
+	public boolean isChosenGrouping()
+	{
+	    return getGroupingTypeId().intValue() == CHOSEN_GROUPING_TYPE.intValue();
+	}
+	
+	public boolean isClassGrouping()
+	{
+	    return getGroupingTypeId().intValue() == CLASS_GROUPING_TYPE.intValue();
+	}
 }