Index: lams_central/src/flash/lams_monitoring_v1.fla =================================================================== diff -u -r278c3f6f0251d98d690a4c02cd75da76e7b6e7fb -rf5a57ac858ce03e2894f539832d05d9e44f8133a Binary files differ Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as =================================================================== diff -u -r278c3f6f0251d98d690a4c02cd75da76e7b6e7fb -rf5a57ac858ce03e2894f539832d05d9e44f8133a --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as (.../Application.as) (revision 278c3f6f0251d98d690a4c02cd75da76e7b6e7fb) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as (.../Application.as) (revision f5a57ac858ce03e2894f539832d05d9e44f8133a) @@ -479,8 +479,8 @@ var w:Number = Stage.width; var h:Number = Stage.height; - var someListener:Object = new Object(); - someListener.onMouseUp = function () { + //var someListener:Object = new Object(); + //someListener.onMouseUp = function () { //Menu - only need to worry about width _menu_mc.setSize(w,_menu_mc._height); @@ -490,21 +490,16 @@ //_toolkit.setSize(_toolkit.width,h-TOOLKIT_Y); //Toolbar - _toolbar.setSize(w,_toolbar.height); + _toolbar.setSize(null,_toolbar.height); //Property Inspector //var pi = _canvas.getPropertyInspector(); //pi._y = h;//- pi._height; //pi._y = h - 210; - } + //} //Mouse.addListener(someListener); - - - - //Menu - only need to worry about width - _menu_mc.setSize(w,_menu_mc._height); - - //Canvas + + //Canvas // _canvas.setSize(w-_toolkit.width,h-CANVAS_Y); _lessons.setSize(_lessons.width,h-LESSONS_Y); Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/Lesson.as =================================================================== diff -u -rdd360f5738092ddfd77c34c552d1f5e3393c4d03 -rf5a57ac858ce03e2894f539832d05d9e44f8133a --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/Lesson.as (.../Lesson.as) (revision dd360f5738092ddfd77c34c552d1f5e3393c4d03) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/Lesson.as (.../Lesson.as) (revision f5a57ac858ce03e2894f539832d05d9e44f8133a) @@ -25,6 +25,7 @@ import org.lamsfoundation.lams.monitoring.ls.*; //import org.lamsfoundation.lams.monitoring.ls.Lesson; import org.lamsfoundation.lams.common.util.*; +import org.lamsfoundation.lams.common.Sequence; import mx.managers.*; /** * Monitoring - LAMS Application Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/LessonController.as =================================================================== diff -u -r278c3f6f0251d98d690a4c02cd75da76e7b6e7fb -rf5a57ac858ce03e2894f539832d05d9e44f8133a --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/LessonController.as (.../LessonController.as) (revision 278c3f6f0251d98d690a4c02cd75da76e7b6e7fb) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/LessonController.as (.../LessonController.as) (revision f5a57ac858ce03e2894f539832d05d9e44f8133a) @@ -44,7 +44,28 @@ } // control methods - + + /** + * Recieves the click events from the Lesson buttons. Based on the label + * the relevent method is called to action the user request + * @param evt + */ + public function cellPress(evt):Void{ + trace(String(evt.target)); + trace("Item index: " + evt.itemIndex); + trace('onClick event: joining lesson...'); + var seqID:String = evt.target.getItemAt(evt.itemIndex).Lesson; + trace("Lesson Name: "+seqID); + //_lessonModel = LessonModel(model); + //_lessonModel.getLesson().joinLesson(); + + /* + Debugger.log('click evt.target.label:'+evt.target.label,Debugger.GEN,'click','LessonController'); + var tgt:String = new String(evt.target); + if(tgt.indexOf("join") != -1){ + _lessonModel.getLesson().joinLesson(); + }*/ + } /** *Called by Lesson when one in clicked * @param lesson - the lesson that was clicked Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/LessonModel.as =================================================================== diff -u -r278c3f6f0251d98d690a4c02cd75da76e7b6e7fb -rf5a57ac858ce03e2894f539832d05d9e44f8133a --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/LessonModel.as (.../LessonModel.as) (revision 278c3f6f0251d98d690a4c02cd75da76e7b6e7fb) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/LessonModel.as (.../LessonModel.as) (revision f5a57ac858ce03e2894f539832d05d9e44f8133a) @@ -22,7 +22,8 @@ */ import org.lamsfoundation.lams.monitoring.ls.*; -//import org.lamsfoundation.lams.monitoring.ls.Lesson; +//import org.lamsfoundation.lams.monitoring.ls.Lesson; +import org.lamsfoundation.lams.common.Sequence; import org.lamsfoundation.lams.common.util.Observable; import org.lamsfoundation.lams.common.util.*; import org.lamsfoundation.lams.monitoring.Application; @@ -47,8 +48,14 @@ * Sequence (Lesson) Lesson container * */ + private var _lessonSequences:Hashtable; - + + /** + * View state data + */ + private var _currentlySelectedSequence:Sequence; + private var _lastSelectedSequence:Sequence; /** * Constructor. */ Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/LessonView.as =================================================================== diff -u -r3aa9b941519d2f7396693899a08f08579371faef -rf5a57ac858ce03e2894f539832d05d9e44f8133a --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/LessonView.as (.../LessonView.as) (revision 3aa9b941519d2f7396693899a08f08579371faef) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/LessonView.as (.../LessonView.as) (revision f5a57ac858ce03e2894f539832d05d9e44f8133a) @@ -48,7 +48,9 @@ private var _lesson_mc:MovieClip; private var lessonState_acc:MovieClip; - private var lsns:MovieClip; + private var lsns_Active:MovieClip; + private var lsns_Archive:MovieClip; + private var lsns_Disabled:MovieClip; //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher private var dispatchEvent:Function; public var addEventListener:Function; @@ -128,41 +130,53 @@ */ private function updateSequences(o:Observable){ - lessonState_acc.createChild("View", "active", {label: "Active"}); - lessonState_acc.createChild("View", "disabled", {label: "Disabled"}); - lessonState_acc.createChild("View", "archive", {label: "Archive"}); - //myAccordion.setSize(240, 400); - trace("---> LessonState Height: "+lessonState_acc._height) - lsns = lessonState_acc.active.createChild("DataGrid", "Data_dtg"); - lsns.setSize(lessonState_acc._width, lessonState_acc._height-63); - - //set SP the content path: - //learningSequences_sp.contentPath = "empty_mc"; - - var lbv = LessonView(this); + //get a reference to Observed LessonModel var lbm = LessonModel(o); //get the hashtable var mySeqs:Hashtable = lbm.getLessonSequences(); - + + lessonState_acc.createChild("View", "active", {label: "Active"}); + lessonState_acc.createChild("View", "disabled", {label: "Disabled"}); + lessonState_acc.createChild("View", "archive", {label: "Archive"}); + + lsns_Active = lessonState_acc.active.createChild("DataGrid", "Data_dtg"); + lsns_Active.setSize(lessonState_acc._width, lessonState_acc._height-63); + lsns_Archive = lessonState_acc.archive.createChild("DataGrid", "Data_dtg"); + lsns_Archive.setSize(lessonState_acc._width, lessonState_acc._height-63); + lsns_Disabled = lessonState_acc.disabled.createChild("DataGrid", "Data_dtg"); + lsns_Disabled.setSize(lessonState_acc._width, lessonState_acc._height-63); + var lvc = getController(); + lsns_Active.addEventListener("cellPress",lvc); //loop through the sequences var keys:Array = mySeqs.keys(); trace("Length of Keys: "+keys.length) for(var i=0; i 0 && spHeight>0) { - //toolkitLibraries_sp.setSize(spWidth,spHeight); - //} - + lsns_Active.setSize(accWidth, accHeight-63); + lsns_Archive.setSize(accWidth, accHeight-63); + lsns_Disabled.setSize(accWidth, accHeight-63); + } /** @@ -231,7 +243,10 @@ return LessonModel(model); } - + public function getController():LessonController{ + var l:Controller = super.getController(); + return LessonController(l); + } /** * Returns the default controller for this view (LessonController). * Overrides AbstractView.defaultController()