Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -rac37d39d2d7db57a315c9c936cbbe104ed5bb1ca -r9ab50c7ac0968734ac995676cdba54f0c80bbeed --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision ac37d39d2d7db57a315c9c936cbbe104ed5bb1ca) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 9ab50c7ac0968734ac995676cdba54f0c80bbeed) @@ -465,7 +465,7 @@ /** *Called by the controller when a complex activity is dropped on bin. */ - public function removeComplexActivity(ca:CanvasActivity){ + public function removeComplexActivity(ca){ Debugger.log('Removed Child '+ca.activity.activityUIID+ 'from : '+ca.activity.parentUIID,Debugger.GEN,'removeOptionalCA','CanvasModel'); trace("Number of Children are: "+ca.actChildren.length) Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as =================================================================== diff -u -r748472ec55cef695bae158d05414698ce7047589 -r9ab50c7ac0968734ac995676cdba54f0c80bbeed --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 748472ec55cef695bae158d05414698ce7047589) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 9ab50c7ac0968734ac995676cdba54f0c80bbeed) @@ -244,6 +244,13 @@ JsPopup.getInstance().launchPopupWindow(exp_url, 'ExportPortfolio', 410, 640, true, true, false, false, false); } + + private function openJournalEntries():Void{ + var journals_url:String = _root.serverURL+"learning/notebook.do?method=viewAllJournals&lessonID="+_root.lessonID; + + JsPopup.getInstance().launchPopupWindow(journals_url, 'JournalEntries', 570, 796, true, true, false, false, false); + + } public function click(evt):Void{ trace(evt.target); @@ -265,6 +272,9 @@ }else if(tgt.indexOf("help_btn") != -1){ trace('you clicked help button..'); _monitorModel.tabHelp(); + }else if(tgt.indexOf("viewJournals_btn") != -1){ + trace('you clicked journal entries button..'); + openJournalEntries(); } } Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r9ab50c7ac0968734ac995676cdba54f0c80bbeed --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as (.../MonitorView.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as (.../MonitorView.as) (revision 9ab50c7ac0968734ac995676cdba54f0c80bbeed) @@ -78,6 +78,7 @@ private var refresh_btn:Button; private var help_btn:Button; private var exportPortfolio_btn:Button; + private var viewJournals_btn:Button; //private var _activityLayerComplex_mc:MovieClip; //private var _activityLayer_mc:MovieClip; @@ -167,6 +168,9 @@ case 'EXPORTSHOWHIDE' : exportShowHide(infoObj.data); break; + case 'JOURNALSSHOWHIDE' : + journalsShowHide(infoObj.data); + break; default : Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorView'); } @@ -186,6 +190,10 @@ exportPortfolio_btn.visible = v; } + private function journalsShowHide(v:Boolean):Void{ + viewJournals_btn.visible = v; + } + /** * layout visual elements on the canvas on initialisation */ @@ -217,6 +225,7 @@ refresh_btn.addEventListener("click",mcontroller); help_btn.addEventListener("click",mcontroller); exportPortfolio_btn.addEventListener("click", mcontroller); + viewJournals_btn.addEventListener("click", mcontroller); refresh_btn.onRollOver = Proxy.create(this,this['showToolTip'], refresh_btn, "refresh_btn_tooltip"); refresh_btn.onRollOut = Proxy.create(this,this['hideToolTip']); @@ -227,6 +236,9 @@ exportPortfolio_btn.onRollOver = Proxy.create(this,this['showToolTip'], exportPortfolio_btn, "class_exportPortfolio_btn_tooltip"); exportPortfolio_btn.onRollOut = Proxy.create(this,this['hideToolTip']); + viewJournals_btn.onRollOver = Proxy.create(this,this['showToolTip'], viewJournals_btn, "learner_viewJournals_btn_tooltip"); + viewJournals_btn.onRollOut = Proxy.create(this,this['hideToolTip']); + monitorTabs_tb.addEventListener("change",mcontroller); setLabels(); @@ -316,13 +328,15 @@ refresh_btn.setStyle('styleName',styleObj); exportPortfolio_btn.setStyle('styleName',styleObj); help_btn.setStyle('styleName',styleObj); + viewJournals_btn.setStyle('styleName', styleObj); } private function setLabels():Void{ refresh_btn.label = Dictionary.getValue('refresh_btn'); help_btn.label = Dictionary.getValue('help_btn'); exportPortfolio_btn.label = Dictionary.getValue('learner_exportPortfolio_btn'); + viewJournals_btn.label = Dictionary.getValue('learner_viewJournals_btn'); } /** @@ -338,6 +352,7 @@ monitorLesson_scp.setSize(s.w-monitorLesson_scp._x,s.h-monitorLesson_scp._y); monitorSequence_scp.setSize(s.w-monitorSequence_scp._x,s.h-monitorSequence_scp._y); monitorLearner_scp.setSize(s.w-monitorLearner_scp._x,s.h-monitorLearner_scp._y); + viewJournals_btn._x = s.w - 260; exportPortfolio_btn._x = s.w - 260; refresh_btn._x = s.w - 160 help_btn._x = s.w - 80 Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as =================================================================== diff -u -rf4c28bae0266a2878bdffc2fbd3cc86d6734caf4 -r9ab50c7ac0968734ac995676cdba54f0c80bbeed --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision f4c28bae0266a2878bdffc2fbd3cc86d6734caf4) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision 9ab50c7ac0968734ac995676cdba54f0c80bbeed) @@ -141,7 +141,8 @@ if (infoObj.tabID == _tabID){ //this._visible = true; mm.getMonitor().getMV().getMonitorLearnerScp()._visible = true; - hideMainExp(mm); + hideMainExp(mm); + mm.broadcastViewUpdate("JOURNALSSHOWHIDE", true) trace("TabID for Selected tab is (TABCHANGE): "+infoObj.tabID) if (mm.activitiesDisplayed.isEmpty()){ Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as =================================================================== diff -u -rc4c22d3e18a9e5cc345035262503f758d9bada60 -r9ab50c7ac0968734ac995676cdba54f0c80bbeed --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as (.../LessonTabView.as) (revision c4c22d3e18a9e5cc345035262503f758d9bada60) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as (.../LessonTabView.as) (revision 9ab50c7ac0968734ac995676cdba54f0c80bbeed) @@ -180,7 +180,9 @@ //this._visible = true; mm.getMonitor().getMV().getMonitorLessonScp()._visible = true; //mm.getMonitor().getMV().getMonitorScp().contentPath = this; - hideMainExp(mm); + hideMainExp(mm); + mm.broadcastViewUpdate("JOURNALSSHOWHIDE", false); + //mm.setDirty(); //MovieClipUtils.doLater(Proxy.create(this,draw)); @@ -203,6 +205,8 @@ trace("ContentPath: "+this) mm.getMonitor().getMV().getMonitorLessonScp()._visible = true; hideMainExp(mm); + mm.broadcastViewUpdate("JOURNALSSHOWHIDE", false); + MovieClipUtils.doLater(Proxy.create(this,draw)); Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as =================================================================== diff -u -rac4ac21d3d188a33f47b4399c49c7a0d9dd4989b -r9ab50c7ac0968734ac995676cdba54f0c80bbeed --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision ac4ac21d3d188a33f47b4399c49c7a0d9dd4989b) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 9ab50c7ac0968734ac995676cdba54f0c80bbeed) @@ -146,6 +146,7 @@ //this._visible = true; mm.getMonitor().getMV().getMonitorSequenceScp()._visible = true; hideMainExp(mm); + mm.broadcastViewUpdate("JOURNALSSHOWHIDE", false); trace("TabID for Selected tab is (TABCHANGE): "+infoObj.tabID) if (mm.activitiesDisplayed.isEmpty() || mm.transitionsDisplayed.isEmpty()){ mm.getMonitor().openLearningDesign(mm.getSequence());