Index: lams_flash/src/central/flex/TimeChart/html-template/AC_OETags.js =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/html-template/AC_OETags.js (revision 0) +++ lams_flash/src/central/flex/TimeChart/html-template/AC_OETags.js (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,292 @@ +// Flash Player Version Detection - Rev 1.6 +// Detect Client Browser type +// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved. +var isIE = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false; +var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false; +var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false; + +function ControlVersion() +{ + var version; + var axo; + var e; + + // NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry + + try { + // version will be set for 7.X or greater players + axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7"); + version = axo.GetVariable("$version"); + } catch (e) { + } + + if (!version) + { + try { + // version will be set for 6.X players only + axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6"); + + // installed player is some revision of 6.0 + // GetVariable("$version") crashes for versions 6.0.22 through 6.0.29, + // so we have to be careful. + + // default to the first public version + version = "WIN 6,0,21,0"; + + // throws if AllowScripAccess does not exist (introduced in 6.0r47) + axo.AllowScriptAccess = "always"; + + // safe to call for 6.0r47 or greater + version = axo.GetVariable("$version"); + + } catch (e) { + } + } + + if (!version) + { + try { + // version will be set for 4.X or 5.X player + axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3"); + version = axo.GetVariable("$version"); + } catch (e) { + } + } + + if (!version) + { + try { + // version will be set for 3.X player + axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3"); + version = "WIN 3,0,18,0"; + } catch (e) { + } + } + + if (!version) + { + try { + // version will be set for 2.X player + axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash"); + version = "WIN 2,0,0,11"; + } catch (e) { + version = -1; + } + } + + return version; +} + +// JavaScript helper required to detect Flash Player PlugIn version information +function GetSwfVer(){ + // NS/Opera version >= 3 check for Flash plugin in plugin array + var flashVer = -1; + + if (navigator.plugins != null && navigator.plugins.length > 0) { + if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) { + var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : ""; + var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description; + var descArray = flashDescription.split(" "); + var tempArrayMajor = descArray[2].split("."); + var versionMajor = tempArrayMajor[0]; + var versionMinor = tempArrayMajor[1]; + var versionRevision = descArray[3]; + if (versionRevision == "") { + versionRevision = descArray[4]; + } + if (versionRevision[0] == "d") { + versionRevision = versionRevision.substring(1); + } else if (versionRevision[0] == "r") { + versionRevision = versionRevision.substring(1); + if (versionRevision.indexOf("d") > 0) { + versionRevision = versionRevision.substring(0, versionRevision.indexOf("d")); + } + } else if (versionRevision[0] == "b") { + versionRevision = versionRevision.substring(1); + } + var flashVer = versionMajor + "." + versionMinor + "." + versionRevision; + } + } + // MSN/WebTV 2.6 supports Flash 4 + else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4; + // WebTV 2.5 supports Flash 3 + else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3; + // older WebTV supports Flash 2 + else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2; + else if ( isIE && isWin && !isOpera ) { + flashVer = ControlVersion(); + } + return flashVer; +} + +// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available +function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision) +{ + versionStr = GetSwfVer(); + if (versionStr == -1 ) { + return false; + } else if (versionStr != 0) { + if(isIE && isWin && !isOpera) { + // Given "WIN 2,0,0,11" + tempArray = versionStr.split(" "); // ["WIN", "2,0,0,11"] + tempString = tempArray[1]; // "2,0,0,11" + versionArray = tempString.split(","); // ['2', '0', '0', '11'] + } else { + versionArray = versionStr.split("."); + } + var versionMajor = versionArray[0]; + var versionMinor = versionArray[1]; + var versionRevision = versionArray[2]; + + // is the major.revision >= requested major.revision AND the minor version >= requested minor + if (versionMajor > parseFloat(reqMajorVer)) { + return true; + } else if (versionMajor == parseFloat(reqMajorVer)) { + if (versionMinor > parseFloat(reqMinorVer)) + return true; + else if (versionMinor == parseFloat(reqMinorVer)) { + if (versionRevision >= parseFloat(reqRevision)) + return true; + } + } + return false; + } +} + +function AC_AddExtension(src, ext) +{ + var qIndex = src.indexOf('?'); + if ( qIndex != -1) + { + // Add the extention (if needed) before the query params + var path = src.substring(0, qIndex); + if (path.length >= ext.length && path.lastIndexOf(ext) == (path.length - ext.length)) + return src; + else + return src.replace(/\?/, ext+'?'); + } + else + { + // Add the extension (if needed) to the end of the URL + if (src.length >= ext.length && src.lastIndexOf(ext) == (src.length - ext.length)) + return src; // Already have extension + else + return src + ext; + } +} + +function AC_Generateobj(objAttrs, params, embedAttrs) +{ + var str = ''; + if (isIE && isWin && !isOpera) + { + str += ' '; + str += ''; + } else { + str += ' 0 && typeof o[0].SetVariable != "undefined") { + return o[0]; + } + else if (e.length > 0 && typeof e[0].SetVariable != "undefined") { + return e[0]; + } + } + } + else { + var o = document.getElementsByTagName("object"); + var e = document.getElementsByTagName("embed"); + if (e.length > 0 && typeof e[0].SetVariable != "undefined") { + return e[0]; + } + else if (o.length > 0 && typeof o[0].SetVariable != "undefined") { + return o[0]; + } + else if (o.length > 1 && typeof o[1].SetVariable != "undefined") { + return o[1]; + } + } + return undefined; + } + + function getPlayers() { + var players = []; + if (players.length == 0) { + var tmp = document.getElementsByTagName('object'); + players = tmp; + } + + if (players.length == 0 || players[0].object == null) { + var tmp = document.getElementsByTagName('embed'); + players = tmp; + } + return players; + } + + function getIframeHash() { + var doc = getHistoryFrame().contentWindow.document; + var hash = String(doc.location.search); + if (hash.length == 1 && hash.charAt(0) == "?") { + hash = ""; + } + else if (hash.length >= 2 && hash.charAt(0) == "?") { + hash = hash.substring(1); + } + return hash; + } + + /* Get the current location hash excluding the '#' symbol. */ + function getHash() { + // It would be nice if we could use document.location.hash here, + // but it's faulty sometimes. + var idx = document.location.href.indexOf('#'); + return (idx >= 0) ? document.location.href.substr(idx+1) : ''; + } + + /* Get the current location hash excluding the '#' symbol. */ + function setHash(hash) { + // It would be nice if we could use document.location.hash here, + // but it's faulty sometimes. + if (hash == '') hash = '#' + document.location.hash = hash; + } + + function createState(baseUrl, newUrl, flexAppUrl) { + return { 'baseUrl': baseUrl, 'newUrl': newUrl, 'flexAppUrl': flexAppUrl, 'title': null }; + } + + /* Add a history entry to the browser. + * baseUrl: the portion of the location prior to the '#' + * newUrl: the entire new URL, including '#' and following fragment + * flexAppUrl: the portion of the location following the '#' only + */ + function addHistoryEntry(baseUrl, newUrl, flexAppUrl) { + + //delete all the history entries + forwardStack = []; + + if (browser.ie) { + //Check to see if we are being asked to do a navigate for the first + //history entry, and if so ignore, because it's coming from the creation + //of the history iframe + if (flexAppUrl == defaultHash && document.location.href == initialHref && window['_ie_firstload']) { + currentHref = initialHref; + return; + } + if ((!flexAppUrl || flexAppUrl == defaultHash) && window['_ie_firstload']) { + newUrl = baseUrl + '#' + defaultHash; + flexAppUrl = defaultHash; + } else { + // for IE, tell the history frame to go somewhere without a '#' + // in order to get this entry into the browser history. + getHistoryFrame().src = historyFrameSourcePrefix + flexAppUrl; + } + setHash(flexAppUrl); + } else { + + //ADR + if (backStack.length == 0 && initialState.flexAppUrl == flexAppUrl) { + initialState = createState(baseUrl, newUrl, flexAppUrl); + } else if(backStack.length > 0 && backStack[backStack.length - 1].flexAppUrl == flexAppUrl) { + backStack[backStack.length - 1] = createState(baseUrl, newUrl, flexAppUrl); + } + + if (browser.safari) { + // for Safari, submit a form whose action points to the desired URL + if (browser.version <= 419.3) { + var file = window.location.pathname.toString(); + file = file.substring(file.lastIndexOf("/")+1); + getFormElement().innerHTML = '
'; + //get the current elements and add them to the form + var qs = window.location.search.substring(1); + var qs_arr = qs.split("&"); + for (var i = 0; i < qs_arr.length; i++) { + var tmp = qs_arr[i].split("="); + var elem = document.createElement("input"); + elem.type = "hidden"; + elem.name = tmp[0]; + elem.value = tmp[1]; + document.forms.historyForm.appendChild(elem); + } + document.forms.historyForm.submit(); + } else { + top.location.hash = flexAppUrl; + } + // We also have to maintain the history by hand for Safari + historyHash[history.length] = flexAppUrl; + _storeStates(); + } else { + // Otherwise, write an anchor into the page and tell the browser to go there + addAnchor(flexAppUrl); + setHash(flexAppUrl); + } + } + backStack.push(createState(baseUrl, newUrl, flexAppUrl)); + } + + function _storeStates() { + if (browser.safari) { + getRememberElement().value = historyHash.join(","); + } + } + + function handleBackButton() { + //The "current" page is always at the top of the history stack. + var current = backStack.pop(); + if (!current) { return; } + var last = backStack[backStack.length - 1]; + if (!last && backStack.length == 0){ + last = initialState; + } + forwardStack.push(current); + } + + function handleForwardButton() { + //summary: private method. Do not call this directly. + + var last = forwardStack.pop(); + if (!last) { return; } + backStack.push(last); + } + + function handleArbitraryUrl() { + //delete all the history entries + forwardStack = []; + } + + /* Called periodically to poll to see if we need to detect navigation that has occurred */ + function checkForUrlChange() { + + if (browser.ie) { + if (currentHref != document.location.href && currentHref + '#' != document.location.href) { + //This occurs when the user has navigated to a specific URL + //within the app, and didn't use browser back/forward + //IE seems to have a bug where it stops updating the URL it + //shows the end-user at this point, but programatically it + //appears to be correct. Do a full app reload to get around + //this issue. + if (browser.version < 7) { + currentHref = document.location.href; + document.location.reload(); + } else { + if (getHash() != getIframeHash()) { + // this.iframe.src = this.blankURL + hash; + var sourceToSet = historyFrameSourcePrefix + getHash(); + getHistoryFrame().src = sourceToSet; + } + } + } + } + + if (browser.safari) { + // For Safari, we have to check to see if history.length changed. + if (currentHistoryLength >= 0 && history.length != currentHistoryLength) { + //alert("did change: " + history.length + ", " + historyHash.length + "|" + historyHash[history.length] + "|>" + historyHash.join("|")); + // If it did change, then we have to look the old state up + // in our hand-maintained array since document.location.hash + // won't have changed, then call back into BrowserManager. + currentHistoryLength = history.length; + var flexAppUrl = historyHash[currentHistoryLength]; + if (flexAppUrl == '') { + //flexAppUrl = defaultHash; + } + //ADR: to fix multiple + if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) { + var pl = getPlayers(); + for (var i = 0; i < pl.length; i++) { + pl[i].browserURLChange(flexAppUrl); + } + } else { + getPlayer().browserURLChange(flexAppUrl); + } + _storeStates(); + } + } + if (browser.firefox) { + if (currentHref != document.location.href) { + var bsl = backStack.length; + + var urlActions = { + back: false, + forward: false, + set: false + } + + if ((window.location.hash == initialHash || window.location.href == initialHref) && (bsl == 1)) { + urlActions.back = true; + // FIXME: could this ever be a forward button? + // we can't clear it because we still need to check for forwards. Ugg. + // clearInterval(this.locationTimer); + handleBackButton(); + } + + // first check to see if we could have gone forward. We always halt on + // a no-hash item. + if (forwardStack.length > 0) { + if (forwardStack[forwardStack.length-1].flexAppUrl == getHash()) { + urlActions.forward = true; + handleForwardButton(); + } + } + + // ok, that didn't work, try someplace back in the history stack + if ((bsl >= 2) && (backStack[bsl - 2])) { + if (backStack[bsl - 2].flexAppUrl == getHash()) { + urlActions.back = true; + handleBackButton(); + } + } + + if (!urlActions.back && !urlActions.forward) { + var foundInStacks = { + back: -1, + forward: -1 + } + + for (var i = 0; i < backStack.length; i++) { + if (backStack[i].flexAppUrl == getHash() && i != (bsl - 2)) { + arbitraryUrl = true; + foundInStacks.back = i; + } + } + for (var i = 0; i < forwardStack.length; i++) { + if (forwardStack[i].flexAppUrl == getHash() && i != (bsl - 2)) { + arbitraryUrl = true; + foundInStacks.forward = i; + } + } + handleArbitraryUrl(); + } + + // Firefox changed; do a callback into BrowserManager to tell it. + currentHref = document.location.href; + var flexAppUrl = getHash(); + if (flexAppUrl == '') { + //flexAppUrl = defaultHash; + } + //ADR: to fix multiple + if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) { + var pl = getPlayers(); + for (var i = 0; i < pl.length; i++) { + pl[i].browserURLChange(flexAppUrl); + } + } else { + getPlayer().browserURLChange(flexAppUrl); + } + } + } + //setTimeout(checkForUrlChange, 50); + } + + /* Write an anchor into the page to legitimize it as a URL for Firefox et al. */ + function addAnchor(flexAppUrl) + { + if (document.getElementsByName(flexAppUrl).length == 0) { + getAnchorElement().innerHTML += "" + flexAppUrl + ""; + } + } + + var _initialize = function () { + if (browser.ie) + { + var scripts = document.getElementsByTagName('script'); + for (var i = 0, s; s = scripts[i]; i++) { + if (s.src.indexOf("history.js") > -1) { + var iframe_location = (new String(s.src)).replace("history.js", "historyFrame.html"); + } + } + historyFrameSourcePrefix = iframe_location + "?"; + var src = historyFrameSourcePrefix; + + var iframe = document.createElement("iframe"); + iframe.id = 'ie_historyFrame'; + iframe.name = 'ie_historyFrame'; + //iframe.src = historyFrameSourcePrefix; + try { + document.body.appendChild(iframe); + } catch(e) { + setTimeout(function() { + document.body.appendChild(iframe); + }, 0); + } + } + + if (browser.safari) + { + var rememberDiv = document.createElement("div"); + rememberDiv.id = 'safari_rememberDiv'; + document.body.appendChild(rememberDiv); + rememberDiv.innerHTML = ''; + + var formDiv = document.createElement("div"); + formDiv.id = 'safari_formDiv'; + document.body.appendChild(formDiv); + + var reloader_content = document.createElement('div'); + reloader_content.id = 'safarireloader'; + var scripts = document.getElementsByTagName('script'); + for (var i = 0, s; s = scripts[i]; i++) { + if (s.src.indexOf("history.js") > -1) { + html = (new String(s.src)).replace(".js", ".html"); + } + } + reloader_content.innerHTML = ''; + document.body.appendChild(reloader_content); + reloader_content.style.position = 'absolute'; + reloader_content.style.left = reloader_content.style.top = '-9999px'; + iframe = reloader_content.getElementsByTagName('iframe')[0]; + + if (document.getElementById("safari_remember_field").value != "" ) { + historyHash = document.getElementById("safari_remember_field").value.split(","); + } + + } + + if (browser.firefox) + { + var anchorDiv = document.createElement("div"); + anchorDiv.id = 'firefox_anchorDiv'; + document.body.appendChild(anchorDiv); + } + + //setTimeout(checkForUrlChange, 50); + } + + return { + historyHash: historyHash, + backStack: function() { return backStack; }, + forwardStack: function() { return forwardStack }, + getPlayer: getPlayer, + initialize: function(src) { + _initialize(src); + }, + setURL: function(url) { + document.location.href = url; + }, + getURL: function() { + return document.location.href; + }, + getTitle: function() { + return document.title; + }, + setTitle: function(title) { + try { + backStack[backStack.length - 1].title = title; + } catch(e) { } + //if on safari, set the title to be the empty string. + if (browser.safari) { + if (title == "") { + try { + var tmp = window.location.href.toString(); + title = tmp.substring((tmp.lastIndexOf("/")+1), tmp.lastIndexOf("#")); + } catch(e) { + title = ""; + } + } + } + document.title = title; + }, + setDefaultURL: function(def) + { + defaultHash = def; + def = getHash(); + //trailing ? is important else an extra frame gets added to the history + //when navigating back to the first page. Alternatively could check + //in history frame navigation to compare # and ?. + if (browser.ie) + { + window['_ie_firstload'] = true; + var sourceToSet = historyFrameSourcePrefix + def; + var func = function() { + getHistoryFrame().src = sourceToSet; + window.location.replace("#" + def); + setInterval(checkForUrlChange, 50); + } + try { + func(); + } catch(e) { + window.setTimeout(function() { func(); }, 0); + } + } + + if (browser.safari) + { + currentHistoryLength = history.length; + if (historyHash.length == 0) { + historyHash[currentHistoryLength] = def; + var newloc = "#" + def; + window.location.replace(newloc); + } else { + //alert(historyHash[historyHash.length-1]); + } + //setHash(def); + setInterval(checkForUrlChange, 50); + } + + + if (browser.firefox || browser.opera) + { + var reg = new RegExp("#" + def + "$"); + if (window.location.toString().match(reg)) { + } else { + var newloc ="#" + def; + window.location.replace(newloc); + } + setInterval(checkForUrlChange, 50); + //setHash(def); + } + + }, + + /* Set the current browser URL; called from inside BrowserManager to propagate + * the application state out to the container. + */ + setBrowserURL: function(flexAppUrl, objectId) { + if (browser.ie && typeof objectId != "undefined") { + currentObjectId = objectId; + } + //fromIframe = fromIframe || false; + //fromFlex = fromFlex || false; + //alert("setBrowserURL: " + flexAppUrl); + //flexAppUrl = (flexAppUrl == "") ? defaultHash : flexAppUrl ; + + var pos = document.location.href.indexOf('#'); + var baseUrl = pos != -1 ? document.location.href.substr(0, pos) : document.location.href; + var newUrl = baseUrl + '#' + flexAppUrl; + + if (document.location.href != newUrl && document.location.href + '#' != newUrl) { + currentHref = newUrl; + addHistoryEntry(baseUrl, newUrl, flexAppUrl); + currentHistoryLength = history.length; + } + + return false; + }, + + browserURLChange: function(flexAppUrl) { + var objectId = null; + if (browser.ie && currentObjectId != null) { + objectId = currentObjectId; + } + pendingURL = ''; + + if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) { + var pl = getPlayers(); + for (var i = 0; i < pl.length; i++) { + try { + pl[i].browserURLChange(flexAppUrl); + } catch(e) { } + } + } else { + try { + getPlayer(objectId).browserURLChange(flexAppUrl); + } catch(e) { } + } + + currentObjectId = null; + } + + } + +})(); + +// Initialization + +// Automated unit testing and other diagnostics + +function setURL(url) +{ + document.location.href = url; +} + +function backButton() +{ + history.back(); +} + +function forwardButton() +{ + history.forward(); +} + +function goForwardOrBackInHistory(step) +{ + history.go(step); +} + +//BrowserHistoryUtils.addEvent(window, "load", function() { BrowserHistory.initialize(); }); +(function(i) { + var u =navigator.userAgent;var e=/*@cc_on!@*/false; + var st = setTimeout; + if(/webkit/i.test(u)){ + st(function(){ + var dr=document.readyState; + if(dr=="loaded"||dr=="complete"){i()} + else{st(arguments.callee,10);}},10); + } else if((/mozilla/i.test(u)&&!/(compati)/.test(u)) || (/opera/i.test(u))){ + document.addEventListener("DOMContentLoaded",i,false); + } else if(e){ + (function(){ + var t=document.createElement('doc:rdy'); + try{t.doScroll('left'); + i();t=null; + }catch(e){st(arguments.callee,0);}})(); + } else{ + window.onload=i; + } +})( function() {BrowserHistory.initialize();} ); Index: lams_flash/src/central/flex/TimeChart/html-template/history/historyFrame.html =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/html-template/history/historyFrame.html (revision 0) +++ lams_flash/src/central/flex/TimeChart/html-template/history/historyFrame.html (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,29 @@ + + + + + + + + Hidden frame for Browser History support. + + Index: lams_flash/src/central/flex/TimeChart/html-template/index.template.html =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/html-template/index.template.html (revision 0) +++ lams_flash/src/central/flex/TimeChart/html-template/index.template.html (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,121 @@ + + + + + + + + + + + + +${title} + + + + + + + + + + + + + + + Index: lams_flash/src/central/flex/TimeChart/html-template/playerProductInstall.swf =================================================================== diff -u Binary files differ Index: lams_flash/src/central/flex/TimeChart/src/TimeChart.mxml =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/TimeChart.mxml (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/TimeChart.mxml (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_flash/src/central/flex/TimeChart/src/assets/styles/main.css =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/assets/styles/main.css (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/assets/styles/main.css (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,59 @@ +/* CSS file */ +Application { + backgroundColor: #FFFFFF; + themeColor: #0087e5; +} + +Alert { + backgroundColor: #FFFFFF; + color: #000000; +} + + +Panel { + borderColor: #6abcec; + borderThicknessLeft: 1; + borderThicknessRight: 1; + borderThicknessBottom: 1; + borderAlpha: 1; + + paddingTop: 0; + paddingLeft: 0; + paddingRight: 0; + paddingBottom: 0; + + highlightAlphas: 0.67, 0; + headerColors: #000000, #0087e5; + + titleStyleName: "myPanelStyle"; +} + +MainUI { + horizontalAlign : center; +} + +.mainBody { + backgroundColor: #FFFFFF; + paddingTop: 20; + horizontalAlign : center; +} + +Form, Label, TextInput { + color: #000000; + font-weight: normal; +} + +FormItem, List { + font-weight: bold; + text-align: left; +} + +.myPanelStyle { + color: #FFFFFF; +} + +.panelText { + color: #000000; + font-weight: none; + text-align: left; +} Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/ChartManager.as =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/ChartManager.as (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/ChartManager.as (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,192 @@ +package org.lamsfoundation.lams.business +{ + import flash.events.Event; + import flash.events.EventDispatcher; + + import mx.collections.ArrayCollection; + + import org.lamsfoundation.lams.common.dictionary.XMLDictionary; + import org.lamsfoundation.lams.events.DictionaryEvent; + import org.lamsfoundation.lams.vos.CompletedActivity; + import org.lamsfoundation.lams.vos.LearnerProgress; + + public class ChartManager extends EventDispatcher + { + /*-.........................................Properties..........................................*/ + private var _progressList:ArrayCollection; + + private var _averageProgress:ArrayCollection; + private var _targetFilterActivity:Number; + + private var _learnerProgress:LearnerProgress; + + private var _settings:Array; + private var _loadType:String; + private var _dictionary:XMLDictionary; + + /*-.........................................Constructor..........................................*/ + public function ChartManager() + { + _averageProgress = new ArrayCollection(); + } + + /*-.........................................Setters and Getters..........................................*/ + + [Bindable (event="learnerProgressListChanged")] + public function get progressList():ArrayCollection + { + return _progressList; + } + + [Bindable (event="averageProgressListChanged")] + public function get averageProgress():ArrayCollection + { + return _averageProgress; + } + + [Bindable (event="learnerProgressChanged")] + public function get learnerProgress():LearnerProgress + { + return _learnerProgress; + } + + [Bindable (event="chartDictionaryChanged")] + public function get dictionary():XMLDictionary + { + return _dictionary; + } + + public function get loadType():String + { + return _loadType; + } + + public function setDictionary(xml:XML):void { + _dictionary = new XMLDictionary(xml); + } + + public function setLabel(event:DictionaryEvent, key:String):void { + event.result = _dictionary.getLabel(key); + } + + /*-.........................................Methods..........................................*/ + + // ----------------------------------------------------------- + public function updateProgressList(progressList:ArrayCollection):void { + this._progressList = progressList; + + doAverage(); + + dispatchEvent(new Event('learnerProgressListChanged')); + + + } + + public function doAverage():void { + var average:ArrayCollection = new ArrayCollection(); + averageFilter(average); + + + // create data objects for completed activity and calculate average + for each(var learnerProgress:LearnerProgress in this._progressList) { + var c_count:int = 0; + trace('progress user: ' + learnerProgress.learner_username); + for each(var completedActivity:CompletedActivity in learnerProgress.completedActivities) { + var _prev:CompletedActivity = (c_count > 0) ? learnerProgress.getCompletedActivity(c_count-1) : null; + completedActivity.createDataObject(_prev, learnerProgress); + + updateAverage(completedActivity, average); + + c_count++; + } + } + + trace('updated progress list: ' + progressList.length); + + clearAverageFilter(average); + + trace('average list: ' + _averageProgress.length); + _averageProgress = average; + dispatchEvent(new Event('averageProgressListChanged')); + + } + + private function updateAverage(completedActivity:CompletedActivity, average:ArrayCollection):void { + _targetFilterActivity = completedActivity.aid; + average.refresh(); + + if(average.length > 0) { + var item:Object = average.getItemAt(0); + + item.Completed = (item.Completed + completedActivity.dataObject.Completed)/2; + + item.Duration = (item.Duration + completedActivity.dataObject.Duration)/2; + + trace('updating... avg (' + item.Duration + ')'); + } else { + var itemObj:Object = completedActivity.cloneDataObject("average"); + itemObj.Average = true; + + trace('adding... avg(' + itemObj.Duration + ')'); + + average.addItem(itemObj); + } + } + + // ----------- filters ----------------------------- + private function averageFilter(average:ArrayCollection):void { + average.filterFunction = calculateAverage; + average.refresh(); + } + + private function clearAverageFilter(average:ArrayCollection):void { + _targetFilterActivity = -1; + average.filterFunction = null; + average.refresh(); + } + + private function calculateAverage(item:Object):Boolean { + if(_targetFilterActivity == -1) + return true; + else if(item.Activity == _targetFilterActivity) + return true; + else + return false; + } + + // ----------------------------------------------------------- + public function showLearnerProgress(learnerProgress:LearnerProgress):void { + this._learnerProgress = learnerProgress; + dispatchEvent(new Event('learnerProgressChanged')); + } + + public function loadChartSettings(settings:Array):void { + this._settings = settings; + dispatchEvent(new Event('chartSettingsChanged')); + } + + public function loadChartData(data:Object, type:String):void { + var _newProgress:ArrayCollection = new ArrayCollection(); + + _loadType = type; + + for each(var learnerProgress:Object in data) + _newProgress.addItem(createNewProgress(learnerProgress)); + + updateProgressList(_newProgress); + + } + + private function createNewProgress(newLearnerProgress:Object):LearnerProgress { + var _newLearnerProgress:LearnerProgress = new LearnerProgress(newLearnerProgress); + + for each(var completedActivity:Object in newLearnerProgress.completedActivities) { + var _completedActivity:CompletedActivity = new CompletedActivity(completedActivity); + _newLearnerProgress.addCompletedActivity(_completedActivity); + } + + return _newLearnerProgress; + + } + } +} \ No newline at end of file Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/SearchManager.as =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/SearchManager.as (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/SearchManager.as (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,55 @@ +package org.lamsfoundation.lams.business +{ + import flash.events.EventDispatcher; + import flash.events.Event; + + import mx.collections.ArrayCollection; + + import org.lamsfoundation.lams.events.*; + import org.lamsfoundation.lams.vos.Search; + + + public class SearchManager extends EventDispatcher + { + /*-.........................................Properties..........................................*/ + private var learnerProgress:ArrayCollection; + + /*-.........................................Constructor..........................................*/ + public function SearchManager() + { + } + + [Bindable (event="resultsUpdated")] + public function get results():ArrayCollection { + return learnerProgress; + } + + /*-.........................................Methods..........................................*/ + + public function search(query:Search):ArrayCollection { + // load results from Search query + var results:ArrayCollection = new ArrayCollection(); + + trace("search query..."); + if(query != null) { + // call search service + //for each( var completedAct:ComplexActivity in ) { + // if completedAct datetime match query conditions + // add to results + //} + + trace("received query..."); + } + + learnerProgress = results; + dispatchEvent(new Event('resultsUpdated')); + + return this.results; + } + + public function clearResults():void { + if(learnerProgress.length > 0) + learnerProgress.removeAll(); + } + } +} \ No newline at end of file Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/WDDXParser.as =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/WDDXParser.as (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/WDDXParser.as (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,29 @@ +package org.lamsfoundation.lams.business +{ + + import flash.xml.XMLNode; + import mx.collections.ArrayCollection; + import org.lamsfoundation.lams.vos.LearnerProgress; + + import pl.cfml.coldfusion.as3.utils.WDDX; + + public class WDDXParser + { + + public function WDDXParser() + { + } + + public function parseObject(node:XMLNode):Object { + var xml:XML = new XML(node); + if(node == null) + return null; + + var data:Object = WDDX.fromWDDX(xml.toXMLString()); + + + return data.messageValue; + } + + } +} \ No newline at end of file Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/ChartEvent.as =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/ChartEvent.as (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/ChartEvent.as (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,51 @@ +package org.lamsfoundation.lams.events +{ + import flash.events.Event; + + import mx.collections.ArrayCollection; + import mx.core.Application; + + import org.lamsfoundation.lams.vos.LearnerProgress; + + public class ChartEvent extends Event + { + /*-.........................................Constants..........................................*/ + + public static const UPDATE: String = "updateLearnerProgressEvent"; + public static const SELECT: String = "showLearnerProgressEvent"; + //public static const HIDE: String = "hideLearnerProgressEvent"; + + public static const LOAD: String = "loadLearnerProgressEvent"; + public static const LOAD_LEARNER: String = "loadLearnerProgressSingleEvent"; + public static const LOAD_CLASS: String = "loadLearnerProgressAllEvent"; + + public static const DICTIONARY: String = "loadDictionaryEvent"; + + /*-.........................................Properties..........................................*/ + public var learnerProgressList:ArrayCollection; + public var learnerProgress:LearnerProgress; + + public var lessonID:Number; + public var learnerID:Number; + + /*-.........................................Constructor..........................................*/ + + public function ChartEvent(type:String, bubbles:Boolean=true, cancelable:Boolean=false) + { + lessonID = Application.application.parameters.lessonID; + learnerID = Application.application.parameters.learnerID; + + // determine if we are loading chart data for class or a single learner + if(type == LOAD) { + if(lessonID && learnerID) + type = LOAD_LEARNER; + else + type = LOAD_CLASS; + } + + super(type, bubbles, cancelable); + + } + + } +} \ No newline at end of file Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/DictionaryEvent.as =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/DictionaryEvent.as (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/DictionaryEvent.as (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,26 @@ +package org.lamsfoundation.lams.events +{ + import flash.events.Event; + + public class DictionaryEvent extends Event + { + /*-.........................................Constants..........................................*/ + + public static const LOAD: String = "loadEvent"; + public static const GET: String = "getEvent"; + public static const UPDATE: String = "updateEvent"; + + + /*-.........................................Properties..........................................*/ + public var labelKey:String; + public var result:String; + + /*-.........................................Constructor..........................................*/ + + public function DictionaryEvent(type:String, bubbles:Boolean=true, cancelable:Boolean=false) + { + super(type, bubbles, cancelable); + } + + } +} \ No newline at end of file Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/NavigationEvent.as =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/NavigationEvent.as (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/NavigationEvent.as (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,20 @@ +package org.lamsfoundation.lams.events +{ + import org.lamsfoundation.lams.vos.*; + + import flash.events.Event; + + public class NavigationEvent extends Event + { + /*-.........................................Constants..........................................*/ + + public static const CHART: String = "chartNavigationEvent" + + /*-.........................................Constructor..........................................*/ + public function NavigationEvent(type:String, bubbles:Boolean=true, cancelable:Boolean=false) + { + super(type, bubbles, cancelable); + } + + } +} \ No newline at end of file Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/MainEventMap.mxml =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/MainEventMap.mxml (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/MainEventMap.mxml (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/ModelMap.mxml =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/ModelMap.mxml (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/ModelMap.mxml (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_eventHandlers.as =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_eventHandlers.as (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_eventHandlers.as (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,75 @@ +/** Event handler functions for Chart.mxml **/ +import flash.events.Event; + + private function chartControlHandler(event:ItemClickEvent):void { + if(event.index == 0) { + Button(event.currentTarget.getChildAt(1)).enabled = true; + chartViews.selectedIndex = LEARNER; + } else { + chartViews.selectedIndex = CLASS; + Button(event.currentTarget.getChildAt(0)).enabled = true; + } + + Button(event.currentTarget.getChildAt(event.index)).enabled = false; + } + + private function dataLearnerPlot(cat:mx.charts.CategoryAxis, item:Object):Object { + return item.Activity; + } + + private function labelLinAxis(item:Number, prevValue:Number, axis:IAxis):Object { + var value:Number = item/60; + return value.toFixed(1); + } + + private function labelLearnerPlot(categoryValue:Object, previousCategoryValue:Object, axis:CategoryAxis, categoryItem:Object):String { + return categoryItem.Title; + } + + private function learnerPlotDataTrip(hd:HitData):String { + + var formatStr:String = "" + hd.item.Title + ""; + + formatStr += " " + completed_lbl + "
" + formatTime(hd.item.Completed); + if(hd.item.Average) formatStr += "
" + learner_datatip_average + ""; + + return formatStr; + } + + public function learnerPieDataTip(hd:HitData):String { + var formatStr:String = "" + hd.item.Title + ": " + + Math.round(Number(PieSeriesItem(hd.chartItem).percentValue)) + + "%
" + + "("; + var duration:uint = hd.item.Duration; + formatStr += formatTime(duration) + ")"; + + return formatStr; + } + + public function clearSearch(event:Event):void { + event.currentTarget.text = ""; + learnerProgressData.refresh(); + } + + public function applyFilter():void { + + if(learnerProgressData.length > 0) + learnerProgressData.filterFunction = searchLearners; + + selectedLearner_cmb.selectedIndex = 0; + selectedLearner_cmb.selectedItem = null; + + learnerProgressData.refresh(); + + trace('applying filter: ' + learnerProgressData.length); + + var idx:int = learnerProgressData.getItemIndex(selectedLearnerProgress); + + if(idx >= 0) + selectedLearner_cmb.selectedIndex = idx; + else if(learnerProgressData.length > 0) { + selectedLearner_cmb.selectedIndex = 1; + selectLearner(selectedLearner_cmb.selectedItem); + } + } \ No newline at end of file Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_functions.as =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_functions.as (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_functions.as (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,101 @@ +/** General functions for Chart.mxml **/ +import flash.events.Event; + +import mx.collections.ArrayCollection; + +import org.lamsfoundation.lams.vos.LearnerProgress; + + public function set averageProgressList(averageProgressList:ArrayCollection):void { + _averageProgressList = averageProgressList; + + if(_averageProgressList.length > 0) + trace('avg first: ' + _averageProgressList.getItemAt(0).Completed); + + if(_averageProgressList.length > 0) + showAverage.enabled = true; + } + + private function getCompletedLabel(categoryValue:Object, previousCategoryValue:Object, axis:CategoryAxis, categoryItem:Object):String + { + return CompletedActivity(categoryValue).title; + } + + public function loadSelectedLearner():void { + _learnerProgressList = new ArrayCollection(); + + if(selectedLearnerProgress == null) { + selectLearner(learnerProgressData.getItemAt(0)); + return; + } + + chart_lbl.htmlText = "" + learner_lbl + " :: " + selectedLearnerProgress.learner_fname + " " + selectedLearnerProgress.learner_lname + ""; + + for each(var cp:CompletedActivity in selectedLearnerProgress.completedActivities) { + _learnerProgressList.addItem(cp.dataObject); + + trace('adding new c: ' + cp.dataObject.Completed); + trace('adding new t: ' + cp.dataObject.Title); + trace('adding new d: ' + cp.dataObject.Duration); + } + + } + + public function selectActivity(item:Object):void { + } + + private function selectLearner(item:Object):void { + // throw event to load selected learner + var event:ChartEvent = new ChartEvent(ChartEvent.SELECT); + event.learnerProgress = item as LearnerProgress; + + this.dispatchEvent(event); + } + + private function selectLearnerEvent(evt:Event):void { + selectLearner(evt.currentTarget.selectedItem); + } + + private function learnerName(data:Object):String { + return data.learner_fname + " " + data.learner_lname; + } + + /** + * Format Time value + * @param value amount of seconds to be formats to string + * @return formatted time value + **/ + private function formatTime(value:Number):String { + var formatStr:String = ""; + + //Find The Seconds + var Seconds:Number = value%60; + + //Find The Minutes + var Minutes:Number = (value/60); + + //Find The Hours + var Hours:Number = (value/3600); + + if(Hours > 1) + formatStr += Hours.toFixed(0) + " " + chart_time_hrs_lbl + " "; + + if(Minutes > 1) formatStr += Number(Minutes).toFixed(1) + " " + chart_time_mins_lbl + " "; + else formatStr += Seconds + " " + chart_time_secs_lbl; + + return formatStr; + } + + // filter function for learner search + public function searchLearners(item:Object):Boolean { + var lp:LearnerProgress = item as LearnerProgress; + var name:String = learnerName(lp); + + trace('searching... : ' + name); + + if(learnerName(lp).search(searchLearner_txt.text) >= 0) + return true; + + return false; + } + + Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_labels.as =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_labels.as (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_labels.as (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,88 @@ +/** include file for Chart labels **/ +import flash.utils.Dictionary; + +import org.lamsfoundation.lams.common.dictionary.XMLDictionary; + + [Bindable] + private var chartTitle:String = ""; + + [Bindable] + private var activity_split_lbl:String = ""; + + [Bindable] + private var completion_rate_lbl:String = ""; + + [Bindable] + private var learner_linear_axis_lbl:String = ""; + + [Bindable] + private var learner_category_axis_lbl:String = ""; + + [Bindable] + private var completed_lbl:String = ""; + + [Bindable] + private var learner_datatip_average:String = ""; + + [Bindable] + private var learner_lbl:String = ""; + + [Bindable] + private var chart_time_hrs_lbl:String = ""; + + [Bindable] + private var chart_time_mins_lbl:String = ""; + + [Bindable] + private var chart_time_secs_lbl:String = ""; + + [Bindable] + private var chart_completed_time_lbl:String = ""; + + [Bindable] + private var chart_average_time_lbl:String = ""; + + [Bindable] + private var chart_legend_average_lbl:String = ""; + + [Bindable] + private var chart_duration_lbl:String = ""; + + [Bindable] + private var chart_average_cb_lbl:String = ""; + + [Bindable] + private var search_learner_txt_lbl:String = ""; + + private function getLabel(key:String):String { + var event:DictionaryEvent = new DictionaryEvent(DictionaryEvent.GET); + event.labelKey = key; + this.dispatchEvent(event); + + return event.result; + } + + private function updateLabels():void { + + chartTitle = getLabel("time.chart.panel.title"); + activity_split_lbl = getLabel("chart.btn.activity.split"); + completion_rate_lbl = getLabel("chart.btn_completion.rate"); + learner_linear_axis_lbl = getLabel('chart.learner.linear.axis.title'); + learner_category_axis_lbl = getLabel('chart.learner.category.axis.title'); + + completed_lbl = getLabel("label.completed"); + learner_lbl = getLabel("label.learner"); + learner_datatip_average = getLabel("chart.learner.datatip.average"); + chart_time_hrs_lbl = getLabel('chart.time.format.hours'); + chart_time_mins_lbl = getLabel('chart.time.format.minutes'); + chart_time_secs_lbl = getLabel('chart.time.format.secs'); + chart_completed_time_lbl = getLabel('chart.series.completed.time'); + chart_average_time_lbl = getLabel('chart.series.average.time'); + chart_legend_average_lbl = getLabel('chart.legend.average'); + chart_duration_lbl = getLabel('chart.series.duration'); + chart_average_cb_lbl = getLabel('show.average.checkbox'); + search_learner_txt_lbl = getLabel('search.learner.textbox'); + + Button(chart_button_bar.getChildAt(ACTIVITY_SPLIT__BUTTON)).label = activity_split_lbl; + Button(chart_button_bar.getChildAt(COMPLETION__BUTTON)).label = completion_rate_lbl; + } \ No newline at end of file Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/MainUI.mxml =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/MainUI.mxml (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/MainUI.mxml (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/CompletedActivity.as =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/CompletedActivity.as (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/CompletedActivity.as (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,45 @@ +package org.lamsfoundation.lams.vos +{ + + public class CompletedActivity + { + + public var aid:uint; + public var title:String; + public var completed_datetime:Number; + + public var dataObject:Object + + // constructor + public function CompletedActivity(completedActivity:Object) + { + this.aid = completedActivity.completedActivityId; + this.title = completedActivity.completedActivityTitle; + this.completed_datetime = completedActivity.completedDateTime; + } + + public function createDataObject(prev:CompletedActivity, learnerProgress:LearnerProgress):void { + var c_datetime:Number = (this.completed_datetime/1000); + var c_duration:Number = (prev != null) ? c_datetime - prev.dataObject.Completed + : c_datetime; + + dataObject = {Learner: learnerProgress.learner_username, + Activity: this.aid, + Title: this.title, + Completed: Math.floor(c_datetime), + Duration: Math.floor(c_duration)}; + + } + + public function cloneDataObject(learner:String):Object { + var dataObj:Object = {Learner: learner, + Activity: this.aid, + Title: this.title, + Completed: this.dataObject.Completed, + Duration: this.dataObject.Duration}; + + return dataObj; + } + + } +} \ No newline at end of file Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/LearnerProgress.as =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/LearnerProgress.as (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/LearnerProgress.as (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,72 @@ +package org.lamsfoundation.lams.vos +{ + import mx.collections.ArrayCollection; + import mx.collections.Sort; + import mx.collections.SortField; + + public class LearnerProgress + { + public var learner_uid:uint; + public var learner_fname:String; + public var learner_lname:String; + + [Bindable] + public var learner_username:String; + + public var lesson_id:uint; + public var lesson_name:String; + public var lesson_complete:Boolean; + + public var lesson_starttime:Number; + public var learner_starttime:Number; + + [Bindable] + private var completed_activities:ArrayCollection; + + private var sort:Sort; + + // constructor + public function LearnerProgress(learnerProgress:Object) + { + completed_activities = new ArrayCollection(); + + sort = new Sort(); + sort.fields = [new SortField("completed_datetime", false), new SortField("aid", false)]; + + this.learner_uid = learnerProgress.learnerId; + this.learner_fname = learnerProgress.firstName; + this.learner_lname = learnerProgress.lastName; + this.learner_username = learnerProgress.userName; + + this.lesson_id = learnerProgress.lessonId; + this.lesson_name = learnerProgress.lessonName; + this.lesson_complete = learnerProgress.lessonComplete; + this.lesson_starttime = learnerProgress.lessonStartTime; + this.learner_starttime = learnerProgress.learnerStartTime; + } + + public function addCompletedActivity(completedActivity:CompletedActivity):void { + completed_activities.addItem(completedActivity); + } + + public function getCompletedActivity(index:int):CompletedActivity { + return this.completedActivities.getItemAt(index) as CompletedActivity; + } + + public function getNoOfCompletedActivities():int { + return completed_activities.length; + } + + public function get completedActivities():ArrayCollection { + completed_activities.sort = sort; + completed_activities.refresh(); + + return completed_activities; + } + + public function get userName():String { + return learner_username; + } + + } +} \ No newline at end of file Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/Search.as =================================================================== diff -u --- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/Search.as (revision 0) +++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/vos/Search.as (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,31 @@ +package org.lamsfoundation.lams.vos +{ + import mx.collections.ArrayCollection; + + [Bindable] + public class Search + { + + static public var QUERY_DATE_ACTIVITIES:uint = 0; + static public var QUERY_DATE_LEARNERS:uint = 1; + static public var QUERY_PERIOD_ACTIVITIES:uint = 2; + static public var QUERY_PERIOD_LEARNERS:uint = 3; + + public var query_type:uint; + public var start_date:Date; + public var end_date:Date; + public var duration:Number; + + private var learners:ArrayCollection; + private var activities:ArrayCollection; + + // constructor + public function Search(start_date:Date, end_date:Date, query_type:uint) + { + this.start_date = start_date; + this.end_date = end_date; + this.query_type = query_type; + } + + } +} \ No newline at end of file Index: lams_flash/src/common/flex/lib/Mate_06_2.swc =================================================================== diff -u Binary files differ Index: lams_flash/src/common/flex/lib/WDDX.swc =================================================================== diff -u Binary files differ Index: lams_flash/src/common/flex/lib/mate_06_2.license.txt =================================================================== diff -u --- lams_flash/src/common/flex/lib/mate_06_2.license.txt (revision 0) +++ lams_flash/src/common/flex/lib/mate_06_2.license.txt (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,55 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + 1. You must give any other recipients of the Work or Derivative Works a copy of this License; and + + 2. You must cause any modified files to carry prominent notices stating that You changed the files; and + + 3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + + 4. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS Index: lams_flash/src/common/flex/lib/wddx.license.txt =================================================================== diff -u --- lams_flash/src/common/flex/lib/wddx.license.txt (revision 0) +++ lams_flash/src/common/flex/lib/wddx.license.txt (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -0,0 +1,23 @@ +http://www.opensource.org/licenses/mit-license.php + +The MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. Index: lams_monitoring/conf/xdoclet/global-forwards.xml =================================================================== diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 --- lams_monitoring/conf/xdoclet/global-forwards.xml (.../global-forwards.xml) (revision d9c7ddef141d19423b6ab2914d153c2cb748f187) +++ lams_monitoring/conf/xdoclet/global-forwards.xml (.../global-forwards.xml) (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -1,2 +1,6 @@ + Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== diff -u -r12450cbea53946ad074ec52d10f5e94ae207e1f9 -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision 12450cbea53946ad074ec52d10f5e94ae207e1f9) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -456,12 +456,32 @@ * required * @param userID * The user id of the user requesting the progress details + * @param completedOnly + * true if the data we are affect is completed activities data (included completed time values). * @return String The requested information in wddx format * @throws IOException */ - public String getAllLearnersProgress(Long lessonID, Integer userID) throws IOException; + public String getAllLearnersProgress(Long lessonID, Integer userID, Boolean completedOnly) throws IOException; /** + * This method returns the progress information of all learners in a given + * Lesson. + * + * @param lessonID + * The lesson_id of the Lesson whose progress information is + * required + * @param learnerID + * The learner_id of the class learner whose progress information is required + * If null, provide all learner's progress information. + * @param userID + * The user id of the user requesting the progress details + * @return String The requested information in wddx format + * @throws IOException + */ + public String getAllCompletedActivities(Long lessonID, Long learnerID, Integer userID) throws IOException; + + + /** * This method returns a batch of progress information of learners in a * given Lesson. It returns the first batch of users, using the learner's * name as the sorting order. The batch size is determined by the @@ -851,4 +871,8 @@ * Set a groups name */ public void setGroupName(Long groupID, String name); + + /** Open Time Chart */ + public Boolean openTimeChart(long lessonId, Integer userId) throws UserAccessDeniedException; + } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -rc2d2a9b8036e4bb9f3ff18ce70610c59fc6602d3 -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision c2d2a9b8036e4bb9f3ff18ce70610c59fc6602d3) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -1170,7 +1170,18 @@ } return gate; } - + + public Boolean openTimeChart(long lessonId, Integer userId) { + Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); + if (requestedLesson == null) { + throw new MonitoringServiceException("Lesson for id=" + lessonId + + " is missing. Unable to open."); + } + + checkOwnerOrStaffMember(userId, requestedLesson, "open the time chart"); + + return true; + } public GateActivity openGateForSingleUser(Long gateId, Integer userId) { GateActivity gate = (GateActivity) activityDAO.getActivityByActivityId(gateId); if (gate != null && userId != null && userId >= 0) { @@ -1495,7 +1506,7 @@ * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getAllLearnersProgress(java.lang.Long, * java.lang.Integer) */ - public String getAllLearnersProgress(Long lessonID, Integer userID) throws IOException { + public String getAllLearnersProgress(Long lessonID, Integer userID, Boolean completedDataOnly) throws IOException { Lesson lesson = lessonDAO.getLesson(lessonID); FlashMessage flashMessage; @@ -1504,17 +1515,44 @@ Vector progressData = new Vector(); Iterator iterator = lesson.getLearnerProgresses().iterator(); while (iterator.hasNext()) { - LearnerProgress learnerProgress = (LearnerProgress) iterator.next(); - progressData.add(learnerProgress.getLearnerProgressData()); + LearnerProgress learnerProgress = (LearnerProgress) iterator.next(); + if(!completedDataOnly) + progressData.add(learnerProgress.getLearnerProgressData()); + else + progressData.add(learnerProgress.getLearnerProgressCompletedData()); } - flashMessage = new FlashMessage("getAllLearnersProgress", progressData); + flashMessage = (!completedDataOnly) ? new FlashMessage("getAllLearnersProgress", progressData) + : new FlashMessage("getAllCompletedActivities", progressData); } else { flashMessage = new FlashMessage("getAllLearnersProgress", messageService.getMessage("NO.SUCH.LESSON", new Object[] { lessonID }), FlashMessage.ERROR); } return flashMessage.serializeMessage(); } + + public String getAllCompletedActivities(Long lessonID, Long learnerID, Integer userID) throws IOException { + Lesson lesson = lessonDAO.getLesson(lessonID); + FlashMessage flashMessage; + if (lesson != null) { + checkOwnerOrStaffMember(userID, lesson, "get all learners progress"); + Vector progressData = new Vector(); + + if(learnerID != null) { + LearnerProgress learnerProgress = learnerService.getProgress(userID, lessonID); + progressData.add(learnerProgress.getLearnerProgressCompletedData()); + flashMessage = new FlashMessage("getAllCompletedActivities", progressData); + } else { + return getAllLearnersProgress(lessonID, userID, true); + } + + } else { + flashMessage = new FlashMessage("getAllCompletedActivities", messageService.getMessage("NO.SUCH.LESSON", + new Object[] { lessonID }), FlashMessage.ERROR); + } + return flashMessage.serializeMessage(); + } + /** * (non-Javadoc) * Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== diff -u -r12450cbea53946ad074ec52d10f5e94ae207e1f9 -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 12450cbea53946ad074ec52d10f5e94ae207e1f9) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -27,6 +27,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.text.DateFormat; +import java.util.ArrayList; import java.util.Date; import javax.servlet.ServletException; @@ -35,6 +36,7 @@ import javax.servlet.http.HttpSession; import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.lesson.Lesson; @@ -45,6 +47,7 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException; import org.lamsfoundation.lams.util.DateUtil; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.util.wddx.FlashMessage; @@ -70,6 +73,7 @@ * validate="false" * @struts.action-forward name = "previewdeleted" path = "/previewdeleted.jsp" * @struts.action-forward name = "notsupported" path = ".notsupported" + * @struts.action-forward name = "timeChart" path = ".timeChart" * * ----------------XDoclet Tags-------------------- */ @@ -85,6 +89,8 @@ //--------------------------------------------------------------------- private static final String PREVIEW_DELETED_REPORT_SCREEN = "previewdeleted"; private static final String NOT_SUPPORTED_SCREEN = "notsupported"; + private static final String TIME_CHART_SCREEN = "timeChart"; + private static final String ERROR = "error"; /** See deleteOldPreviewLessons */ public static final String NUM_DELETED = "numDeleted"; @@ -648,7 +654,7 @@ IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); try{ Long lessonID = WebUtil.readLongParam(request,"lessonID",false); - wddxPacket = monitoringService.getAllLearnersProgress(lessonID, getUserId()); + wddxPacket = monitoringService.getAllLearnersProgress(lessonID, getUserId(), false); }catch (Exception e) { wddxPacket = handleException(e, "getAllLearnersProgress", monitoringService).serializeMessage(); } @@ -657,6 +663,70 @@ writer.println(wddxPacket); return null; } + + public ActionForward getDictionaryXML(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException { + + IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + MessageService messageService = monitoringService.getMessageService(); + + ArrayList languageCollection = new ArrayList(); + languageCollection.add(new String("chart.btn.activity.split")); + languageCollection.add(new String("chart.btn_completion.rate")); + languageCollection.add(new String("chart.series.completed.time")); + languageCollection.add(new String("chart.series.average.time")); + languageCollection.add(new String("chart.series.duration")); + languageCollection.add(new String("chart.legend.average")); + languageCollection.add(new String("show.average.checkbox")); + languageCollection.add(new String("search.learner.textbox")); + languageCollection.add(new String("chart.learner.linear.axis.title")); + languageCollection.add(new String("chart.learner.category.axis.title")); + languageCollection.add(new String("chart.learner.datatip.average")); + + languageCollection.add(new String("label.learner")); + languageCollection.add(new String("time.chart.panel.title")); + languageCollection.add(new String("chart.time.format.hours")); + languageCollection.add(new String("chart.time.format.minutes")); + languageCollection.add(new String("chart.time.format.seconds")); + languageCollection.add(new String("label.completed")); + + String languageOutput = ""; + + for(int i = 0; i < languageCollection.size(); i++){ + languageOutput += "" + messageService.getMessage(languageCollection.get(i)) + ""; + } + + languageOutput += ""; + + PrintWriter writer = response.getWriter(); + writer.println(languageOutput); + return null; + } + + public ActionForward getAllCompletedActivities(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException{ + + String wddxPacket; + IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + try{ + Long lessonID = WebUtil.readLongParam(request,"lessonID",false); + Long learnerID = WebUtil.readLongParam(request,"learnerID",true); + wddxPacket = monitoringService.getAllCompletedActivities(lessonID, learnerID, getUserId()); + + }catch (Exception e) { + wddxPacket = handleException(e, "getAllLearnersProgress", monitoringService).serializeMessage(); + } + + PrintWriter writer = response.getWriter(); + writer.println(wddxPacket); + return null; + + } + /** Get the first batch of learner progress data learners in a lesson. This is called by the learner progress tab in monitoring */ public ActionForward getInitialLearnersProgress(ActionMapping mapping, ActionForm form, @@ -1009,5 +1079,32 @@ PrintWriter writer = response.getWriter(); writer.println(wddxPacket); return null; - } + } + + /** Open Time Chart display */ + public ActionForward viewTimeChart(ActionMapping mapping, + ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException { + + IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + + try { + + long lessonID = WebUtil.readLongParam(request, "lessonID"); + + // check monitor privledges + monitoringService.openTimeChart(lessonID, getUserId()); + + request.setAttribute("lessonID", lessonID); + request.setAttribute("learnerID", WebUtil.readLongParam(request, "learnerID", true)); + + } catch (Exception e) { + request.setAttribute("errorName","MonitoringAction"); + request.setAttribute("errorMessage", e.getMessage()); + + return mapping.findForward(ERROR); + } + + return mapping.findForward(TIME_CHART_SCREEN); + } } Index: lams_monitoring/web/TimeChart.swf =================================================================== diff -u Binary files differ Index: lams_monitoring/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -r209087915bc219f430c282ad00e5d1e6462f9b5f -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 --- lams_monitoring/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 209087915bc219f430c282ad00e5d1e6462f9b5f) +++ lams_monitoring/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) @@ -42,6 +42,10 @@ + @@ -83,6 +87,11 @@ path=".viewScheduleGate" redirect="false" /> + + +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> + +<%@ taglib uri="tags-tiles" prefix="tiles" %> +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + <c:out value="${title}"/> + + + + + + + + + + + +