Index: lams_flash/src/central/flash/lams_monitoring_v1.fla =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r2dd65b84334012d958de5a9c6588ded951c52dc6 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r2dd65b84334012d958de5a9c6588ded951c52dc6 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 0e378dd9696fcf3cd772974aa98f0cef54fdb972) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 2dd65b84334012d958de5a9c6588ded951c52dc6) @@ -484,6 +484,12 @@ _monitorModel.changeTab(evt.target.selectedIndex); } + private function viewClassTimeChart():Void { + var classTimeChart_url:String = _root.serverURL+"monitoring/monitoring.do?method=viewTimeChart&lessonID="+_root.lessonID; + Debugger.log("classTimeChart_url: "+classTimeChart_url, Debugger.GEN, "viewClassTimeChart", "MonitorController"); + JsPopup.getInstance().launchPopupWindow(classTimeChart_url, 'ClassTimeChart', 600, 400, true, true, false, false, false); + } + private function exportClassPortfolio():Void{ var exp_url:String = _root.serverURL+"learning/exportWaitingPage.jsp?mode=teacher&lessonID="+_root.lessonID; JsPopup.getInstance().launchPopupWindow(exp_url, 'ExportPortfolio', 410, 640, true, true, false, false, false); @@ -513,6 +519,8 @@ _monitorModel.setDialogOpen("VM_DIALOG"); } else if(tgt.indexOf("start_btn") != -1){ _monitorModel.getMonitor().startLesson(false, _root.lessonID); + } else if(tgt.indexOf("viewAllTimeChart_btn") != -1){ + viewClassTimeChart(); } else if(tgt.indexOf("exportPortfolio_btn") != -1){ exportClassPortfolio(); }else if(tgt.indexOf("refresh_btn") != -1){ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as =================================================================== diff -u -r68d2988cca350af15ba4087814f74e1527a71997 -r2dd65b84334012d958de5a9c6588ded951c52dc6 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as (.../MonitorView.as) (revision 68d2988cca350af15ba4087814f74e1527a71997) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as (.../MonitorView.as) (revision 2dd65b84334012d958de5a9c6588ded951c52dc6) @@ -81,6 +81,7 @@ private var _editOnFlyLayer_mc:MovieClip; private var refresh_btn:Button; private var help_btn:Button; + private var viewAllTimeChart_btn:Button; private var exportPortfolio_btn:Button; private var viewJournals_btn:Button; private var editFly_btn:Button; @@ -205,6 +206,9 @@ case 'EXPORTSHOWHIDE' : exportShowHide(infoObj.data); break; + case 'TIMECHARTSHOWHIDE' : + timeChartShowHide(infoObj.data); + break; case 'JOURNALSSHOWHIDE' : journalsShowHide(infoObj.data); break; @@ -228,6 +232,10 @@ exportPortfolio_btn.visible = v; } + private function timeChartShowHide(v:Boolean):Void{ + viewAllTimeChart_btn.visible = v; + } + private function journalsShowHide(v:Boolean):Void{ viewJournals_btn.visible = v; } @@ -266,6 +274,7 @@ refresh_btn.addEventListener("click",mcontroller); help_btn.addEventListener("click",mcontroller); + viewAllTimeChart_btn.addEventListener("click",mcontroller); exportPortfolio_btn.addEventListener("click", mcontroller); viewJournals_btn.addEventListener("click", mcontroller); editFly_btn.addEventListener("click", mcontroller); @@ -276,6 +285,9 @@ help_btn.onRollOver = Proxy.create(this,this['showToolTip'], help_btn, "help_btn_tooltip"); help_btn.onRollOut = Proxy.create(this,this['hideToolTip']); + viewAllTimeChart_btn.onRollOver = Proxy.create(this,this['showToolTip'], viewAllTimeChart_btn, "class_timeChart_btn_tooltip"); + viewAllTimeChart_btn.onRollOut = Proxy.create(this,this['hideToolTip']); + exportPortfolio_btn.onRollOver = Proxy.create(this,this['showToolTip'], exportPortfolio_btn, "class_exportPortfolio_btn_tooltip"); exportPortfolio_btn.onRollOut = Proxy.create(this,this['hideToolTip']); @@ -370,6 +382,7 @@ styleObj = _tm.getStyleObject('button'); monitorTabs_tb.setStyle('styleName', styleObj); refresh_btn.setStyle('styleName',styleObj); + viewAllTimeChart_btn.setStyle('styleName',styleObj); exportPortfolio_btn.setStyle('styleName',styleObj); help_btn.setStyle('styleName',styleObj); viewJournals_btn.setStyle('styleName', styleObj); @@ -380,6 +393,7 @@ private function setLabels():Void{ refresh_btn.label = Dictionary.getValue('refresh_btn'); help_btn.label = Dictionary.getValue('help_btn'); + viewAllTimeChart_btn.label = "View Time Chart"; exportPortfolio_btn.label = Dictionary.getValue('learner_exportPortfolio_btn'); viewJournals_btn.label = Dictionary.getValue('learner_viewJournals_btn'); editFly_btn.label = Dictionary.getValue('ls_sequence_live_edit_btn'); @@ -405,6 +419,7 @@ (mm.numIndexButtons > 1 || mm.inSearchView) ? monitorLearner_scp.setSize(s.w-monitorLearner_scp._x, s.h-20) : monitorLearner_scp.setSize(s.w-monitorLearner_scp._x, s.h); viewJournals_btn._x = s.w - 260; + viewAllTimeChart_btn._x = s.w - 365; exportPortfolio_btn._x = s.w - 260; editFly_btn._x = s.w - 360; refresh_btn._x = s.w - 160 Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as =================================================================== diff -u -rcdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5 -r2dd65b84334012d958de5a9c6588ded951c52dc6 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision cdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision 2dd65b84334012d958de5a9c6588ded951c52dc6) @@ -158,6 +158,7 @@ if (infoObj.tabID == _tabID && !mm.locked){ hideMainExp(mm); mm.broadcastViewUpdate("JOURNALSSHOWHIDE", true); + mm.broadcastViewUpdate("TIMECHARTSHOWHIDE", true); adjustLearnerPanel(mm); if (mm.activitiesDisplayed.isEmpty()){ @@ -430,6 +431,7 @@ var nameTextFormat = new TextFormat(); var exp_url = _root.serverURL+"learning/exportWaitingPage.jsp?mode=learner&role=teacher&lessonID="+_root.lessonID+"&userID="+learner.getLearnerId(); + var learnerTimeChart_url = _root.serverURL+"monitoring/monitoring.do?method=viewTimeChart&lessonID="+_root.lessonID+"&learnerID="+learner.getLearnerId(); if(_nameLayer_mc["learnerName"+learner.getLearnerId()] != undefined) { _nameLayer_mc["learnerName"+learner.getLearnerId()+"_btn"].removeTextField(); @@ -442,18 +444,29 @@ } _nameLayer_mc.attachMovie("Button", "learnerName"+learner.getLearnerId()+"_btn", _nameLayer_mc.getNextHighestDepth(),{label:EP_btn_label, _x:z.w-110, _y:ACT_Y+2, styleName:styleObj} ) + _nameLayer_mc.attachMovie("Button", "learnerName"+learner.getLearnerId()+"timeChart_btn", _nameLayer_mc.getNextHighestDepth(),{label:"View Time Chart", _x:z.w-220, _y:ACT_Y+2, styleName:styleObj} ) var learnerName_txt = _nameLayer_mc["learnerName"+learner.getLearnerId()]; var learnerExp_btn = _nameLayer_mc["learnerName"+learner.getLearnerId()+"_btn"]; + var learnerTimeChart_btn = _nameLayer_mc["learnerName"+learner.getLearnerId()+"timeChart_btn"]; learnerExp_btn.setSize(90, 17); learnerExp_btn.onRelease = function (){ JsPopup.getInstance().launchPopupWindow(exp_url, 'ExportPortfolio', 410, 640, true, true, false, false, false); } + learnerTimeChart_btn.setSize(94, 17); + learnerTimeChart_btn.onRelease = function (){ + Debugger.log("learnerTimeChart_url: "+learnerTimeChart_url, Debugger.GEN, "printLearner", "LearnerTabView"); + JsPopup.getInstance().launchPopupWindow(learnerTimeChart_url, 'TimeChart'+learner.getLearnerId(), 600, 400, true, true, false, false, false); + } + learnerExp_btn.onRollOver = Proxy.create(this,this['showToolTip'], learnerExp_btn, "learner_exportPortfolio_btn_tooltip"); learnerExp_btn.onRollOut = Proxy.create(this,this['hideToolTip']); + learnerTimeChart_btn.onRollOver = Proxy.create(this,this['showToolTip'], learnerTimeChart_btn, "learner_timeChart_btn_tooltip"); + learnerTimeChart_btn.onRollOut = Proxy.create(this,this['hideToolTip']); + var sLearner:mx.styles.CSSStyleDeclaration = _tm.getStyleObject("LTVLearnerText"); nameTextFormat.bold = (sLearner.getStyle("fontWeight")=="bold") ? true : false; @@ -469,6 +482,7 @@ var tempObj = new Object(); tempObj.learnerName = learnerName_txt; + tempObj.learnerTimeChartButton = learnerTimeChart_btn; tempObj.learnerButton = learnerExp_btn; learnerListArr.push(tempObj); Debugger.log("learnerListArr.length: "+learnerListArr.length, Debugger.GEN, "printLearner", "LearnerTabView"); @@ -615,6 +629,7 @@ var newWidth:Number = (_activityLayer_mc._width < scpWidth) ? scpWidth - 6 : _activityLayer_mc._width; for (var i=0; i