Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5bd95ffef22a2fdc60414cfd9cfb22968b88c13b -r85d81241e2ed717af5d7a966970e010667a07d37
--- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5bd95ffef22a2fdc60414cfd9cfb22968b88c13b)
+++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 85d81241e2ed717af5d7a966970e010667a07d37)
@@ -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
===================================================================
diff -u -r5bd95ffef22a2fdc60414cfd9cfb22968b88c13b -r85d81241e2ed717af5d7a966970e010667a07d37
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 5bd95ffef22a2fdc60414cfd9cfb22968b88c13b)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 85d81241e2ed717af5d7a966970e010667a07d37)
@@ -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/struts/struts-config.xml
===================================================================
diff -u -r3bc65f0652b50074ff432112d8e47a6df3728810 -r85d81241e2ed717af5d7a966970e010667a07d37
--- lams_admin/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 3bc65f0652b50074ff432112d8e47a6df3728810)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 85d81241e2ed717af5d7a966970e010667a07d37)
@@ -55,6 +55,8 @@
+
+
Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -r85d81241e2ed717af5d7a966970e010667a07d37
--- lams_admin/web/WEB-INF/web.xml (.../web.xml) (revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_admin/web/WEB-INF/web.xml (.../web.xml) (revision 85d81241e2ed717af5d7a966970e010667a07d37)
@@ -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/organisation/createOrEdit.jsp
===================================================================
diff -u -ref31c70885b34d2475c8b297d7f9bb0f564a829b -r85d81241e2ed717af5d7a966970e010667a07d37
--- lams_admin/web/organisation/createOrEdit.jsp (.../createOrEdit.jsp) (revision ef31c70885b34d2475c8b297d7f9bb0f564a829b)
+++ lams_admin/web/organisation/createOrEdit.jsp (.../createOrEdit.jsp) (revision 85d81241e2ed717af5d7a966970e010667a07d37)
@@ -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
===================================================================
diff -u -r97336c15381a6a96013b087b0844f173d1ddedd7 -r85d81241e2ed717af5d7a966970e010667a07d37
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml (.../Organisation.hbm.xml) (revision 97336c15381a6a96013b087b0844f173d1ddedd7)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml (.../Organisation.hbm.xml) (revision 85d81241e2ed717af5d7a966970e010667a07d37)
@@ -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
===================================================================
diff -u -r7710ad6a9da4fb71036736cd340ffc4fc24864ff -r85d81241e2ed717af5d7a966970e010667a07d37
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 7710ad6a9da4fb71036736cd340ffc4fc24864ff)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 85d81241e2ed717af5d7a966970e010667a07d37)
@@ -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
===================================================================
diff -u -r02df1b4f76fac80d72ff5583feddace3897844d9 -r85d81241e2ed717af5d7a966970e010667a07d37
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql (.../patch0015_updateFrom22.sql) (revision 02df1b4f76fac80d72ff5583feddace3897844d9)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql (.../patch0015_updateFrom22.sql) (revision 85d81241e2ed717af5d7a966970e010667a07d37)
@@ -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
===================================================================
diff -u -r97336c15381a6a96013b087b0844f173d1ddedd7 -r85d81241e2ed717af5d7a966970e010667a07d37
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision 97336c15381a6a96013b087b0844f173d1ddedd7)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision 85d81241e2ed717af5d7a966970e010667a07d37)
@@ -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;
+ }
+
}