Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r41f90be3960b8b778b427025961e577ffc95b80a -r2dc5582160b7aedc807cd540e73ed3cb832840e4 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r41f90be3960b8b778b427025961e577ffc95b80a -r2dc5582160b7aedc807cd540e73ed3cb832840e4 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -r2dc5582160b7aedc807cd540e73ed3cb832840e4 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 2dc5582160b7aedc807cd540e73ed3cb832840e4) @@ -614,9 +614,16 @@ private function loadCustomContextMenu(type:String):Void { if (_module == "monitoring"){ - _ccm.showCustomCM(_ccm.loadMenu(type, "monitoring")) - }else { - _ccm.showCustomCM(_ccm.loadMenu(type, "authoring")) + if (type.toString() == "activity") + _ccm.showCustomCM(_ccm.loadMenu(type, "monitoring", this.activity)); + else + _ccm.showCustomCM(_ccm.loadMenu(type, "monitoring", null)); + + } else { + if (type.toString() == "activity") + _ccm.showCustomCM(_ccm.loadMenu(type, "authoring", this.activity)); + else + _ccm.showCustomCM(_ccm.loadMenu(type, "authoring", null)) } } @@ -659,7 +666,7 @@ } private function onRelease():Void{ - loadCustomContextMenu("activity"); + //loadCustomContextMenu("activity"); if(!_doubleClicking){ Debugger.log('Releasing:'+this,Debugger.GEN,'onRelease','CanvasActivity'); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -r2dc5582160b7aedc807cd540e73ed3cb832840e4 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 2dc5582160b7aedc807cd540e73ed3cb832840e4) @@ -1199,20 +1199,27 @@ } private function onMapCompetenceClick(evt:Object){ - // open group to competence mapping window - _app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue("competence_mappings_btn"), closeButton:true, resize:false, scrollContentPath:'CompetenceMappingDialog'}); + // check that an activity is selected + if (_canvasModel.selectedItem != null && _canvasModel.selectedItem != undefined){ + // open group to competence mapping window + _app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue("competence_mappings_btn"), closeButton:true, resize:false, scrollContentPath:'CompetenceMappingDialog'}); + }else { + LFMessage.showMessageAlert(Dictionary.getValue("al_activity_view_competence_mappings_invalid"), null); + } } public function openConditionMatchDialog():Void { onConditionMatchClick(); } private function onConditionMatchClick(evt:Object){ + // open group to branch matching window _app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue('condmatch_dlg_title_lbl'), closeButton:true, resize:false, scrollContentPath:'ConditionMatchingDialog'}); _app.dialog.addEventListener('contentLoaded', Delegate.create(this, ConditionMatchDialogLoaded)); - + setModified(); + } private function onConditionsSetupClick(evt:Object){ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -r2dc5582160b7aedc807cd540e73ed3cb832840e4 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 2dc5582160b7aedc807cd540e73ed3cb832840e4) @@ -214,9 +214,14 @@ public function showMappedCompetences() { - var controller:MonitorController = monitorView.getController(); - var dialog:MovieClip = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue("mapped_competences_lbl"),closeButton:true,scrollContentPath:'CompetenceEditorDialog'}); - dialog.addEventListener('contentLoaded',Delegate.create(controller, controller.openDialogLoaded)); + if (monitorModel.selectedItem != null && monitorModel.selectedItem != undefined) { + var controller:MonitorController = monitorView.getController(); + var dialog:MovieClip = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue("mapped_competences_lbl"),closeButton:true,scrollContentPath:'CompetenceEditorDialog'}); + dialog.addEventListener('contentLoaded',Delegate.create(controller, controller.openDialogLoaded)); + } else { + + LFMessage.showMessageAlert(Dictionary.getValue("al_activity_view_competence_mappings_invalid"), null); + } } /** Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as =================================================================== diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -r2dc5582160b7aedc807cd540e73ed3cb832840e4 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as (.../CustomContextMenu.as) (revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as (.../CustomContextMenu.as) (revision 2dc5582160b7aedc807cd540e73ed3cb832840e4) @@ -39,7 +39,7 @@ private var app:ApplicationParent; //ContextMenu instance is stored as a static in the CustomContextMenu class - private static var _instance:CustomContextMenu = null; + private static var _instance:CustomContextMenu = null; //Defined so compiler can 'see' events added at runtime by EventDispatcher private var dispatchEvent:Function; @@ -77,30 +77,41 @@ * Load the dictionary for the language specified * @param language (string) language parameter. */ - public function loadMenu(cmType:String, moduleType:String):Array { + public function loadMenu(cmType:String, moduleType:String, activity:Activity):Array { var v:Boolean; var monitorC:Boolean; var authorC:Boolean; var monitorCB:Boolean; + var isToolAct:Boolean; var mappings_cxt_mnu_lbl:String = null; var myCopy:Array = new Array(); var menuArr:Array = new Array(); + + isToolAct = false; if (cmType == "activity"){ - v = true; + v = true; + + if (activity != null && activity != undefined) { + if (activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE) { + isToolAct = true; + } + } + } else { v = false; } - + if (moduleType == "authoring"){ authorC = true; - monitorC = false + monitorC = false monitorCB = false; + }else{ authorC = false; monitorC = true; @@ -115,9 +126,10 @@ 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]; - menuArr[7] = [Dictionary.getValue('ccm_author_activityhelp'),getHelp, false, v, authorC]; - menuArr[8] = [Dictionary.getValue('view_act_mapped_competences'),getMappedCompetences, false, v, monitorC]; + menuArr[6] = [Dictionary.getValue('map_comptence_btn'),mapToCompetences, true, v, (authorC && isToolAct)]; + menuArr[7] = [Dictionary.getValue('ccm_pi'),getPI, true, true, authorC]; + menuArr[8] = [Dictionary.getValue('ccm_author_activityhelp'),getHelp, false, v, authorC]; + menuArr[9] = [Dictionary.getValue('view_act_mapped_competences'),getMappedCompetences, false, v, (monitorC && isToolAct)]; for (var i=0; i