Activity lams-github/

8:20 am

jfang

More
ff29367
changed 1 file
v4.7, v4.8

fix the bug caused by using learner progress data across request.

- -19
- +1
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
- History
- Source
- Diff
/lams_learning/src/.../ActivityAction.java

9:26 pm

jfang

More
1ac0307
changed 15 files
v4.7, v4.8

implemented complete activity for the completion of system driven activity. customized the Spring OpenSessionInViewFilter to resolve redundent hibernate session issue.

- -0
- +18
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
- History
- Source
- Diff
/lams_learning/src/.../ILearnerService.java
- -2
- +10
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
/lams_learning/src/.../LearnerService.java
- -1
- +47
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
- History
- Source
- Diff
/lams_learning/src/.../GroupingAction.java
- -0
- +79
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/CustomizedOpenSessionInViewFilter.java
- History
- Source
/lams_learning/.../CustomizedOpenSessionInViewFilter.java
- -18
- +17
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LessonLearnerDataManager.java
- History
- Source
- Diff
/lams_learning/.../LessonLearnerDataManager.java
- -0
- +13
/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
- History
- Source
- Diff
/lams_learning/.../TestGroupingAction.java
- -1
- +0
/lams_learning/test/web/WEB-INF/spring/applicationContext.xml
- History
- Source
- Diff
/lams_learning/.../applicationContext.xml
- -1
- +2
/lams_learning/test/web/WEB-INF/spring/learningApplicationContext.xml
- History
- Source
- Diff
/lams_learning/.../learningApplicationContext.xml
- -1
- +0
/lams_learning/web/WEB-INF/spring/applicationContext.xml
- History
- Source
- Diff
/lams_learning/web/.../applicationContext.xml
- -1
- +2
/lams_learning/web/WEB-INF/spring/learningApplicationContext.xml
- History
- Source
- Diff
/lams_learning/.../learningApplicationContext.xml
- -1
- +4
/lams_learning/web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
/lams_learning/web/.../struts-config.xml
- -1
- +7
/lams_learning/web/WEB-INF/struts/tiles-defs.xml
- History
- Source
- Diff
/lams_learning/web/.../struts/tiles-defs.xml
- -1
- +1
/lams_learning/web/WEB-INF/web.xml
- History
- Source
- Diff
/lams_learning/web/WEB-INF/web.xml
- -1
- +1
/lams_learning/web/grouping/grouping.jsp
- History
- Source
- Diff
/lams_learning/web/grouping/grouping.jsp
- -2
- +9
/lams_learning/web/layout/activityLayout.jsp
- History
- Source
- Diff
/lams_learning/web/.../activityLayout.jsp

2:03 pm

jfang

More
00814b6
changed 6 files
v4.7, v4.8

view grouping done

- -0
- +2
/lams_learning/conf/xdoclet/struts-forms.xml
- History
- Source
- Diff
/lams_learning/conf/.../struts-forms.xml
- -1
- +2
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
- History
- Source
- Diff
/lams_learning/src/.../GroupingAction.java
- -1
- +1
/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
- History
- Source
- Diff
/lams_learning/.../TestGroupingAction.java
- -0
- +1
/lams_learning/test/web/WEB-INF/spring/learningApplicationContext.xml
- History
- Source
- Diff
/lams_learning/.../learningApplicationContext.xml
- -0
- +6
/lams_learning/test/web/WEB-INF/struts/tiles-defs.xml
- History
- Source
- Diff
/lams_learning/test/.../struts/tiles-defs.xml
- -0
- +79
/lams_learning/web/grouping/grouping.jsp
- History
- Source
/lams_learning/web/grouping/grouping.jsp

10:28 am

jfang

More
ccf8e0c
changed 3 files
v4.7, v4.8

Tested grouping action servlet

- -0
- +156
/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
- History
- Source
/lams_learning/test/.../TestGroupingAction.java
- -1
- +1
/lams_learning/test/web/WEB-INF/spring/applicationContext.xml
- History
- Source
- Diff
/lams_learning/.../applicationContext.xml
- -18
- +43
/lams_learning/test/web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
/lams_learning/test/.../struts-config.xml

3:36 pm

jfang

More
06dd563
changed 18 files
v4.7, v4.8

implemented the learner service layer and struts layer of grouping

