Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r009fbce36f45d0929f8007c4bbc798242f57d3af -r8cbd631849cddfbfc7fb887e8a847894e5baaefa
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -r8cbd631849cddfbfc7fb887e8a847894e5baaefa
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml (.../authoringApplicationContext.xml) (revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml (.../authoringApplicationContext.xml) (revision 8cbd631849cddfbfc7fb887e8a847894e5baaefa)
@@ -58,7 +58,7 @@
LogEvent.
+ *
+ * @author Andrey Balan
+ * @see org.lamsfoundation.lams.logevent.LogEvent
+ */
+public interface ILogEventDAO {
+
+ /**
+ * Records occurred event in database.
+ *
+ * @param logEvent occurred event
+ */
+ void save(LogEvent logEvent);
+
+ /**
+ * Returns event by the given id.
+ *
+ * @return
+ */
+ LogEvent getById(Long logEventId);
+
+ /**
+ * Returns all events initiated by user
+ *
+ * @param userId
+ * @return
+ */
+ List getByUser(Integer userId);
+
+ /**
+ * Returns all events occurred between specified dates
+ *
+ * @param startDate
+ * @param finishDate
+ * @return
+ */
+ List getEventsOccurredBetween(Date startDate, Date finishDate);
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java (revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java (revision 8cbd631849cddfbfc7fb887e8a847894e5baaefa)
@@ -0,0 +1,71 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.logevent.dao.hibernate;
+
+import java.util.Date;
+import java.util.List;
+
+import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.dao.ILogEventDAO;
+
+/**
+ * Hibernate implementation of ILogEventDAO.
+ *
+ * @author Andrey Balan
+ * @see org.lamsfoundation.lams.timezone.dao.ILogEventDAO
+ */
+public class LogEventDAO extends BaseDAO implements ILogEventDAO {
+
+ private static final String GET_LOG_EVENT_BY_ID = "from " + LogEvent.class.getName()
+ + "where id = ?";
+
+ 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_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);
+ }
+
+ public LogEvent getById(Long logEventId) {
+ List list = getHibernateTemplate().find(GET_LOG_EVENT_BY_ID, logEventId);
+ if (list.size() > 0) {
+ return (LogEvent) list.get(0);
+ } else {
+ return null;
+ }
+ }
+
+ public List getByUser(Integer userId) {
+ return getHibernateTemplate().find(GET_LOG_EVENT_BY_USER, userId);
+ }
+
+ public List 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/ILogEventService.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/logevent/service/ILogEventService.java (revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/service/ILogEventService.java (revision 8cbd631849cddfbfc7fb887e8a847894e5baaefa)
@@ -0,0 +1,71 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.logevent.service;
+
+import java.util.Date;
+import java.util.List;
+
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.usermanagement.User;
+
+/**
+ * Manages LogEvents.
+ *
+ * @author Andrey Balan
+ */
+public interface ILogEventService {
+
+ /**
+ * Records event of specified type in database.
+ *
+ * @param logEventTypeId
+ * @param userId
+ */
+ void logEvent(Integer logEventTypeId, Integer userId, Long learningDesignId, Long lessonId, Long activityId);
+
+ /**
+ * Returns event by the given id.
+ *
+ * @return
+ */
+ LogEvent getLogEventById(Long logEventId);
+
+ /**
+ * Returns all events initiated by user
+ *
+ * @param userId
+ * @return
+ */
+ List getLogEventByUser(Integer userId);
+
+ /**
+ * Returns all events occurred between specified dates
+ *
+ * @param startDate the first date
+ * @param finishDate the second date
+ * @return
+ */
+ List getEventsOccurredBetween(Date startDate, Date finishDate);
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java (revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java (revision 8cbd631849cddfbfc7fb887e8a847894e5baaefa)
@@ -0,0 +1,127 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.logevent.service;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.events.IEventNotificationService;
+import org.lamsfoundation.lams.events.ResendMessagesJob;
+import org.lamsfoundation.lams.logevent.LogEvent;
+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;
+import org.quartz.JobDetail;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.SimpleTrigger;
+import org.quartz.Trigger;
+
+/**
+ * Class implements ILogEventService.
+ *
+ * @author Andrey Balan
+ * @see org.lamsfoundation.lams.timezone.service.ILogEventService
+ */
+public class LogEventService implements ILogEventService{
+
+ private Logger log = Logger.getLogger(LogEventService.class);
+
+ /**
+ * The only instance of this class, since it is a singleton.
+ */
+ private static LogEventService instance;
+
+ private ILogEventDAO logEventDAO;
+ private IUserManagementService userManagementService;
+
+ /**
+ * Default constructor. Should be called only once, since this class in a singleton.
+ *
+ */
+ public LogEventService() {
+ if (LogEventService.instance == null) {
+ LogEventService.instance = this;
+ }
+ }
+
+ /**
+ * Gets the only existing instance of the class.
+ *
+ * @return instance of this class
+ */
+ public static LogEventService getInstance() {
+ return LogEventService.instance;
+ }
+
+ 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);
+ }
+
+ public List getLogEventByUser(Integer userId) {
+ return logEventDAO.getByUser(userId);
+ }
+
+ public List getEventsOccurredBetween(Date startDate, Date finishDate) {
+ return logEventDAO.getEventsOccurredBetween(startDate, finishDate);
+ }
+
+ /**
+ *
+ * @param logEventDAO
+ * The logEventDAO to set.
+ */
+ public void setLogEventDAO(LogEventDAO logEventDAO) {
+ this.logEventDAO = logEventDAO;
+ }
+
+ /**
+ *
+ * @param logEventDAO
+ * The logEventDAO to set.
+ */
+ public void setUserManagementService(IUserManagementService userManagementService) {
+ this.userManagementService = userManagementService;
+ }
+
+}
+
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
diff -u -rea79f29aed5c764a223234e456442bc1e49fcf85 -r8cbd631849cddfbfc7fb887e8a847894e5baaefa
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml (.../learningApplicationContext.xml) (revision ea79f29aed5c764a223234e456442bc1e49fcf85)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml (.../learningApplicationContext.xml) (revision 8cbd631849cddfbfc7fb887e8a847894e5baaefa)
@@ -38,6 +38,7 @@