Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewBranchConditionMappingsDialog.as
===================================================================
diff -u -rf8f41dead761de750c4b69041e2d3ee5d7605df2 -r17211734beb7dc9bd7de15f5fe193cdba6211b21
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewBranchConditionMappingsDialog.as	(.../ViewBranchConditionMappingsDialog.as)	(revision f8f41dead761de750c4b69041e2d3ee5d7605df2)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewBranchConditionMappingsDialog.as	(.../ViewBranchConditionMappingsDialog.as)	(revision 17211734beb7dc9bd7de15f5fe193cdba6211b21)
@@ -29,6 +29,7 @@
 import org.lamsfoundation.lams.common.dict.*
 import org.lamsfoundation.lams.common.style.*
 
+import org.lamsfoundation.lams.authoring.Activity
 import org.lamsfoundation.lams.authoring.BranchingActivity
 import org.lamsfoundation.lams.monitoring.*
 
@@ -119,23 +120,26 @@
 	}
 	
 	public function loadLists() {
-		var column_condition:DataGridColumn = new DataGridColumn("displayName");
-		column_condition.headerText = Dictionary.getValue("branch_mapping_dlg_condition_col_lbl");
-		column_condition.width = conditions_dgd.width/2;
+		var column_first:DataGridColumn;
+		if(_branchingActivity.activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE) {
+			column_first = new DataGridColumn("displayName");
+			column_first.headerText = Dictionary.getValue("branch_mapping_dlg_condition_col_lbl");
+		} else {
+			column_first = new DataGridColumn("groupName");
+			column_first.headerText = Dictionary.getValue("branch_mapping_dlg_group_col_lbl");
+		} 
 		
+		column_first.width = conditions_dgd.width/2;
+		
 		var column_sequence:DataGridColumn = new DataGridColumn("sequenceName");
 		column_sequence.headerText = Dictionary.getValue("branch_mapping_dlg_branch_col_lbl");
 		column_sequence.width = conditions_dgd.width/2;
 		
-		conditions_dgd.addColumn(column_condition);
+		conditions_dgd.addColumn(column_first);
 		conditions_dgd.addColumn(column_sequence);
 		
-		for(var i=0; i < _mappings.length; i++) {
-			if(_mappings[i].condition.toolActivity.activityUIID == _branchingActivity.toolActivityUIID &&
-				_mappings[i].condition.branchingActivity.activityUIID == _branchingActivity.activityUIID) {
-				conditions_dgd.addItem(_mappings[i]);
-			}
-		}
+		for(var i=0; i<_mappings.length; i++)
+			conditions_dgd.addItem(_mappings[i]);
 		
 	}
     
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as
===================================================================
diff -u -rf8f41dead761de750c4b69041e2d3ee5d7605df2 -r17211734beb7dc9bd7de15f5fe193cdba6211b21
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	(.../Monitor.as)	(revision f8f41dead761de750c4b69041e2d3ee5d7605df2)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	(.../Monitor.as)	(revision 17211734beb7dc9bd7de15f5fe193cdba6211b21)
@@ -203,7 +203,9 @@
 	public function viewToolOutputConditions() {
 		var controller:MonitorController = monitorView.getController();
 		
-		var dialog:MovieClip = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue('ccm_monitor_view_mappings'), closeButton:true, scrollContentPath:'ViewBranchConditionMappingsDialog'});
+		var dialog_title:String = (monitorModel.selectedItem.activity.activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE) ? Dictionary.getValue('ccm_monitor_view_condition_mappings') : Dictionary.getValue('ccm_monitor_view_group_mappings');
+		
+		var dialog:MovieClip = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:dialog_title, closeButton:true, scrollContentPath:'ViewBranchConditionMappingsDialog'});
 		dialog.addEventListener('contentLoaded', Delegate.create(controller, controller.viewBranchConditionMappingsDialogLoaded));
 		
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
===================================================================
diff -u -rf8f41dead761de750c4b69041e2d3ee5d7605df2 -r17211734beb7dc9bd7de15f5fe193cdba6211b21
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision f8f41dead761de750c4b69041e2d3ee5d7605df2)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision 17211734beb7dc9bd7de15f5fe193cdba6211b21)
@@ -714,7 +714,7 @@
 			var branchingActivity:BranchingActivity = BranchingActivity(_monitorModel.selectedItem.activity);
 			
 			evt.target.scrollContent.branchingActivity = branchingActivity;
-			evt.target.scrollContent.mappings = _monitorModel.ddm.getBranchMappingsByActivityUIIDAndType(branchingActivity.activityUIID).toolBased;
+			evt.target.scrollContent.mappings = _monitorModel.ddm.getBranchMappingsByActivityUIIDAndType(branchingActivity.activityUIID).all;
 			evt.target.scrollContent.loadLists();
 	    } else {
             //TODO DI 25/05/05 raise wrong event type error 
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as
===================================================================
diff -u -rf8f41dead761de750c4b69041e2d3ee5d7605df2 -r17211734beb7dc9bd7de15f5fe193cdba6211b21
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as	(.../CustomContextMenu.as)	(revision f8f41dead761de750c4b69041e2d3ee5d7605df2)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as	(.../CustomContextMenu.as)	(revision 17211734beb7dc9bd7de15f5fe193cdba6211b21)
@@ -87,6 +87,8 @@
 		var authorC:Boolean;
 		
 		var monitorCB:Boolean;
+		
+		var mappings_cxt_mnu_lbl:String = null;
 		
 		var myCopy:Array = new Array();
 		var menuArr:Array = new Array();
@@ -106,13 +108,14 @@
 			authorC = false;
 			monitorC = true;
 		
-			monitorCB = (org.lamsfoundation.lams.monitoring.Application.getInstance().getMonitor().model.selectedItem.activity.activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE) ? true : false; 
+			monitorCB = (org.lamsfoundation.lams.monitoring.Application.getInstance().getMonitor().model.selectedItem.activity.isBranchingActivity()) ? true : false; 
+			mappings_cxt_mnu_lbl = (org.lamsfoundation.lams.monitoring.Application.getInstance().getMonitor().model.selectedItem.activity.activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE) ? Dictionary.getValue('ccm_monitor_view_condition_mappings') : Dictionary.getValue('ccm_monitor_view_group_mappings');
 		}
 		
 		menuArr[0] = [Dictionary.getValue('ccm_open_activitycontent'), getOpenEditActivityContent, false, v, authorC];
 		menuArr[1] = [Dictionary.getValue('ccm_copy_activity'), getCopy, false, v, authorC];
 		menuArr[2] = [Dictionary.getValue('ccm_monitor_activity'), MonitorActivityContent, false, v, monitorC];
-		menuArr[3] = [Dictionary.getValue('ccm_monitor_view_mappings'), viewToolOutputConditions, false, true, monitorCB];
+		menuArr[3] = [mappings_cxt_mnu_lbl, viewToolOutputConditions, false, true, monitorCB];
 		menuArr[4] = [Dictionary.getValue('ccm_monitor_activityhelp'),getMonitorHelp, false, v, monitorC];
 		menuArr[5] = [Dictionary.getValue('ccm_paste_activity'),getPaste, false, v, authorC];
 		menuArr[6] = [Dictionary.getValue('ccm_pi'),getPI, true, true, authorC];
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rf8f41dead761de750c4b69041e2d3ee5d7605df2 -r17211734beb7dc9bd7de15f5fe193cdba6211b21
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rf8f41dead761de750c4b69041e2d3ee5d7605df2 -r17211734beb7dc9bd7de15f5fe193cdba6211b21
Binary files differ