Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r7b855245133f01885c4b7f1d85beb3e91675bb40 -r3e5133c20459246aa3c6cd0a6f8ea6deae6f8d02
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 7b855245133f01885c4b7f1d85beb3e91675bb40)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 3e5133c20459246aa3c6cd0a6f8ea6deae6f8d02)
@@ -323,7 +323,24 @@
 				title_txt.text = StringUtils.cleanNull(cca.title);
 				desc_txt.text = StringUtils.cleanNull(cca.description);
 				//PI_sp.refreshPane();
-			
+		}else if(CanvasParallelActivity(cm.selectedItem) != null){
+			var co = CanvasParallelActivity(cm.selectedItem);
+			var cca:ComplexActivity = ComplexActivity(co.activity);
+				//its an parallel activity
+				showOptionalControls(false);
+				showGeneralControls(true);
+				showGroupingControls(false);
+				//showRelevantGroupOptions();
+				showToolActivityControls(false);
+				showGateControls(false);
+				showAppliedGroupingControls(true);
+				//showGeneralProperties(cca)
+				populateGroupingProperties(GroupingActivity(cca));
+				showAppliedGroupingProperties(cca);
+				showParallelActivityProperties(cca);
+				//show the title
+				title_txt.text = StringUtils.cleanNull(cca.title);
+				desc_txt.text = StringUtils.cleanNull(cca.description);*/
 		}else if(CanvasTransition(cm.selectedItem) != null){
 			var ct = CanvasTransition(cm.selectedItem);
 			var t:Transition = ct.transition;
@@ -466,6 +483,20 @@
 
 	}
 	
+	private function showParallelActivityProperties(ca:ComplexActivity){
+		
+		
+		toolDisplayName_lbl.text = Dictionary.getValue('pi_parallel_title');
+		//title_txt.text = StringUtils.cleanNull(ta.title);
+		//desc_txt.text = StringUtils.cleanNull(ta.description);
+		runOffline_chk.selected = ca.runOffline;
+		defineLater_chk.selected = ca.defineLater;
+					
+		currentGrouping_lbl.text = "GroupingUIID:"+StringUtils.cleanNull(ca.runOffline.groupingUIID);
+			
+
+	}
+	
 	private function showGateActivityProperties(ga:GateActivity){
 		toolDisplayName_lbl.text = Dictionary.getValue('pi_activity_type_gate');
 		//loop through combo to find SI of our gate activity type