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.2 -r1.324.2.7.2.3 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml,v diff -u -r1.20 -r1.20.6.1 --- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml 26 Mar 2009 10:00:34 -0000 1.20 +++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml 9 Apr 2010 18:02:35 -0000 1.20.6.1 @@ -58,7 +58,7 @@ - + Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java,v diff -u -r1.84.4.1.2.1 -r1.84.4.1.2.2 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java 17 Feb 2010 03:23:22 -0000 1.84.4.1.2.1 +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java 9 Apr 2010 18:02:35 -0000 1.84.4.1.2.2 @@ -77,6 +77,8 @@ import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.service.ILessonService; +import org.lamsfoundation.lams.logevent.LogEvent; +import org.lamsfoundation.lams.logevent.service.ILogEventService; import org.lamsfoundation.lams.monitoring.service.IMonitoringService; import org.lamsfoundation.lams.monitoring.service.MonitoringServiceException; import org.lamsfoundation.lams.planner.dao.PedagogicalPlannerDAO; @@ -155,6 +157,8 @@ protected IMonitoringService monitoringService; protected IWorkspaceManagementService workspaceManagementService; + + protected ILogEventService logEventService; protected ToolContentIDGenerator contentIDGenerator; @@ -326,6 +330,10 @@ public void setWorkspaceManagementService(IWorkspaceManagementService workspaceManagementService) { this.workspaceManagementService = workspaceManagementService; } + + public void setLogEventService(ILogEventService logEventService) { + this.logEventService = logEventService; + } /** * @param contentIDGenerator @@ -1641,10 +1649,9 @@ } copyLearningDesignToolContent(design, design, design.getCopyTypeID(), customCSV); - - - } + + logEventService.logEvent(LogEvent.TYPE_TEACHER_LEARNING_DESIGN_CREATE, userID); return design.getLearningDesignId(); } Index: lams_common/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/build.xml,v diff -u -r1.69.6.2 -r1.69.6.3 --- lams_common/build.xml 30 Mar 2010 23:50:13 -0000 1.69.6.2 +++ lams_common/build.xml 9 Apr 2010 18:02:27 -0000 1.69.6.3 @@ -434,6 +434,8 @@ + + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? 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.6 -r1.138.2.6.2.7 --- lams_common/db/sql/create_lams_11_tables.sql 31 Mar 2010 22:08:41 -0000 1.138.2.6.2.6 +++ lams_common/db/sql/create_lams_11_tables.sql 9 Apr 2010 18:02:27 -0000 1.138.2.6.2.7 @@ -871,16 +871,17 @@ )TYPE=InnoDB; CREATE TABLE lams_log_event ( - log_event_id BIGINT(20) NOT NULL AUTO_INCREMENT + id BIGINT(20) NOT NULL AUTO_INCREMENT , log_event_type_id INT(5) NOT NULL - , user_id BIGINT(20) - , timestamp DATETIME NOT NULL - , ref_id BIGINT(20) - , message VARCHAR(255) - , PRIMARY KEY (log_event_id) - , INDEX (log_event_type_id) + , user_id BIGINT(20) NOT NULL + , occurred_date_time DATETIME NOT NULL + , 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) )TYPE=InnoDB; CREATE TABLE lams_workspace_folder_content ( Index: lams_common/db/sql/insert_types_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_types_data.sql,v diff -u -r1.85.4.4.2.9 -r1.85.4.4.2.10 --- lams_common/db/sql/insert_types_data.sql 31 Mar 2010 19:15:33 -0000 1.85.4.4.2.9 +++ lams_common/db/sql/insert_types_data.sql 9 Apr 2010 18:02:27 -0000 1.85.4.4.2.10 @@ -130,12 +130,15 @@ INSERT INTO lams_grouping_support_type VALUES (2 ,'OPTIONAL'); INSERT INTO lams_grouping_support_type VALUES (3 ,'REQUIRED'); -INSERT INTO lams_log_event_type VALUES (1, 'LEARNER_LESSON_START'); -INSERT INTO lams_log_event_type VALUES (2, 'LEARNER_LESSON_FINISH'); -INSERT INTO lams_log_event_type VALUES (3, 'LEARNER_LESSON_EXIT'); -INSERT INTO lams_log_event_type VALUES (4, 'LEARNER_LESSON_RESUME'); -INSERT INTO lams_log_event_type VALUES (5, 'LEARNER_ACTIVITY_START'); -INSERT INTO lams_log_event_type VALUES (6, 'LEARNER_ACTIVITY_FINISH'); +INSERT INTO lams_log_event_type VALUES (1, 'TYPE_TEACHER_LEARNING_DESIGN_CREATE'); +INSERT INTO lams_log_event_type VALUES (2, 'TYPE_TEACHER_LESSON_CREATE'); +INSERT INTO lams_log_event_type VALUES (3, 'TYPE_LEARNER_LESSON_START'); +INSERT INTO lams_log_event_type VALUES (4, 'TYPE_LEARNER_LESSON_FINISH'); +INSERT INTO lams_log_event_type VALUES (5, 'TYPE_LEARNER_LESSON_EXIT'); +INSERT INTO lams_log_event_type VALUES (6, 'TYPE_LEARNER_LESSON_RESUME'); +INSERT INTO lams_log_event_type VALUES (7, 'TYPE_LEARNER_ACTIVITY_START'); +INSERT INTO lams_log_event_type VALUES (8, 'TYPE_LEARNER_ACTIVITY_FINISH'); +INSERT INTO lams_log_event_type VALUES (9, 'TYPE_LEARNER_ADDED_TO_GROUP'); INSERT INTO lams_wkspc_fld_content_type VALUES (1,'FILE'); INSERT INTO lams_wkspc_fld_content_type VALUES (2,'PACKAGE'); Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml,v diff -u -r1.79.2.3.2.3 -r1.79.2.3.2.4 --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml 30 Mar 2010 23:50:13 -0000 1.79.2.3.2.3 +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml 9 Apr 2010 18:02:27 -0000 1.79.2.3.2.4 @@ -78,6 +78,9 @@ classpath:org/lamsfoundation/lams/events/Event.hbm.xml classpath:org/lamsfoundation/lams/events/Subscription.hbm.xml + + classpath:org/lamsfoundation/lams/logevent/LogEvent.hbm.xml + classpath:org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml classpath:org/lamsfoundation/lams/config/Registration.hbm.xml @@ -307,6 +310,25 @@ + + + + + + + + + + + true + + + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + + + + @@ -404,6 +426,11 @@ + + + + + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/logevent/dao/ILogEventDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/logevent/service/ILogEventService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml,v diff -u -r1.24.2.1 -r1.24.2.1.4.1 --- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml 22 Apr 2009 06:39:05 -0000 1.24.2.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml 9 Apr 2010 18:02:17 -0000 1.24.2.1.4.1 @@ -22,7 +22,7 @@ - + @@ -38,6 +38,7 @@ + Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v diff -u -r1.96.4.3.4.1 -r1.96.4.3.4.2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java 13 Jan 2010 03:05:59 -0000 1.96.4.3.4.1 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java 9 Apr 2010 18:02:17 -0000 1.96.4.3.4.2 @@ -67,6 +67,8 @@ import org.lamsfoundation.lams.lesson.dto.LessonDTO; import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.lesson.service.LessonServiceException; +import org.lamsfoundation.lams.logevent.LogEvent; +import org.lamsfoundation.lams.logevent.service.ILogEventService; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolOutputValue; import org.lamsfoundation.lams.tool.ToolSession; @@ -103,6 +105,7 @@ private static HashMap syncMap = new HashMap(); protected MessageService messageService; private IGradebookService gradebookService; + private ILogEventService logEventService; // --------------------------------------------------------------------- // Inversion of Control Methods - Constructor injection @@ -205,6 +208,10 @@ public void setLessonService(ILessonService lessonService) { this.lessonService = lessonService; } + + public void setLogEventService(ILogEventService logEventService) { + this.logEventService = logEventService; + } // --------------------------------------------------------------------- // Service Methods @@ -616,6 +623,8 @@ } } // } + logEventService.logEvent(LogEvent.TYPE_LEARNER_ACTIVITY_FINISH, learnerId); + return nextLearnerProgress; } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml,v diff -u -r1.30 -r1.30.6.1 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml 26 Mar 2009 10:00:35 -0000 1.30 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml 9 Apr 2010 18:02:08 -0000 1.30.6.1 @@ -41,7 +41,8 @@ - + + Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.149.2.7.2.4 -r1.149.2.7.2.5 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 31 Mar 2010 19:14:38 -0000 1.149.2.7.2.4 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 9 Apr 2010 18:02:08 -0000 1.149.2.7.2.5 @@ -76,6 +76,8 @@ import org.lamsfoundation.lams.lesson.dto.LessonDetailsDTO; import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.lesson.service.LessonServiceException; +import org.lamsfoundation.lams.logevent.LogEvent; +import org.lamsfoundation.lams.logevent.service.ILogEventService; import org.lamsfoundation.lams.monitoring.LearnerProgressBatchDTO; import org.lamsfoundation.lams.monitoring.MonitoringConstants; import org.lamsfoundation.lams.tool.ToolSession; @@ -181,6 +183,8 @@ private MessageService messageService; private AuditService auditService; + + private ILogEventService logEventService; /** Message keys */ private static final String FORCE_COMPLETE_STOP_MESSAGE_ACTIVITY_DONE = "force.complete.stop.message.activity.done"; @@ -339,6 +343,10 @@ public void setAuditService(AuditService auditService) { this.auditService = auditService; } + + public void setLogEventService(ILogEventService logEventService) { + this.logEventService = logEventService; + } // --------------------------------------------------------------------- // Service Methods @@ -418,10 +426,11 @@ } } + logEventService.logEvent(LogEvent.TYPE_TEACHER_LESSON_CREATE, userID); + User user = userID != null ? (User) baseDAO.find(User.class, userID) : null; return initializeLesson(lessonName, lessonDescription, learnerExportAvailable, originalLearningDesign, user, runSeqFolder, LearningDesign.COPY_TYPE_LESSON, customCSV, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled); - } /**