Index: lams_flash/src/central/flash/lams_monitoring_v1.fla =================================================================== diff -u -rfdf1c80df9cc884de2d9a81d6e69706049d0bcb0 -r7ab40c8ccdb695e61a1f0299757a870305dba3f6 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as =================================================================== diff -u -rfdf1c80df9cc884de2d9a81d6e69706049d0bcb0 -r7ab40c8ccdb695e61a1f0299757a870305dba3f6 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision fdf1c80df9cc884de2d9a81d6e69706049d0bcb0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 7ab40c8ccdb695e61a1f0299757a870305dba3f6) @@ -264,9 +264,8 @@ private function reloadProgress(ref, URLToSend){ var callback:Function = Proxy.create(ref, getProgressData); Application.getInstance().getComms().getRequest(URLToSend,callback, false); - //_monitorModel.updateIndexButtons(); - } + private function activitySnapBack(act:Object){ act._x = act.xCoord; act._y = act.yCoord; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as =================================================================== diff -u -rfdf1c80df9cc884de2d9a81d6e69706049d0bcb0 -r7ab40c8ccdb695e61a1f0299757a870305dba3f6 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as (.../MonitorView.as) (revision fdf1c80df9cc884de2d9a81d6e69706049d0bcb0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as (.../MonitorView.as) (revision 7ab40c8ccdb695e61a1f0299757a870305dba3f6) @@ -395,16 +395,11 @@ //monitorLesson_scp.setSize(s.w-monitorLesson_scp._x, s.h-monitorLesson_scp._y); monitorLesson_scp.setSize(s.w-monitorLesson_scp._x, s.h); - Debugger.log("s.w-monitorLesson_scp._x: "+s.w-monitorLesson_scp._x, Debugger.CRITICAL, "setSize", "MonitorView"); - Debugger.log("s.h-monitorLesson_scp._y: "+s.h-monitorLesson_scp._y, Debugger.CRITICAL, "setSize", "MonitorView"); - monitorSequence_scp.setSize(s.w-monitorSequence_scp._x, s.h-40.7); // endGate height = 40.7 monitorGateView.setSize(mm); + Debugger.log("MonitorViews.w: "+s.w, Debugger.CRITICAL, "setSize", "MonitorView"); learnerIndexView.setSize(mm); - //monitorLearner_scp.setSize(s.w-monitorLearner_scp._x, s.h-monitorLearner_scp._y); - monitorLearner_scp.setSize(s.w-monitorLearner_scp._x, s.h-20); - Debugger.log("s.w: "+s.w, Debugger.CRITICAL, "setSize", "MonitorView"); - Debugger.log("monitorLearner_scp._x: "+monitorLearner_scp._x, Debugger.CRITICAL, "setSize", "MonitorView"); + (mm.numIndexButtons > 1) ? 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; exportPortfolio_btn._x = s.w - 260; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as =================================================================== diff -u -rfdf1c80df9cc884de2d9a81d6e69706049d0bcb0 -r7ab40c8ccdb695e61a1f0299757a870305dba3f6 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as (.../LearnerIndexView.as) (revision fdf1c80df9cc884de2d9a81d6e69706049d0bcb0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as (.../LearnerIndexView.as) (revision 7ab40c8ccdb695e61a1f0299757a870305dba3f6) @@ -119,6 +119,7 @@ mm = MonitorModel(model) mm.learnerIndexView = this; + MovieClipUtils.doLater(Proxy.create(this,draw)); } @@ -141,7 +142,7 @@ setPosition(mm); } break; - case 'SIZE' : + case 'SIZE' : if (infoObj.tabID == _tabID && !mm.locked){ setSize(mm); } @@ -159,7 +160,6 @@ case 'DRAW_BUTTONS' : if (infoObj.tabID == _tabID && !mm.locked && mm.numIndexButtons>1) { if (!buttonsShown || (mm.numIndexButtons > displayedButtons.length)) { - //if (!buttonsShown || newButtonsNeeded(mm)) { setupButtons(mm); this._visible = true; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as =================================================================== diff -u -rfdf1c80df9cc884de2d9a81d6e69706049d0bcb0 -r7ab40c8ccdb695e61a1f0299757a870305dba3f6 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision fdf1c80df9cc884de2d9a81d6e69706049d0bcb0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision 7ab40c8ccdb695e61a1f0299757a870305dba3f6) @@ -125,7 +125,7 @@ learnerListArr = new Array(); panelLowered = false; hAdjustment = false; - + //Set up parameters for the grid H_GAP = 10; V_GAP = 10; @@ -307,12 +307,15 @@ } public function adjustLearnerPanel(mm:MonitorModel):Void { + + Debugger.log("adjustLearnerPanel called", Debugger.CRITICAL, "adjustLearnerPanel", "LearnerTabView"); var _scroll:ScrollPane = mm.getMonitor().getMV().getMonitorLearnerScp(); var s:Object = mm.getSize(); if (mm.numIndexButtons > 1 && !panelLowered) { if (hAdjustment) { - _scroll.setSize(s.w-_scroll._x, s.h - 20); + //_scroll.setSize(s.w-_scroll._x, s.h - 20); + _scroll.setSize(s.w-_scroll._x, s.h); hAdjustment = false; } @@ -321,10 +324,10 @@ panelLowered = true; } else if (mm.numIndexButtons <= 1 && !hAdjustment) { - //s.h += 20 _scroll.setSize(s.w-_scroll._x, s.h); hAdjustment = true; } + } public function clearCanvas(mm:MonitorModel, isChanged:Boolean):Void { @@ -611,7 +614,7 @@ learnerListHeight = Math.max(((learnersDrawnIndex)*80)+35, s.h - 25); Debugger.log("new height learnerListHeight: "+learnerListHeight, Debugger.CRITICAL, "setSize", "LearnerTabView"); } - + bkg_pnl._visible = false; bkg_pnl.setSize(_activityLayer_mc._width + 6, learnerListHeight); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as =================================================================== diff -u -rfdf1c80df9cc884de2d9a81d6e69706049d0bcb0 -r7ab40c8ccdb695e61a1f0299757a870305dba3f6 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as (.../MonitorGateView.as) (revision fdf1c80df9cc884de2d9a81d6e69706049d0bcb0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as (.../MonitorGateView.as) (revision 7ab40c8ccdb695e61a1f0299757a870305dba3f6) @@ -163,7 +163,6 @@ } private function showEndGateData(mm:MonitorModel):Void{ - Debugger.log("p1 in draw segd", Debugger.CRITICAL, "showEndGateData", "MonitorGateView"); var mc = getController(); var finishedLearners:Number = 0; var totalLearners:Number = mm.allLearnersProgress.length; @@ -186,7 +185,6 @@ } lessonEnd_lbl.text = ""+Dictionary.getValue('title_sequencetab_endGate')+" "+finishedLearners+" of "+ totalLearners; - Debugger.log("p2 in draw segd", Debugger.CRITICAL, "showEndGateData", "MonitorGateView"); } /** Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -rfdf1c80df9cc884de2d9a81d6e69706049d0bcb0 -r7ab40c8ccdb695e61a1f0299757a870305dba3f6 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -rfdf1c80df9cc884de2d9a81d6e69706049d0bcb0 -r7ab40c8ccdb695e61a1f0299757a870305dba3f6 Binary files differ