Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml,v
diff -u -r1.23 -r1.23.6.1
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml 16 Nov 2006 01:05:05 -0000 1.23
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml 20 Feb 2007 06:16:10 -0000 1.23.6.1
@@ -14,6 +14,11 @@
+
+
@@ -44,6 +49,9 @@
+
+
Index: lams_common/db/model/lams_11.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/model/lams_11.clay,v
diff -u -r1.73.2.1 -r1.73.2.2
--- lams_common/db/model/lams_11.clay 2 Feb 2007 06:44:36 -0000 1.73.2.1
+++ lams_common/db/model/lams_11.clay 20 Feb 2007 06:17:02 -0000 1.73.2.2
@@ -801,11 +801,11 @@
-
+
-
+
@@ -1042,8 +1042,8 @@
-
+
@@ -2692,6 +2692,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4268,7 +4294,7 @@
-
+
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.88.2.1 -r1.88.2.2
--- lams_common/db/sql/create_lams_11_tables.sql 2 Feb 2007 06:44:44 -0000 1.88.2.1
+++ lams_common/db/sql/create_lams_11_tables.sql 20 Feb 2007 06:17:03 -0000 1.88.2.2
@@ -508,7 +508,7 @@
, library_activity_id BIGINT(20)
, language_file VARCHAR(255)
, system_tool_id BIGINT(20)
- , read_only TINYINT
+ , read_only TINYINT DEFAULT 0
, PRIMARY KEY (activity_id)
, INDEX (learning_library_id)
, CONSTRAINT FK_lams_learning_activity_7 FOREIGN KEY (learning_library_id)
@@ -563,7 +563,9 @@
, end_date_time DATETIME
, schedule_end_date_time DATETIME
, previous_state_id INT(3)
- , learner_exportport_avail TINYINT(1)
+ , learner_exportport_avail TINYINT(1) DEFAULT 1
+ , locked_for_edit TINYINT DEFAULT 0
+ , version INTEGER DEFAULT 1
, PRIMARY KEY (lesson_id)
, INDEX (learning_design_id)
, CONSTRAINT FK_lams_lesson_1_1 FOREIGN KEY (learning_design_id)
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/db/sql/updatescripts/alter_21_editonfly.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java,v
diff -u -r1.28 -r1.28.6.1
--- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java 16 Nov 2006 01:04:50 -0000 1.28
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java 20 Feb 2007 06:15:49 -0000 1.28.6.1
@@ -75,6 +75,9 @@
/** identifier field */
private Long lessonId;
+ /** Hibernate managed version field */
+ private Integer version;
+
/** persistent field */
private String lessonName;
@@ -120,6 +123,9 @@
/** Persistent field. Defaults to FALSE if not set to anything by a constructor parameter. */
private Boolean learnerExportAvailable;
+ /** Persistent field. Defaults to FALSE - is not included in the constructor anywhere. */
+ private Boolean lockedForEdit;
+
//---------------------------------------------------------------------
// constructors
//---------------------------------------------------------------------
@@ -137,7 +143,7 @@
LearningDesign learningDesign,Set learnerProgresses)
{
this(null,name,description,createDateTime,null,null,user,lessonStateId,previousLessonStateId,
- learnerExportAvailable,learningDesign,null,null,learnerProgresses);
+ learnerExportAvailable,false, learningDesign,null,null,learnerProgresses);
}
/**
@@ -150,12 +156,12 @@
Organisation organisation, Set learnerProgresses)
{
this(null,name,description,createDateTime,null,null,user,lessonStateId,previousLessonStateId,
- learnerExportAvailable, learningDesign,lessonClass,organisation,learnerProgresses);
+ learnerExportAvailable, false, learningDesign,lessonClass,organisation,learnerProgresses);
}
/** full constructor */
public Lesson(Long lessonId,String name,String description, Date createDateTime, Date startDateTime, Date endDateTime, User user,
- Integer lessonStateId, Integer previousLessonStateId, Boolean learnerExportAvailable,
+ Integer lessonStateId, Integer previousLessonStateId, Boolean learnerExportAvailable, Boolean lockedForEdit,
LearningDesign learningDesign, LessonClass lessonClass,
Organisation organisation, Set learnerProgresses)
{
@@ -169,6 +175,7 @@
this.lessonStateId = lessonStateId;
this.previousLessonStateId = previousLessonStateId;
this.learnerExportAvailable = learnerExportAvailable != null ? learnerExportAvailable : Boolean.FALSE;
+ this.lockedForEdit = false;
this.learningDesign = learningDesign;
this.lessonClass = lessonClass;
this.organisation = organisation;
@@ -249,7 +256,20 @@
this.lessonId = lessonId;
}
- /**
+ /**
+ * Hibernate version column - updated automatically
+ *
+ * @hibernate.version type="java.lang.Integer"
+ * column="version"
+ */
+ public Integer getVersion() {
+ return this.version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+ /**
* @hibernate.property column="name" length="255" not-null="true"
* @return Returns the lessonName.
*/
@@ -399,6 +419,18 @@
}
/**
+ * @hibernate.property type="java.lang.Boolean" column="locked_for_edit"
+ * length="1"
+ */
+ public Boolean getLockedForEdit() {
+ return lockedForEdit;
+ }
+
+ public void setLockedForEdit(Boolean lockedForEdit) {
+ this.lockedForEdit = lockedForEdit;
+ }
+
+ /**
* @hibernate.many-to-one not-null="true" cascade="none"
* @hibernate.column name="learning_design_id"
*/