Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/Attic/LogEvent.hbm.xml,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml	9 Apr 2010 18:02:27 -0000	1.1.2.1
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml	15 Apr 2010 21:15:03 -0000	1.1.2.2
@@ -57,6 +57,30 @@
             not-null="true"
         />
 
+        <property
+            name="learningDesignId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="learning_design_id"
+        />
+
+        <property
+            name="lessonId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="lesson_id"
+        />
+
+        <property
+            name="activityId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="activity_id"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-LogEvent.xml
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.138.2.6.2.7 -r1.138.2.6.2.8
--- lams_common/db/sql/create_lams_11_tables.sql	9 Apr 2010 18:02:27 -0000	1.138.2.6.2.7
+++ lams_common/db/sql/create_lams_11_tables.sql	15 Apr 2010 21:15:03 -0000	1.138.2.6.2.8
@@ -875,13 +875,22 @@
      , log_event_type_id INT(5) NOT NULL
      , user_id BIGINT(20) NOT NULL
      , occurred_date_time DATETIME NOT NULL
+     , learning_design_id BIGINT(20)
+     , lesson_id BIGINT(20)
+     , activity_id BIGINT(20)
      , PRIMARY KEY (id)
      , INDEX (occurred_date_time)
      , CONSTRAINT FK_lams_event_log_1 FOREIGN KEY (log_event_type_id)
                   REFERENCES lams_log_event_type (log_event_type_id)
 	 , INDEX (user_id)                  
      , CONSTRAINT FK_lams_event_log_2 FOREIGN KEY (user_id)
-                  REFERENCES lams_user (user_id)                  
+                  REFERENCES lams_user (user_id)           
+     , CONSTRAINT FK_lams_event_log_3 FOREIGN KEY (learning_design_id)
+                  REFERENCES lams_learning_design (learning_design_id)
+     , CONSTRAINT FK_lams_event_log_4 FOREIGN KEY (lesson_id)
+                  REFERENCES lams_lesson (lesson_id)
+     , CONSTRAINT FK_lams_event_log_5 FOREIGN KEY (activity_id)
+                  REFERENCES lams_learning_activity (activity_id)
 )TYPE=InnoDB;
 
 CREATE TABLE lams_workspace_folder_content (
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java	9 Apr 2010 18:02:27 -0000	1.1.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java	15 Apr 2010 21:15:03 -0000	1.1.2.2
@@ -63,7 +63,16 @@
 
     /** Date this activity was created */
     private Date occurredDateTime;
+    
+    /**  */
+    private Long learningDesignId;
+    
+    /**  */
+    private Long lessonId;    
 
+    /**  */
+    private Long activityId;    
+
     /*
      * For the occurredDateTime fields, if the value is null, then it will default to the current time.
      */
@@ -77,13 +86,11 @@
     // Getters and Setters
     // ---------------------------------------------------------------------
     /**
-     * @hibernate.id generator-class="native" type="java.lang.Long"
-     *                         column="id"
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="id"
      */
     public Long getId() {
 	return id;
     }
-
     public void setId(Long id) {
 	this.id = id;
     }
@@ -94,7 +101,6 @@
     public Integer getLogEventTypeId() {
 	return logEventTypeId;
     }
-
     public void setLogEventTypeId(Integer logEventTypeId) {
 	this.logEventTypeId = logEventTypeId;
     }
@@ -106,7 +112,6 @@
     public User getUser() {
         return this.user;
     }
-
     public void setUser(User user) {
         this.user = user;
     }
@@ -117,10 +122,38 @@
     public Date getOccurredDateTime() {
 	return occurredDateTime;
     }
-
     /* If occurredDateTime is null, then it will default to the current date/time */
     public void setOccurredDateTime(Date occurredDateTime) {
 	this.occurredDateTime = occurredDateTime != null ? occurredDateTime : new Date();
     }
 
+    /**
+     * @hibernate.property column="learning_design_id"
+     */
+    public Long getLearningDesignId() {
+	return learningDesignId;
+    }
+    public void setLearningDesignId(Long learningDesignId) {
+	this.learningDesignId = learningDesignId;
+    }
+    
+    /**
+     * @hibernate.property column="lesson_id"
+     */
+    public Long getLessonId() {
+	return lessonId;
+    }
+    public void setLessonId(Long lessonId) {
+	this.lessonId = lessonId;
+    }
+    
+    /**
+     * @hibernate.property column="activity_id"
+     */
+    public Long getActivityId() {
+	return activityId;
+    }
+    public void setActivityId(Long activityId) {
+	this.activityId = activityId;
+    }    
 }
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/dao/ILogEventDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/logevent/dao/ILogEventDAO.java,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_common/src/java/org/lamsfoundation/lams/logevent/dao/ILogEventDAO.java	9 Apr 2010 18:02:27 -0000	1.1.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/dao/ILogEventDAO.java	15 Apr 2010 21:15:03 -0000	1.1.2.2
@@ -59,11 +59,12 @@
     List<LogEvent> getByUser(Integer userId);
     
     /**
-     * Returns all events occurred after specified date
+     * Returns all events occurred between specified dates
      * 
-     * @param date
+     * @param startDate
+     * @param finishDate
      * @return
      */
-    List<LogEvent> getEventsOccurredAfter(Date date);
+    List<LogEvent> getEventsOccurredBetween(Date startDate, Date finishDate);
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/service/ILogEventService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/logevent/service/ILogEventService.java,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_common/src/java/org/lamsfoundation/lams/logevent/service/ILogEventService.java	9 Apr 2010 18:02:27 -0000	1.1.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/service/ILogEventService.java	15 Apr 2010 21:15:03 -0000	1.1.2.2
@@ -42,7 +42,7 @@
      * @param logEventTypeId
      * @param userId
      */
-    void logEvent(Integer logEventTypeId, Integer userId);
+    void logEvent(Integer logEventTypeId, Integer userId, Long learningDesignId, Long lessonId, Long activityId);
 
     /**
      * Returns event by the given id.
@@ -60,11 +60,12 @@
     List<LogEvent> getLogEventByUser(Integer userId);
     
     /**
-     * Returns all events occurred after specified date
+     * Returns all events occurred between specified dates
      * 
-     * @param date
+     * @param startDate the first date
+     * @param finishDate the second date
      * @return
      */
-    List<LogEvent> getEventsOccurredAfter(Date date);
+    List<LogEvent> getEventsOccurredBetween(Date startDate, Date finishDate);
 
 }