- -1
- +29
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
- History
- Source
- Diff
/lams_learning/src/.../ILearnerService.java
- -22
- +76
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
/lams_learning/src/.../LearnerService.java
- -13
- +1
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
- History
- Source
- Diff
/lams_learning/src/.../ActivityAction.java
- -5
- +6
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
- History
- Source
- Diff
/lams_learning/.../DisplayActivityAction.java
- -5
- +8
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
- History
- Source
- Diff
/lams_learning/.../DisplayParallelActivityAction.java
- -0
- +188
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
- History
- Source
/lams_learning/src/.../action/GroupingAction.java
- -9
- +18
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
- History
- Source
- Diff
/lams_learning/src/.../LearnerAction.java
- -13
- +6
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
- History
- Source
- Diff
/lams_learning/src/.../ActivityMapping.java
- -12
- +9
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
- History
- Source
- Diff
/lams_learning/.../ActivityMappingStrategy.java
- -0
- +70
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
- History
- Source
- Diff
/lams_learning/src/.../LearningWebUtil.java
- -0
- +166
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LessonLearnerDataManager.java
- History
- Source
/lams_learning/.../LessonLearnerDataManager.java
- -15
- +5
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ParallelActivityMappingStrategy.java
- History
- Source
- Diff
/lams_learning/.../ParallelActivityMappingStrategy.java
- -2
- +17
/lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
/lams_learning/.../TestLearnerService.java
- -31
- +43
/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java
- History
- Source
- Diff
/lams_learning/.../TestDisplayActivityAction.java
- -9
- +18
/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java
- History
- Source
- Diff
/lams_learning/.../TestLearnerAction.java
… 3 more files in changeset.

2:54 pm

cperfect

More
40bd333
changed 2 files
v4.7, v4.8

no message

- -0
- +43
/lams_tool_deploy/test/file/application.xml
- History
- Source
/lams_tool_deploy/test/file/application.xml
- -2
- +1
/lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/FileTokenReplacerTest.java
- History
- Source
- Diff
/lams_tool_deploy/.../FileTokenReplacerTest.java

2:41 pm

cperfect

More
a174a94
added 20 files
v4.7, v4.8

no message

- -0
- +97
/lams_tool_deploy/build.xml
- History
- Source
/lams_tool_deploy/build.xml
- binary
/lams_tool_deploy/lib/ant/ant.jar
- History
- Source
/lams_tool_deploy/lib/ant/ant.jar
- binary
/lams_tool_deploy/lib/jakarta-commmons/commons-dbutils-1.0.jar
- History
- Source
/lams_tool_deploy/lib/.../commons-dbutils-1.0.jar
- binary
/lams_tool_deploy/lib/junit/junit.jar
- History
- Source
/lams_tool_deploy/lib/junit/junit.jar
- binary
/lams_tool_deploy/lib/mysql/mysql-connector-java-3.1.7-bin.jar
- History
- Source
/lams_tool_deploy/.../mysql-connector-java-3.1.7-bin.jar
- -0
- +67
/lams_tool_deploy/nbproject/project.xml
- History
- Source
/lams_tool_deploy/nbproject/project.xml
- -0
- +59
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/AddWebAppToApplicationXmlTask.java
- History
- Source
/lams_tool_deploy/.../AddWebAppToApplicationXmlTask.java
- -0
- +84
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DBTask.java
- History
- Source
/lams_tool_deploy/src/java/.../deploy/DBTask.java
- -0
- +42
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployException.java
- History
- Source
/lams_tool_deploy/src/.../DeployException.java
- -0
- +51
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployWarTask.java
- History
- Source
/lams_tool_deploy/src/.../DeployWarTask.java
- -0
- +145
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/FileTokenReplacer.java
- History
- Source
/lams_tool_deploy/src/.../FileTokenReplacer.java
- -0
- +59
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/RemoveWebAppFromApplicationXmlTask.java
- History
- Source
/lams_tool_deploy/.../RemoveWebAppFromApplicationXmlTask.java
- -0
- +16
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Task.java
- History
- Source
/lams_tool_deploy/src/java/.../deploy/Task.java
- -0
- +75
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBActivateTask.java
- History
- Source
/lams_tool_deploy/src/.../ToolDBActivateTask.java
- -0
- +389
/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/ToolDBDeployTask.java
- History
- Source
/lams_tool_deploy/src/.../ToolDBDeployTask.java
… 5 more files in changeset.

8:47 am

jfang

More
8f947c7
changed 1 file
v4.7, v4.8

change some grouping data to make more sense.

- -2
- +2
/lams_common/db/sql/insert_test_data.sql
- History
- Source
- Diff
/lams_common/db/sql/insert_test_data.sql

12:15 pm

jfang

More
8559298
changed 2 files
v4.7, v4.8

add helper method to detect existing learner for a grouping

- -1
- +6
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
- History
- Source
- Diff
/lams_common/src/.../Grouping.java
- -2
- +2
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
- History
- Source
- Diff
/lams_common/src/.../RandomGrouper.java

12:14 pm

jfang

More
1e0bc17
changed 3 files
v4.7, v4.8

add new dao method to get active leaners by lesson - the learners who have started the lesson.

- -1
- +7
/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
- History
- Source
- Diff
/lams_common/src/java/.../dao/ILessonDAO.java
- -1
- +20
/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
- History
- Source
- Diff
/lams_common/src/.../hibernate/LessonDAO.java
- -0
- +6
/lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java
- History
- Source
- Diff
/lams_common/test/.../dao/TestLessonDAO.java

10:18 am

The deploy task didn't work - was trying to copy ear from D:\eclipse\workspace\lams_common\assembly\assembly\lams.ear. Also changed jboss directory to the windows directory, so any unix/linux users will need to change it back.