Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/ContributeActivity.as
===================================================================
diff -u
--- lams_central/src/flash/org/lamsfoundation/lams/monitoring/ContributeActivity.as	(revision 0)
+++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/ContributeActivity.as	(revision 10f93d911b4dacb1800952ed2baa951b9201a45b)
@@ -0,0 +1,85 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+
+import org.lamsfoundation.lams.monitoring.*;
+import org.lamsfoundation.lams.authoring.ToolActivity;
+
+/*
+* Contribute Activity - singleton class representing a contributing activity
+*/
+class ContributeActivity extends ToolActivity {
+	
+	private var _contributionType:Number;
+	private var _description:String;
+	private var _isRequired:Boolean;
+	
+	private static var _instance:ContributeActivity = null;
+	
+	/**
+	* Constructor.
+	*/
+	public function ContributeActivity (){
+	}
+	
+	/**
+	 * 
+	 * @return the ContributeActivity
+	 */
+	public static function getInstance():ContributeActivity{
+		if(ContributeActivity._instance == null){
+            ContributeActivity._instance = new ContributeActivity();
+        }
+        return ContributeActivity._instance;
+	}
+	
+	public function populateFromDTO(dto:Object){
+		_activityID = dto.activityID;
+		_activityTypeID = dto.activityTypeID;
+		_orderID = dto.orderID;
+		_title = dto.title;
+		_contributionType = dto.contributionType;
+		_description = dto.description;
+		_isRequired = dto.isRequired;
+	}
+	
+	public function set contributionType(a:Number):Void{
+		_contributionType = a;
+	}
+	public function get contributionType():Number{
+		return _contributionType;
+	}
+	
+	public function set description(a:String):Void{
+		_description = a;
+	}
+	public function get description():String{
+		return _description;
+	}
+	public function set isRequired(a:Boolean):Void{
+		_isRequired = a;
+	}
+	public function get isRequired():Boolean{
+		return _isRequired;
+	}
+	
+}
\ No newline at end of file
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/Organisation.as
===================================================================
diff -u
--- lams_central/src/flash/org/lamsfoundation/lams/monitoring/Organisation.as	(revision 0)
+++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/Organisation.as	(revision 10f93d911b4dacb1800952ed2baa951b9201a45b)
@@ -0,0 +1,139 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+
+import org.lamsfoundation.lams.monitoring.*;
+import org.lamsfoundation.lams.common.util.*;
+
+/*
+* Organistation - singleton class representing an organisation
+*/
+class Organisation {
+	
+	private var _orgId:Number;
+	private var _orgName:String;
+	private var _orgDesc:String;
+	private var _users:Hashtable;
+	
+	private static var _instance:Organisation = null;
+	
+	/**
+	* constants
+	*/
+	public static var TEACHER_ROLE:String = "teacher";
+	public static var STAFF_ROLE:String = "staff";
+	public static var LEARNER_ROLE:String = "learner";
+	
+	/**
+	* Constructor.
+	*/
+	public function Organisation (){
+	}
+	
+	/**
+	 * 
+	 * @return the Org
+	 */
+	public static function getInstance():Organisation{
+		if(Organisation._instance == null){
+            Organisation._instance = new Organisation();
+        }
+        return Organisation._instance;
+	}
+	
+	public function createFromDTO(orgDTO:Object){
+		_orgId = orgDTO.organisationID;
+		_orgName = orgDTO.name;
+		_orgDesc = orgDTO.description;
+	}
+	
+	public function setUsers(users:Array):Boolean {
+		_users.clear();
+		
+		for(var i=0; i<users.length;i++){
+			var u:Object = users[i];
+			var user:User = new User();
+			user.populateFromDTO(u);
+			_users.put(user.getUserId(),user);
+		}
+		
+		return true;
+	}
+	
+	public function getUsers():Hashtable {
+		return _users;
+	}
+	
+	public function getUser(userID:Number):Object{
+		return _users.get(userID);
+	}
+	
+	public function addUser(user:User):Boolean {
+		_users.put(user.getUserId(), user);
+		return true;
+	}
+	
+	public function removeUser(user:User):Boolean {
+		_users.remove(user);
+		return true;
+	}
+	
+	public function getTeachers():Array{
+		if(_users==null){
+			return null;
+		}
+		
+		return getUsersByRole(TEACHER_ROLE);
+	}
+	
+	public function getStaff():Array{
+		if(_users==null){
+			return null;
+		}
+		
+		return getUsersByRole(STAFF_ROLE);
+	}
+	
+	public function getLearners():Array{
+		if(_users==null){
+			return null;
+		}
+		
+		return getUsersByRole(LEARNER_ROLE);
+	}
+	
+	private function getUsersByRole(roleName:String):Array{
+		var usrs:Array = new Array();
+		var keys:Array = _users.keys();
+		
+		for(var i=0; i<keys.length;i++){
+			var user:Object = _users.get(keys[i]);
+			var u:User = user.classInstanceRefs;
+			if(u.hasRole(roleName)){
+				usrs.push(u);
+			}
+		}
+		
+		return usrs;
+	}
+	
+}
\ No newline at end of file
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/User.as
===================================================================
diff -u
--- lams_central/src/flash/org/lamsfoundation/lams/monitoring/User.as	(revision 0)
+++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/User.as	(revision 10f93d911b4dacb1800952ed2baa951b9201a45b)
@@ -0,0 +1,114 @@
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+
+import org.lamsfoundation.lams.monitoring.*;
+import org.lamsfoundation.lams.common.*;
+/*
+* User - singleton class representing a user (teacher, staff, learner)
+*/
+class User {
+	
+	private var _userId:Number;
+	private var _firstName:String;
+	private var _lastName:String;
+	private var _userName:String;
+	private var _userRoles:Array;
+	private var _userProgress:Progress;
+	
+	private static var _instance:User = null;
+	
+	/**
+	* Constructor.
+	*/
+	public function User (){
+		_userProgress = null;
+	}
+	
+	/**
+	 * 
+	 * @return the User
+	 */
+	public static function getInstance():User{
+		if(User._instance == null){
+            User._instance = new User();
+        }
+        return User._instance;
+	}
+	
+	public function populateFromDTO(userDTO:Object){
+		_userId = userDTO.userID;
+		_firstName = userDTO.firstName;
+		_lastName = userDTO.lastName;
+		_userName = userDTO.login;
+		setRoles(userDTO.roles);
+	}
+	
+	public function getUserId():Number{
+		return _userId;
+	}
+	
+	public function getFirstName():String{
+		return _firstName;
+	}
+	
+	public function getLastName():String{
+		return _lastName;
+	}
+	
+	public function getUsername():String{
+		return _userName;
+	}
+	
+	public function setRoles(roles:Array):Boolean{
+		
+		_userRoles = new Array();
+		
+		for(var i=0; i< roles.length; i++){
+			var r:String = String(roles[i]);
+			_userRoles.push(r);
+		}
+		return true;
+	}
+	
+	public function getRoles():Array{
+		return _userRoles;
+	}
+	
+	public function hasRole(roleName:String):Boolean{
+		for(var i=0; i<_userRoles.length;i++){
+			if(_userRoles[i] == roleName){
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public function setProgress(userProgress:Progress){
+		_userProgress = userProgress;
+	}
+	
+	public function getProgress():Progress{
+		return _userProgress;
+	}
+	
+}
\ No newline at end of file