Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r9106d63be71900755d675e4c50168efc45b01622 -rc7cb4169bd37a4670f48f8d1452eecb8837e94ac
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 9106d63be71900755d675e4c50168efc45b01622)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision c7cb4169bd37a4670f48f8d1452eecb8837e94ac)
@@ -32,8 +32,11 @@
     private var title_txt:TextInput;
     private var desc_lbl:Label;
     private var desc_txt:TextInput;
-    private var grouping_lbl:Label;
+    
+	private var grouping_lbl:Label;
 	private var currentGrouping_lbl:Label;
+	private var appliedGroupingActivity_cmb:ComboBox;
+	
 	private var editGrouping_btn:Button;
     private var runOffline_chk:CheckBox;
     private var defineLater_chk:CheckBox;
@@ -50,8 +53,16 @@
 	private var endHours_stp:NumericStepper;
 	private var endMins_stp:NumericStepper;
 
-	
-	
+	//grouping 
+	private var groupType_lbl:Label;
+	private var numGroups_lbl:Label;
+	private var numLearners_lbl:Label;
+	private var groupType_cmb:ComboBox;
+	private var numGroups_rdo:RadioButton;
+	private var numLearners_rdo:RadioButton;
+	private var rndGroup_radio:RadioButtonGroup;
+	private var numGroups_stp:NumericStepper;
+	private var numLearners_stp:NumericStepper;
 
 	
 	//screen assets:
@@ -93,25 +104,46 @@
 		runOffline_chk.addEventListener("click",this);
 		defineLater_chk.addEventListener("click",this);
 		
+		rndGroup_radio.addEventListener("click",Delegate.create(this,onGroupingMethodChange));
+		groupType_cmb.addEventListener("change",Delegate.create(this,onGroupTypeChange));
 		gateType_cmb.addEventListener("change",Delegate.create(this,onGateTypeChange));
+		appliedGroupingActivity_cmb.addEventListener("change",Delegate.create(this,onAppliedGroupingChange));
 		hours_stp.addEventListener("change",Delegate.create(this,onScheduleOffsetChange));
 		mins_stp.addEventListener("change",Delegate.create(this,onScheduleOffsetChange));
+		hours_stp.addEventListener("focusOut",Delegate.create(this,onScheduleOffsetChange));
+		mins_stp.addEventListener("focusOut",Delegate.create(this,onScheduleOffsetChange));
 		endHours_stp.addEventListener("change",Delegate.create(this,onScheduleOffsetChange));
 		endMins_stp.addEventListener("change",Delegate.create(this,onScheduleOffsetChange));
+		endHours_stp.addEventListener("focusOut",Delegate.create(this,onScheduleOffsetChange));
+		endMins_stp.addEventListener("focusOut",Delegate.create(this,onScheduleOffsetChange));
+		numGroups_stp.addEventListener("change",Delegate.create(this,updateGroupingMethodData));
+		numLearners_stp.addEventListener("change",Delegate.create(this,updateGroupingMethodData));
+		numLearners_stp.addEventListener("focusOut",Delegate.create(this,updateGroupingMethodData));
+		numGroups_stp.addEventListener("focusOut",Delegate.create(this,updateGroupingMethodData));
 		
+		
 		gateType_lbl.text = Dictionary.getValue('trans_dlg_gatetypecmb');
 		hours_lbl.text = Dictionary.getValue('pi_hours');
 		mins_lbl.text = Dictionary.getValue('pi_mins');
 		startOffset_lbl.text = Dictionary.getValue('pi_start_offset');
 		endOffset_lbl.text = Dictionary.getValue('pi_end_offset');
 		
+		groupType_lbl.text = Dictionary.getValue('pi_group_type');
+		numGroups_lbl.text = Dictionary.getValue('pi_num_groups');
+		numLearners_lbl.text = Dictionary.getValue('pi_num_learners');
+		
+		
+		
 		//populate the synch type combo:
 		gateType_cmb.dataProvider = Activity.getGateActivityTypes();
+		groupType_cmb.dataProvider = Grouping.getGroupingTypesDataProvider();
 		
+		
 		//hide all the controls at startup
 		showGateControls(false);
 		showToolActivityControls(false);
 		showGroupingControls(false);
