Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -rbf4cc695604139c45f8706931d4f387e51c0574c -r4c885f9ce404071ebdb626b74499543010776361 Binary files differ Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/LessonManagerDialog.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r4c885f9ce404071ebdb626b74499543010776361 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/LessonManagerDialog.as (.../LessonManagerDialog.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/LessonManagerDialog.as (.../LessonManagerDialog.as) (revision 4c885f9ce404071ebdb626b74499543010776361) @@ -454,10 +454,10 @@ var callback:Function = Proxy.create(this,showOrgTree); if(classID != undefined){ - Application.getInstance().getComms().getRequest('workspace.do?method=getUserOrganisation&userID='+_root.userID+'&organisationID='+classID+'&roles=STAFF,TEACHER',callback, false); + Application.getInstance().getComms().getRequest('workspace.do?method=getUserOrganisation&userID='+_root.userID+'&organisationID='+classID+'&roles=MONITOR,COURSE MANAGER',callback, false); }else if(courseID != undefined){ trace('course defined: doing request'); - Application.getInstance().getComms().getRequest('workspace.do?method=getUserOrganisation&userID='+_root.userID+'&organisationID='+courseID+'&roles=STAFF,TEACHER',callback, false); + Application.getInstance().getComms().getRequest('workspace.do?method=getUserOrganisation&userID='+_root.userID+'&organisationID='+courseID+'&roles=MONITOR,COURSE MANAGER',callback, false); }else{ // TODO no course or class defined } @@ -616,7 +616,7 @@ for(var i=0; i<_staffList.length; i++){ trace('checking staff list item : ' + i); trace(_staffList[i].data.userID); - if(org.isStaff(_staffList[i].data.userID)){ + if(org.isMonitor(_staffList[i].data.userID)){ _staffList[i].user_cb.selected = true; } } Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/Organisation.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r4c885f9ce404071ebdb626b74499543010776361 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/Organisation.as (.../Organisation.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/Organisation.as (.../Organisation.as) (revision 4c885f9ce404071ebdb626b74499543010776361) @@ -41,8 +41,8 @@ /** * constants */ - public static var TEACHER_ROLE:String = "TEACHER"; - public static var STAFF_ROLE:String = "STAFF"; + public static var COURSE_MANAGER_ROLE:String = "COURSE MANAGER"; + public static var MONITOR_ROLE:String = "MONITOR"; public static var LEARNER_ROLE:String = "LEARNER"; /** @@ -121,20 +121,20 @@ return true; } - public function getTeachers():Array{ + public function getCourseManagers():Array{ if(_users==null){ return null; } - return getUsersByRole(TEACHER_ROLE); + return getUsersByRole(COURSE_MANAGER_ROLE); } - public function getStaff():Array{ + public function getMonitors():Array{ if(_users==null){ return null; } - return getUsersByRole(STAFF_ROLE); + return getUsersByRole(MONITOR_ROLE); } public function getLearners():Array{ @@ -156,10 +156,10 @@ return false; } - public function isStaff(key:Number):Boolean{ + public function isMonitor(key:Number):Boolean{ if(_users.containsKey(key)){ var user:User = User(_users.get(key)); - if(user.hasRole(STAFF_ROLE)){ + if(user.hasRole(MONITOR_ROLE)){ return true; } } Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as =================================================================== diff -u -r7ef030d52358136f7fa33a519f657a529ea7ce65 -r4c885f9ce404071ebdb626b74499543010776361 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 7ef030d52358136f7fa33a519f657a529ea7ce65) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 4c885f9ce404071ebdb626b74499543010776361) @@ -43,7 +43,7 @@ public var RT_ORG:String = "Organisation"; private static var LEARNER_ROLE:String = "LEARNER"; - private static var STAFF_ROLE:String = "STAFF"; + private static var MONITOR_ROLE:String = "MONITOR"; private static var TEACHER_ROLE:String = "TEACHER"; private var __width:Number; @@ -582,7 +582,7 @@ trace('requesting staff members...'); //var callback:Function = Proxy.create(this,saveStaff); - _monitor.requestUsers(STAFF_ROLE, data.organisationID, callback); + _monitor.requestUsers(MONITOR_ROLE, data.organisationID, callback); } public function saveLearners(users:Array){ @@ -595,9 +595,9 @@ } public function saveStaff(users:Array){ - trace('retrieving back users for org by role: ' + STAFF_ROLE); + trace('retrieving back users for org by role: ' + MONITOR_ROLE); - saveUsers(users, STAFF_ROLE); + saveUsers(users, MONITOR_ROLE); //dispatchEvent({type:'staffLoad',target:this}); broadcastViewUpdate("STAFF_LOADED", null, null); @@ -773,7 +773,7 @@ trace('branch: ' + _selectedTreeNode.attributes.isBranch); if(!_selectedTreeNode.attributes.isBranch){ // get the organisations (node) users by role - //var roles:Array = new Array(LEARNER_ROLE, STAFF_ROLE, TEACHER_ROLE); + //var roles:Array = new Array(LEARNER_ROLE, MONITOR_ROLE, TEACHER_ROLE); setOrganisation(new Organisation(_selectedTreeNode.attributes.data)); resetUserFlags(); // polling method - waiting for all users to load before displaying users in UI Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/Wizard.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r4c885f9ce404071ebdb626b74499543010776361 --- lams_central/src/flash/org/lamsfoundation/lams/wizard/Wizard.as (.../Wizard.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_central/src/flash/org/lamsfoundation/lams/wizard/Wizard.as (.../Wizard.as) (revision 4c885f9ce404071ebdb626b74499543010776361) @@ -142,10 +142,10 @@ var callback:Function = Proxy.create(this,showOrgTree); if(classID != undefined && courseID != undefined){ - Application.getInstance().getComms().getRequest('workspace.do?method=getOrganisationsByUserRole&userID='+_root.userID+'&courseID='+courseID+'&classID='+classID+'&roles=STAFF,TEACHER',callback, false); + Application.getInstance().getComms().getRequest('workspace.do?method=getOrganisationsByUserRole&userID='+_root.userID+'&courseID='+courseID+'&classID='+classID+'&roles=MONITOR,COURSE MANAGER',callback, false); }else if(courseID != undefined){ trace('course defined: doing request'); - Application.getInstance().getComms().getRequest('workspace.do?method=getOrganisationsByUserRole&userID='+_root.userID+'&courseID='+courseID+'&roles=STAFF,TEACHER',callback, false); + Application.getInstance().getComms().getRequest('workspace.do?method=getOrganisationsByUserRole&userID='+_root.userID+'&courseID='+courseID+'&roles=MONITOR,COURSE MANAGER',callback, false); }else{ // TODO no course or class defined } Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardModel.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r4c885f9ce404071ebdb626b74499543010776361 --- lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardModel.as (.../WizardModel.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardModel.as (.../WizardModel.as) (revision 4c885f9ce404071ebdb626b74499543010776361) @@ -43,8 +43,8 @@ // constants private static var LEARNER_ROLE:String = "LEARNER"; - private static var STAFF_ROLE:String = "STAFF"; - private static var TEACHER_ROLE:String = "TEACHER"; + private static var MONITOR_ROLE:String = "MONITOR"; + private static var COURSE_MANAGER_ROLE:String = "COURSE MANAGER"; private static var USER_LOAD_CHECK_INTERVAL:Number = 50; private static var USER_LOAD_CHECK_TIMEOUT_COUNT:Number = 200; @@ -186,7 +186,7 @@ trace('requesting staff members...'); var callback:Function = Proxy.create(this,saveStaff); - _wizard.requestUsers(STAFF_ROLE, data.organisationID, callback); + _wizard.requestUsers(MONITOR_ROLE, data.organisationID, callback); } public function saveLearners(users:Array){ @@ -198,9 +198,9 @@ } public function saveStaff(users:Array){ - trace('retrieving back users for org by role: ' + STAFF_ROLE); + trace('retrieving back users for org by role: ' + MONITOR_ROLE); - saveUsers(users, STAFF_ROLE); + saveUsers(users, MONITOR_ROLE); dispatchEvent({type:'staffLoad',target:this}); } @@ -331,7 +331,7 @@ trace('branch: ' + _selectedOrgTreeNode.attributes.isBranch); //if(!_selectedOrgTreeNode.attributes.isBranch){ // get the organisations (node) users by role - //var roles:Array = new Array(LEARNER_ROLE, STAFF_ROLE, TEACHER_ROLE); + //var roles:Array = new Array(LEARNER_ROLE, MONITOR_ROLE, COURSE_MANAGER_ROLE); setOrganisation(new Organisation(_selectedOrgTreeNode.attributes.data)); resetUserFlags(); // polling method - waiting for all users to load before displaying users in UI Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as =================================================================== diff -u -r1fd2b6697e07c10e6f78cc8c83645f72fc2ed1a8 -r4c885f9ce404071ebdb626b74499543010776361 --- lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as (.../WizardView.as) (revision 1fd2b6697e07c10e6f78cc8c83645f72fc2ed1a8) +++ lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as (.../WizardView.as) (revision 4c885f9ce404071ebdb626b74499543010776361) @@ -206,7 +206,7 @@ break; case 'USERS_LOADED' : loadLearners(wm.organisation.getLearners()); - loadStaff(wm.organisation.getStaff()); + loadStaff(wm.organisation.getMonitors()); _wizardController.clearBusy(); break; case 'SAVED_LC' : Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== diff -u -r9730d455488a8cd4a8c72ee39db6b4ec91eb5476 -r4c885f9ce404071ebdb626b74499543010776361 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 9730d455488a8cd4a8c72ee39db6b4ec91eb5476) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 4c885f9ce404071ebdb626b74499543010776361) @@ -216,7 +216,7 @@ return mapping.findForward("error"); } else { Integer orgId = classId != null ? classId : courseId; - if (getService().isUserInRole(user.getUserID(), orgId, Role.STAFF)||getService().isUserInRole(user.getUserID(), orgId, Role.COURSE_MANAGER)) { + if (getService().isUserInRole(user.getUserID(), orgId, Role.MONITOR)||getService().isUserInRole(user.getUserID(), orgId, Role.COURSE_MANAGER)) { log.debug("user is staff"); String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); req.setAttribute("serverUrl", serverUrl); Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java =================================================================== diff -u -rc23961dc5c03b73f9a44f99ebea738646812f814 -r4c885f9ce404071ebdb626b74499543010776361 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision c23961dc5c03b73f9a44f99ebea738646812f814) +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision 4c885f9ce404071ebdb626b74499543010776361) @@ -140,16 +140,16 @@ links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")")); } } - if ((contains(roles, Role.ROLE_COURSE_ADMIN) || contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_STAFF)) + if ((contains(roles, Role.ROLE_COURSE_ADMIN) || contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_MONITOR)) && state.equals(OrganisationState.ACTIVE)) { if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) { if((!isSysAdmin)&&(contains(roles, Role.ROLE_COURSE_ADMIN) || contains(roles, Role.ROLE_COURSE_MANAGER))){ links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")")); } - if(contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_STAFF)) + if(contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_MONITOR)) links.add(new IndexLinkBean("index.addlesson", "javascript:openAddLesson(" + org.getOrganisationId()+",'')")); }else{//CLASS_TYPE - if(contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_STAFF)) + if(contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_MONITOR)) links.add(new IndexLinkBean("index.addlesson","javascript:openAddLesson("+org.getParentOrganisation().getOrganisationId()+","+org.getOrganisationId()+")")); } } @@ -163,7 +163,7 @@ if(!lesson.isPreviewLesson()){ List lessonLinks = new ArrayList(); if(state.equals(OrganisationState.ACTIVE)){ - if(contains(roles,Role.ROLE_COURSE_MANAGER)||contains(roles,Role.ROLE_STAFF)){ + if(contains(roles,Role.ROLE_COURSE_MANAGER)||contains(roles,Role.ROLE_MONITOR)){ if(!lesson.getLessonStateId().equals(lesson.REMOVED_STATE)){ lessonLinks.add(new IndexLinkBean("index.monitor", "javascript:openMonitorLesson(" + lesson.getLessonId()+")")); } Index: lams_common/db/sql/insert_types_data.sql =================================================================== diff -u -r19df18a51a7835bc7d7ca3f7d9d5859750ac0c49 -r4c885f9ce404071ebdb626b74499543010776361 --- lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 19df18a51a7835bc7d7ca3f7d9d5859750ac0c49) +++ lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 4c885f9ce404071ebdb626b74499543010776361) @@ -16,7 +16,7 @@ INSERT INTO lams_role VALUES (1, 'SYSADMIN', 'LAMS System Adminstrator', NOW()); INSERT INTO lams_role VALUES (2, 'COURSE MANAGER', 'Course Manager', NOW()); INSERT INTO lams_role VALUES (3, 'AUTHOR', 'Authors Learning Designs', NOW()); -INSERT INTO lams_role VALUES (4, 'STAFF', 'Member of Staff', NOW()); +INSERT INTO lams_role VALUES (4, 'MONITOR', 'Member of Staff', NOW()); INSERT INTO lams_role VALUES (5, 'LEARNER', 'Student', NOW()); INSERT INTO lams_role VALUES (6, 'COURSE ADMIN', 'Course Administrator', NOW()); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java =================================================================== diff -u -r0563d5469dfc82c4d195bc449f2ec9bb878b441f -r4c885f9ce404071ebdb626b74499543010776361 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java (.../Role.java) (revision 0563d5469dfc82c4d195bc449f2ec9bb878b441f) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java (.../Role.java) (revision 4c885f9ce404071ebdb626b74499543010776361) @@ -39,7 +39,7 @@ public static final String LEARNER = "LEARNER"; - public static final String STAFF = "STAFF"; + public static final String MONITOR = "MONITOR"; public static final String AUTHOR = "AUTHOR"; @@ -61,7 +61,7 @@ public static final Integer ROLE_SYSADMIN =new Integer(1); public static final Integer ROLE_COURSE_MANAGER =new Integer(2); public static final Integer ROLE_AUTHOR =new Integer(3); - public static final Integer ROLE_STAFF =new Integer(4); + public static final Integer ROLE_MONITOR =new Integer(4); public static final Integer ROLE_LEARNER =new Integer(5); public static final Integer ROLE_COURSE_ADMIN =new Integer(6); /***********************************************************/ @@ -220,8 +220,8 @@ return this.roleId.equals(ROLE_COURSE_ADMIN); } - public boolean isStaff(){ - return this.roleId.equals(ROLE_STAFF); + public boolean isMonitor(){ + return this.roleId.equals(ROLE_MONITOR); } public boolean isSysAdmin(){ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -r1b2fdc94c23d3b1a863c9a5654cde3e6bccc4d7e -r4c885f9ce404071ebdb626b74499543010776361 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 1b2fdc94c23d3b1a863c9a5654cde3e6bccc4d7e) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 4c885f9ce404071ebdb626b74499543010776361) @@ -448,7 +448,7 @@ User user = (User)findById(User.class,m.getUserID()); UserOrganisation uo = new UserOrganisation(user,organisation); log.debug("adding course manager: "+user.getUserId()+" as staff"); - UserOrganisationRole uor = new UserOrganisationRole(uo,(Role)findById(Role.class,Role.ROLE_STAFF)); + UserOrganisationRole uor = new UserOrganisationRole(uo,(Role)findById(Role.class,Role.ROLE_MONITOR)); HashSet uors = new HashSet(); uors.add(uor); uo.setUserOrganisationRoles(uors); Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -rfbc5e96c67d54e7f44e77b5711df00ab46603fc2 -r4c885f9ce404071ebdb626b74499543010776361 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -rfbc5e96c67d54e7f44e77b5711df00ab46603fc2 -r4c885f9ce404071ebdb626b74499543010776361 Binary files differ Index: lams_monitoring/web/lams_wizard.swf =================================================================== diff -u -rfbc5e96c67d54e7f44e77b5711df00ab46603fc2 -r4c885f9ce404071ebdb626b74499543010776361 Binary files differ Index: lams_monitoring/web/lams_wizard_library.swf =================================================================== diff -u -rfbc5e96c67d54e7f44e77b5711df00ab46603fc2 -r4c885f9ce404071ebdb626b74499543010776361 Binary files differ