Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v diff -u -r1.51 -r1.52 --- lams_admin/conf/language/lams/ApplicationResources.properties 25 Feb 2009 05:34:54 -0000 1.51 +++ lams_admin/conf/language/lams/ApplicationResources.properties 7 Apr 2009 05:24:58 -0000 1.52 @@ -383,5 +383,7 @@ config.red5.server.url =Media Server URL config.red5.recordings.url =Media Server Recordings URL +admin.gradebook.learner.enable =Enable Grade Book for Learners +admin.gradebook.monitor.enable =Enable Grade Book for Monitors #======= End labels: Exported 375 labels for en AU ===== Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.51 -r1.52 --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 25 Feb 2009 05:34:54 -0000 1.51 +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 7 Apr 2009 05:24:58 -0000 1.52 @@ -383,5 +383,7 @@ config.red5.server.url =Media Server URL config.red5.recordings.url =Media Server Recordings URL +admin.gradebook.learner.enable =Enable Grade Book for Learners +admin.gradebook.monitor.enable =Enable Grade Book for Monitors #======= End labels: Exported 375 labels for en AU ===== Index: lams_admin/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/Attic/web.xml,v diff -u -r1.24 -r1.25 --- lams_admin/web/WEB-INF/web.xml 6 Feb 2009 02:12:04 -0000 1.24 +++ lams_admin/web/WEB-INF/web.xml 7 Apr 2009 05:24:59 -0000 1.25 @@ -10,16 +10,18 @@ org.lamsfoundation.lams.admin.ApplicationResources - + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/integrationContext.xml - classpath:/org/lamsfoundation/lams/admin/adminApplicationContext.xml - classpath:/org/lamsfoundation/lams/usermanagement/ldapContext.xml - + classpath:/org/lamsfoundation/lams/admin/adminApplicationContext.xml + + locatorFactorySelector + classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml + + + parentContextKey + context.central + migration.systemname Index: lams_admin/web/WEB-INF/struts/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/struts/Attic/struts-config.xml,v diff -u -r1.22 -r1.23 --- lams_admin/web/WEB-INF/struts/struts-config.xml 28 Jan 2009 00:05:11 -0000 1.22 +++ lams_admin/web/WEB-INF/struts/struts-config.xml 7 Apr 2009 05:24:58 -0000 1.23 @@ -55,6 +55,8 @@ + + Index: lams_admin/web/organisation/createOrEdit.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/organisation/createOrEdit.jsp,v diff -u -r1.1 -r1.2 --- lams_admin/web/organisation/createOrEdit.jsp 9 Jan 2008 00:53:14 -0000 1.1 +++ lams_admin/web/organisation/createOrEdit.jsp 7 Apr 2009 05:24:59 -0000 1.2 @@ -1,5 +1,21 @@ <%@ include file="/taglibs.jsp"%> + + @@ -85,6 +101,18 @@ + + + + + + + + + + + + Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml,v diff -u -r1.18 -r1.19 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml 25 Oct 2007 07:19:47 -0000 1.18 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml 7 Apr 2009 05:24:58 -0000 1.19 @@ -2,338 +2,243 @@ - + - - http://boss.bekk.no/boss/middlegen/ - http://www.hibernate.org/ ---> + + + @hibernate.class table="lams_organisation" + + true - - - @hibernate.class - table="lams_organisation" - - true - - - - - - @hibernate.id - generator-class="native" - type="java.lang.Integer" - column="organisation_id" + + + + @hibernate.id generator-class="native" + type="java.lang.Integer" column="organisation_id" - - true - - - - - @hibernate.property - column="name" - length="250" - - - - - @hibernate.property - column="code" - length="250" - - - - - - @hibernate.property - column="description" - length="250" - - - - - @hibernate.property - column="create_date" - length="19" - not-null="true" - - - - - - - @hibernate.property - column="admin_add_new_users" - length="1" - not-null="true" - - + + true + + - - - @hibernate.property - column="admin_browse_all_users" - length="1" - not-null="true" - - + + + @hibernate.property column="name" length="250" + + + + + @hibernate.property column="code" length="250" + + - - - @hibernate.property - column="admin_change_status" - length="1" - not-null="true" - - + + + @hibernate.property column="description" length="250" + + + + + @hibernate.property column="create_date" length="19" + not-null="true" + + - - - @hibernate.property - column="admin_create_guest" - length="1" - not-null="true" - - + + + + @hibernate.property column="admin_add_new_users" + length="1" not-null="true" + + - - - - - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="created_by" - - - - - - - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="organisation_state_id" - - - + + + @hibernate.property column="admin_browse_all_users" + length="1" not-null="true" + + - - - - @hibernate.many-to-one - cascade="all" - not-null="false" - @hibernate.column name="workspace_id" - - - - - - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="organisation_type_id" - - - - - - - @hibernate.set - lazy="true" - inverse="true" - cascade="all-delete-orphan" + + + @hibernate.property column="admin_change_status" + length="1" not-null="true" + + - @hibernate.collection-key - column="organisation_id" + + + @hibernate.property column="admin_create_guest" + length="1" not-null="true" + + + + + + @hibernate.property column="enable_monitor_gradebook" + length="1" not-null="true" + + + + + + @hibernate.property column="enable_learner_gradebook" + length="1" not-null="true" + + - @hibernate.collection-one-to-many - class="org.lamsfoundation.lams.usermanagement.UserOrganisation" - - - - - - - - - - - @hibernate.set - lazy="true" - inverse="true" - cascade="none" + - @hibernate.collection-key - column="parent_organisation_id" + + + + @hibernate.many-to-one not-null="true" @hibernate.column + name="created_by" + + + - @hibernate.collection-one-to-many - class="org.lamsfoundation.lams.usermanagement.Organisation" - - - - - - - - - - - - @hibernate.many-to-one - @hibernate.column name="parent_organisation_id" - - - - - - - @hibernate.set - lazy="true" - inverse="true" - cascade="none" + + + + @hibernate.many-to-one not-null="true" @hibernate.column + name="organisation_state_id" + + + - @hibernate.collection-key - column="organisation_id" + + + + @hibernate.many-to-one cascade="all" not-null="false" + @hibernate.column name="workspace_id" + + + + + + + @hibernate.many-to-one not-null="true" @hibernate.column + name="organisation_type_id" + + + + + + + @hibernate.set lazy="true" inverse="true" + cascade="all-delete-orphan" - @hibernate.collection-one-to-many - class="org.lamsfoundation.lams.lesson.Lesson" - - - - - - + @hibernate.collection-key column="organisation_id" - - - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="locale_id" - - - - - - - - + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.UserOrganisation" + + + + + + + + + + + @hibernate.set lazy="true" inverse="true" cascade="none" + + @hibernate.collection-key + column="parent_organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.usermanagement.Organisation" + + + + + + + + + + + + @hibernate.many-to-one @hibernate.column + name="parent_organisation_id" + + + + + + + @hibernate.set lazy="true" inverse="true" cascade="none" + + @hibernate.collection-key column="organisation_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.lesson.Lesson" + + + + + + + + + + + @hibernate.many-to-one not-null="true" @hibernate.column + name="locale_id" + + + + + + + + Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v diff -u -r1.137 -r1.138 --- lams_common/db/sql/create_lams_11_tables.sql 3 Apr 2009 05:50:18 -0000 1.137 +++ lams_common/db/sql/create_lams_11_tables.sql 7 Apr 2009 05:23:52 -0000 1.138 @@ -227,6 +227,8 @@ , admin_browse_all_users TINYINT(1) NOT NULL DEFAULT 0 , admin_change_status TINYINT(1) NOT NULL DEFAULT 0 , admin_create_guest TINYINT(1) NOT NULL DEFAULT 0 + , enable_monitor_gradebook TINYINT(1) NOT NULL DEFAULT 0 + , enable_learner_gradebook TINYINT(1) NOT NULL DEFAULT 0 , locale_id INTEGER , archived_date DATETIME , ordered_lesson_ids TEXT Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql,v diff -u -r1.12 -r1.13 --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql 3 Apr 2009 04:42:05 -0000 1.12 +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql 7 Apr 2009 05:23:52 -0000 1.13 @@ -78,6 +78,10 @@ -- LDEV-2174 ------------- ALTER TABLE lams_tool DROP COLUMN classpath_addition, context_file; +-- LDEV-2205 ------------ Adding couse level settings for gradebook +ALTER TABLE lams_organisation ADD COLUMN enable_monitor_gradebook TINYINT(1) NOT NULL DEFAULT 0; +ALTER TABLE lams_organisation ADD COLUMN enable_learner_gradebook TINYINT(1) NOT NULL DEFAULT 0; + ----------------------Put all sql statements above here------------------------- -- If there were no errors, commit and restore autocommit to on Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java,v diff -u -r1.17 -r1.18 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java 25 Oct 2007 07:19:48 -0000 1.17 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java 7 Apr 2009 05:23:52 -0000 1.18 @@ -94,6 +94,12 @@ private Boolean courseAdminCanCreateGuestAccounts; /** persistent field */ + private Boolean enableGradeBookForMonitors; + + /** persistent field */ + private Boolean enableGradeBookForLearners; + + /** persistent field */ private Date archivedDate; private String orderedLessonIds; @@ -103,7 +109,7 @@ Date createDate, User createdBy, Workspace workspace, OrganisationType organisationType, Set userOrganisations, Set childOrganisations, Set lessons, Boolean courseAdminCanAddNewUsers, Boolean courseAdminCanBrowseAllUsers, Boolean courseAdminCanChangeStatusOfCourse, - Boolean courseAdminCanCreateGuestAccounts, String orderedLessonIds) { + Boolean courseAdminCanCreateGuestAccounts, String orderedLessonIds, Boolean enableGradeBookForLearners, Boolean enableGradeBookForMonitors) { this.name = name; this.description = description; this.parentOrganisation = parentOrganisation; @@ -119,6 +125,8 @@ this.courseAdminCanChangeStatusOfCourse = courseAdminCanChangeStatusOfCourse; this.courseAdminCanCreateGuestAccounts = courseAdminCanCreateGuestAccounts; this.orderedLessonIds = orderedLessonIds; + this.enableGradeBookForLearners = enableGradeBookForLearners; + this.enableGradeBookForMonitors = enableGradeBookForMonitors; } /** default constructor */ @@ -127,6 +135,8 @@ this.courseAdminCanBrowseAllUsers = Boolean.FALSE; this.courseAdminCanChangeStatusOfCourse = Boolean.FALSE; this.courseAdminCanCreateGuestAccounts = Boolean.FALSE; + this.enableGradeBookForLearners = Boolean.FALSE; + this.enableGradeBookForMonitors = Boolean.FALSE; } @@ -144,6 +154,8 @@ this.courseAdminCanBrowseAllUsers = Boolean.FALSE; this.courseAdminCanChangeStatusOfCourse = Boolean.FALSE; this.courseAdminCanCreateGuestAccounts = Boolean.FALSE; + this.enableGradeBookForLearners = Boolean.FALSE; + this.enableGradeBookForMonitors = Boolean.FALSE; } public Organisation(String name, String description, @@ -487,4 +499,34 @@ this.orderedLessonIds = orderedLessonIds; } + /** + * @hibernate.property + * column="enable_teacher_gradebook" + * length="1" + * not-null="true" + * + */ + public Boolean getEnableGradeBookForMonitors() { + return enableGradeBookForMonitors; + } + + public void setEnableGradeBookForMonitors(Boolean enableGradeBookForMonitors) { + this.enableGradeBookForMonitors = enableGradeBookForMonitors; + } + + /** + * @hibernate.property + * column="enable_learner_gradebook" + * length="1" + * not-null="true" + * + */ + public Boolean getEnableGradeBookForLearners() { + return enableGradeBookForLearners; + } + + public void setEnableGradeBookForLearners(Boolean enableGradeBookForLearners) { + this.enableGradeBookForLearners = enableGradeBookForLearners; + } + }