+		showAppliedGroupingControls(false);
 		
 		//fire event to say we have loaded
 		_container.contentLoaded();
@@ -145,33 +177,54 @@
 	
 	/**
 	 * Get called when something is selected in the cavas.
-	 * Updates the details in the propertyu inspector widgets
+	 * Updates the details in the property inspector widgets
+	 * Depending on the type of item selected, different controls will be shown
 	 * @usage   
 	 * @param   cm 
 	 * @return  
 	 */
 	private function updateItemProperties(cm:CanvasModel):Void{
 		//try to cast the selected item to see what we have (instance of des not seem to work)
 		if(CanvasActivity(cm.selectedItem) != null){
+			// its a Canvas activity then
 			Debugger.log('Its a canvas activity',4,'updateItemProperties','PropertyInspector');
 			var ca = CanvasActivity(cm.selectedItem);
 			var a:Activity = ca.activity;			
 			if(a.isGateActivity()){
+				//its a gate
+				showGroupingControls(false);
 				showToolActivityControls(false);
 				showGateControls(true);
-				showGroupingControls(true);
+				showAppliedGroupingControls(true);
 				showGateActivityProperties(GateActivity(a));
 				checkEnableGateControls();
+				showAppliedGroupingProperties(a);
+				//show the title
+				title_txt.text = StringUtils.cleanNull(a.title);
+			}else if(a.isGroupActivity()){
+				//its a grouping activity
+				showGroupingControls(true);
+				showRelevantGroupOptions();
+				showToolActivityControls(false);
+				showGateControls(false);
+				showAppliedGroupingControls(true);
+				populateGroupingProperties(GroupingActivity(a));
+				showAppliedGroupingProperties(a);
+				//show the title
+				title_txt.text = StringUtils.cleanNull(a.title);
+			
 			}else{
+				//its a tool activity
+				showGroupingControls(false);
 				showToolActivityControls(true);
 				showGateControls(false);
-				showGroupingControls(true);
+				showAppliedGroupingControls(true);
 				showToolActivityProperties(ToolActivity(a));
+				showAppliedGroupingProperties(a);
+				//show the title
+				title_txt.text = StringUtils.cleanNull(a.title);
 			}
-			/*
-			runOffline_txa.text =  StringUtils.cleanNull(cm.selectedItem.activity.offlineInstructions);
-			runOnline_txa.text =  StringUtils.cleanNull(cm.selectedItem.activity.onlineInstructions);
-			*/
+
 			
 		}else if(CanvasTransition(cm.selectedItem) != null){
 			var ct = CanvasTransition(cm.selectedItem);
@@ -198,7 +251,7 @@
 		
 		
 		toolDisplayName_lbl.text = StringUtils.cleanNull(ta.toolDisplayName);
-		title_txt.text = StringUtils.cleanNull(ta.title);
+		//title_txt.text = StringUtils.cleanNull(ta.title);
 		desc_txt.text = StringUtils.cleanNull(ta.description);
 		runOffline_chk.selected = ta.runOffline;
 		defineLater_chk.selected = ta.defineLater;
@@ -209,21 +262,185 @@
 	}
 	
 	private function showGateActivityProperties(ga:GateActivity){
-		toolDisplayName_lbl.text = 'Gate';
+		toolDisplayName_lbl.text = Dictionary.getValue('pi_activity_type_gate');
 		//loop through combo to fins SI of our gate activity type
 		for (var i=0; i<gateType_cmb.dataProvider.length;i++){
 			if(ga.activityTypeID == gateType_cmb.dataProvider[i].data){
 				gateType_cmb.selectedIndex=i;
 			}
 		}
+		//TODO: set the stepper values too!
+		
+		
 	
 	}
 	
 	private function showTransitionProperties(t:Transition){
-		//show from act and to act
+		//TODO: show from act and to act
 		
 	}
+	
+	private function  populateGroupingProperties(ga:GroupingActivity){
+		var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
+		toolDisplayName_lbl.text = Dictionary.getValue('pi_activity_type_grouping');
+		Debugger.log('This is the grouping object:',Debugger.GEN,'populateGroupingProperties','PropertyInspector');
+		ObjectUtils.printObject(g);
+		//loop through combo to fins SI of our gate activity type
+		for (var i=0; i<groupType_cmb.dataProvider.length;i++){
+			if(g.groupingTypeID == groupType_cmb.dataProvider[i].data){
+				groupType_cmb.selectedIndex=i;
+			}
+		}
+		
+		if(g.groupingTypeID == Grouping.RANDOM_GROUPING){
+			if(g.learnersPerGroup != null){
+				numLearners_stp.value = g.learnersPerGroup;
+			}else if(g.numberOfGroups != null){
+				numGroups_stp.value = g.numberOfGroups;
+			}
+		}else{
+			if(g.maxNumberOfGroups != null){
+				numGroups_stp.value = g.maxNumberOfGroups;
+			}
+		}
+		
+		
+	}
+	
+	/**
+	 * Shows which grouping activity is applied to this activity, 
+	 * if you click the edit button, the the activity is selected, 
+	 * and therefore the Grouping obeject properties 
+	 * are shown in the PropertyInspector.
+	 * @usage   
+	 * @param   a The selected Activity
+	 * @return  
+	 */
+	private function showAppliedGroupingProperties(a:Activity){
+		//update the grouping drop down values
+		appliedGroupingActivity_cmb.dataProvider = getGroupingActivitiesDP();
+		_global.breakpoint();
 
+		var appliedGroupingAct:GroupingActivity = _canvasModel.getCanvas().ddm.getGroupingActivityByGroupingUIID(a.groupingUIID);
+		Debugger.log('a.groupingUIID='+a.groupingUIID+', appliedGroupingAct.activityUIID :'+appliedGroupingAct.activityUIID ,Debugger.GEN,'showAppliedGroupingProperties','PropertyInspector');
+		
+		var dp = appliedGroupingActivity_cmb.dataProvider;
+		Debugger.log('dp:'+dp.toString(),Debugger.GEN,'showAppliedGroupingProperties','PropertyInspector');
+		appliedGroupingActivity_cmb.selectedIndex = 0;
+		for(var i=0; i<dp.length;i++){
+			
+			Debugger.log('dp[i].data.createGroupingID:'+dp[i].data.createGroupingID,Debugger.GEN,'showAppliedGroupingProperties','PropertyInspector');
+			if(appliedGroupingAct.activityUIID == dp[i].data.activityUIID){
+				appliedGroupingActivity_cmb.selectedIndex = i;
+			}
+			
+		}
+		
+		
+		
+	}
+
+		
+	private function showToolActivityControls(v:Boolean){
+
+		desc_lbl.visible = v;
+		desc_txt.visible = v;
+		grouping_lbl.visible = v;
+		currentGrouping_lbl.visible = v;
+		runOffline_chk.visible = v;
+		defineLater_chk.visible = v;
+		editGrouping_btn.visible = v;
+	}
+	
+	private function showGateControls(v:Boolean){
+		trace('showGateControls....'+v);
+		hours_lbl.visible = v;
+		mins_lbl.visible = v;
+		hours_stp.visible = v;
+		mins_stp.visible = v;
+		endHours_stp.visible = v;
+		endMins_stp.visible = v;
+		gateType_lbl.visible = v;
+		gateType_cmb.visible = v;
+		startOffset_lbl.visible = v;
+		endOffset_lbl.visible = v;
+	}
+	
+	/**
+	 * Shows or hides the app.lied grouping
+	 * AND title fields
+	 * @usage   
+	 * @param   v 
+	 * @return  
+	 */
+	private function showAppliedGroupingControls(v:Boolean){
+		trace('show grp controls.....'+v);
+		grouping_lbl.visible = v;
+		appliedGroupingActivity_cmb.visible = v;
+		
+		title_lbl.visible = v;
+		title_txt.visible = v;
+		
+	}
+	
+	private function showGroupingControls(v:Boolean){
+		//grouping 
+		groupType_lbl.visible = v;
+		groupType_cmb.visible = v;
+		if(v){
+			showRelevantGroupOptions();
+		}else{
+			numGroups_lbl.visible = v;
+			numLearners_lbl.visible = v;
+			numGroups_rdo.visible = v;
+			numLearners_rdo.visible = v;
+			numGroups_stp.visible = v;
+			numLearners_stp.visible = v;
+		}
+		
+	}
+	
+	private function showRelevantGroupOptions(){
+		
+		var ga = _canvasModel.selectedItem.activity;
+		var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
+		Debugger.log('g.groupingTypeID:'+g.groupingTypeID,Debugger.GEN,'showRelevantGroupOptions','org.lamsfoundation.lams.common.cv.PropertyInspector');
+		Debugger.log('Grouping.CHOSEN_GROUPING:'+Grouping.CHOSEN_GROUPING,Debugger.GEN,'showRelevantGroupOptions','org.lamsfoundation.lams.common.cv.PropertyInspector');
+		Debugger.log('Grouping.RANDOM_GROUPING:'+Grouping.RANDOM_GROUPING,Debugger.GEN,'showRelevantGroupOptions','org.lamsfoundation.lams.common.cv.PropertyInspector');
+		
+		if(g.groupingTypeID == Grouping.CHOSEN_GROUPING){
+			trace('chosen');
+			numGroups_lbl.visible = true;
+			numGroups_stp.visible = true;
+			
+			numLearners_rdo.visible = false;
+			numGroups_rdo.visible = false;
+			numLearners_stp.visible = false;
+			numLearners_lbl.visible = false;
+			
+		}else if(g.groupingTypeID == Grouping.RANDOM_GROUPING){
+			trace('random');
+			numGroups_lbl.visible = true;
+			numGroups_stp.visible = true;
+			
+			numLearners_rdo.visible = true;
+			numGroups_rdo.visible = true;
+			numLearners_stp.visible = true;
+			numLearners_lbl.visible = true;
+			checkEnableGroupsOptions();
+		}else{
+			//error dont understand the grouping type
+		}
+		trace('numLearners_stp.visible:'+numLearners_stp.visible);
+		
+	}
+	
+	private function reDrawTroublesomeSteppers(){
+		numLearners_stp.visible = true;
+		numGroups_stp.visible = true;
+	}
+	
+	
 	private function checkEnableGateControls(){
 		//Debugger.log('Activity.SCHEDULE_GATE_ACTIVITY_TYPE:'+Activity.SCHEDULE_GATE_ACTIVITY_TYPE,Debugger.GEN,'checkEnableGateControls','PropertyInspector');
 		//Debugger.log('_canvasModel.selectedItem.activity.activityTypeID:'+_canvasModel.selectedItem.activity.activityTypeID,Debugger.GEN,'checkEnableGateControls','PropertyInspector');
@@ -238,7 +455,7 @@
 		/**/
 		else{
 			trace('disabling....');
-		hours_stp.enabled = false;
+			hours_stp.enabled = false;
 			mins_stp.enabled = false;
 			endHours_stp.enabled = false;
 			endMins_stp.enabled = false;
@@ -253,45 +470,69 @@
 		MovieClipUtils.doLater(Proxy.create(this,showGateControls,bool));
 	}
 	
-	private function showToolActivityControls(v:Boolean){
-		title_lbl.visible = v;
-		title_txt.visible = v;
-		desc_lbl.visible = v;
-		desc_txt.visible = v;
-		grouping_lbl.visible = v;
-		currentGrouping_lbl.visible = v;
-		runOffline_chk.visible = v;
-		defineLater_chk.visible = v;
-		editGrouping_btn.visible = v;
+	/**
+	 * Enables or disables the grouping method steppers
+	 * @usage   
+	 * @return  
+	 */
+	private function checkEnableGroupsOptions(){
+		var groupingBy = rndGroup_radio.selection.data;
+		Debugger.log('groupingBy:'+groupingBy,Debugger.GEN,'checkEnableGroupsOptions','PropertyInspector');
+		if(groupingBy == 'num_learners'){
+			numGroups_stp.value = 0;
+			numGroups_stp.enabled = false;
+			numLearners_stp.enabled = true;
+		}else{
+			numGroups_stp.enabled = true;
+			numLearners_stp.value = 0;
+			numLearners_stp.enabled = false;
+		}
+		//this is a crazy hack to stop the steppter dissapearing after its .enabled property is set.
+		//waits 2 frames to re-display the control ( 1 doensnt work!)
+		MovieClipUtils.doLater(Proxy.create(this,reDrawTroublesomeSteppersLater));
+		
 	}
 	
-	private function showGateControls(v:Boolean){
-		trace('showGateControls....'+v);
-		hours_lbl.visible = v;
-		mins_lbl.visible = v;
-		hours_stp.visible = v;
-		mins_stp.visible = v;
-		endHours_stp.visible = v;
-		endMins_stp.visible = v;
-		gateType_lbl.visible = v;
-		gateType_cmb.visible = v;
-		startOffset_lbl.visible = v;
-		endOffset_lbl.visible = v;
+	public function reDrawTroublesomeSteppersLater(){
+		MovieClipUtils.doLater(Proxy.create(this,reDrawTroublesomeSteppers));
 	}
 	
-	private function showGroupingControls(v:Boolean){
-		trace('show grp controls.....'+v);
-		grouping_lbl.visible = v;
-		currentGrouping_lbl.visible = v;
-		editGrouping_btn.visible = v;
+	/**
+	 * Called when there is a change in the values of the group method steppers
+	 * Butdates the value inthe grouping class being edited.
+	 * @usage   
+	 * @return  
+	 */
+	public function updateGroupingMethodData(){
+		var ga = _canvasModel.selectedItem.activity;
+		var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
+		if(g.groupingTypeID == Grouping.RANDOM_GROUPING){
+			//not only one of these should actually have a non 0 value
+			g.learnersPerGroup = numLearners_stp.value;
+			g.numberOfGroups = numGroups_stp.value;
+		}else{
+			g.maxNumberOfGroups = numGroups_stp.value;
+		}
 	}
 	
+	private function getGroupingActivitiesDP(){
+		var gActs = _canvasModel.getCanvas().ddm.getGroupingActivities();
+		var gActsDP = new Array();
+		gActsDP.push({label:Dictionary.getValue('pi_no_grouping'),data:null});
+		for(var i=0; i<gActs.length;i++){
+			gActsDP.push({label:gActs[i].title,data:gActs[i]});
+		}
+		return gActsDP;
+	}
+	
+	
+	
 
 	/**
     * Main resize method, called by scrollpane container/parent
     */
     public function setSize(w:Number,h:Number){
-        //Debugger.log('setSize',Debugger.GEN,'setSize','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
+      
         //Size the bkg_pnl
 		
         body_pnl.setSize(w,h-bar_pnl.height);
@@ -327,6 +568,8 @@
 		
 		styleObj = _tm.getStyleObject('combo');
 		gateType_cmb.setStyle('styleName',styleObj);
+		groupType_cmb.setStyle('styleName',styleObj);
+		appliedGroupingActivity_cmb.setStyle('styleName',styleObj);
 		
 		styleObj = _tm.getStyleObject('textinput');
 		title_txt.setStyle('styleName',styleObj);
@@ -371,6 +614,45 @@
 		checkEnableGateControls();
 	}
 	
+	/**
+	 * Handles change event fired from the groupType_cmb
+	 * @usage   
+	 * @param   evt 
+	 * @return  
+	 */
+	private function onGroupTypeChange(evt:Object){
+		var ga = _canvasModel.selectedItem.activity;
+		var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
+		g.groupingTypeID = evt.target.value;
+		Debugger.log('Set group type to: '+g.groupingTypeID,Debugger.GEN,'onGroupTypeChange','PropertyInspector');
+		showRelevantGroupOptions();
+	}
+	
+	private function onAppliedGroupingChange(evt:Object){
+		var a = _canvasModel.selectedItem.activity;
+		//get the groupingUIID of the grouping Actviity we have selected.
+		var newGroupingUIID = evt.target.value.createGroupingUIID;
+		a.groupingUIID = newGroupingUIID;
+		
+		Debugger.log('Set grouping UIID to: '+a.groupingUIID ,Debugger.GEN,'onAppliedGroupingChange','PropertyInspector');
+		
+	}
+	
+	/**
+	 * Handles click event from the grouping method radio buttons
+	 * @usage   
+	 * @param   evt 
+	 * @return  
+	 */
+	private function onGroupingMethodChange(evt:Object){
+		//
+		//checkEnableGroupsOptions();
+		
+		 
+		checkEnableGroupsOptions();
+		
+	}
+	
 	private function onScheduleOffsetChange(evt:Object){
 		
 		var startOffsetMins:Number = (hours_stp.value * 60) + mins_stp.value;