Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.324.2.7.2.5 -r1.324.2.7.2.6
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java	12 Apr 2010 01:06:38 -0000	1.1.2.2
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java	15 Apr 2010 21:29:18 -0000	1.1.2.3
@@ -34,7 +34,7 @@
  * Hibernate implementation of <code>ILogEventDAO</code>.
  * 
  * @author Andrey Balan
- * @see org.lamsfoundation.lams.timezone.dao.ITimezoneDAO
+ * @see org.lamsfoundation.lams.timezone.dao.ILogEventDAO
  */
 public class LogEventDAO extends BaseDAO implements ILogEventDAO {
     
@@ -44,8 +44,8 @@
     private static final String GET_LOG_EVENT_BY_USER = "from " + LogEvent.class.getName()
 	    + " where user_id = ? order by occurred_date_time asc";
     
-    private static final String GET_LOG_EVENTS_OCCURED_AFTER_DATE = "from " + LogEvent.class.getName()
-	    + " where occurred_date_time > ? order by occurred_date_time asc";    
+    private static final String GET_LOG_EVENTS_OCCURED_BETWEEN_DATES = "from " + LogEvent.class.getName()
+	    + " where occurred_date_time > ? and occurred_date_time <= ? order by occurred_date_time asc";    
     
     public void save(LogEvent logEvent) {
 	super.insert(logEvent);
@@ -64,8 +64,8 @@
 	return getHibernateTemplate().find(GET_LOG_EVENT_BY_USER, userId);
     }
     
-    public List<LogEvent> getEventsOccurredAfter(Date date) {
-	return getHibernateTemplate().find(GET_LOG_EVENTS_OCCURED_AFTER_DATE, date);
+    public List<LogEvent> getEventsOccurredBetween(Date startDate, Date finishDate) {
+	return getHibernateTemplate().find(GET_LOG_EVENTS_OCCURED_BETWEEN_DATES, new Date[] { startDate, finishDate });
     }
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java	12 Apr 2010 01:06:38 -0000	1.1.2.2
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java	15 Apr 2010 21:29:18 -0000	1.1.2.3
@@ -31,7 +31,9 @@
 import org.lamsfoundation.lams.logevent.dao.ILogEventDAO;
 import org.lamsfoundation.lams.logevent.dao.hibernate.LogEventDAO;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.exception.UserException;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
 
 /**
  * Class implements <code>ILogEventService</code>.
@@ -46,17 +48,19 @@
     private ILogEventDAO logEventDAO;   
     private IUserManagementService userManagementService;
     
-    
-    public void logEvent(Integer logEventTypeId, Integer userId) {
+    public void logEvent(Integer logEventTypeId, Integer userId, Long learningDesignId, Long lessonId, Long activityId) {
 	User user = (userId != null) ? (User) userManagementService.findById(User.class, userId) : null;
 	if (user == null) {
 	    throw new RuntimeException("User can't be null");
 	}
 	LogEvent logEvent = new LogEvent();
 	logEvent.setLogEventTypeId(logEventTypeId);
 	logEvent.setUser(user);
+	logEvent.setLearningDesignId(learningDesignId);
+	logEvent.setLessonId(lessonId);
+	logEvent.setActivityId(activityId);
 	logEventDAO.save(logEvent);
-    }    
+    }
 
     public LogEvent getLogEventById(Long logEventId) {
 	return logEventDAO.getById(logEventId);
@@ -66,8 +70,8 @@
 	return logEventDAO.getByUser(userId);
     }
     
-    public List<LogEvent> getEventsOccurredAfter(Date date) {
-	return logEventDAO.getEventsOccurredAfter(date);
+    public List<LogEvent> getEventsOccurredBetween(Date startDate, Date finishDate) {
+	return logEventDAO.getEventsOccurredBetween(startDate, finishDate);
     }
     
     /**
@@ -89,3 +93,4 @@
     }
 
 }
+