Activity lams-github/lams

6:58 am

fmalikoff

More
6c93a29
changed 12 files
v4.7, v4.8

Random grouping now working. Changed to make learner service changes to stop a hibernate lazy initialisation exception when grouping has just been run. Also reduced the amount of data needed to be cached in the session - only the lesson id is needed not the complete lesson.

- -1
- +1
./java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
- History
- Source
- Diff
./java/org/.../TestExportPortfolioService.java
- -15
- +15
./java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
./java/org/.../service/TestLearnerService.java
… 10 more files in changeset.

8:46 pm

fmalikoff

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

Changed calls to update lesson to use the lessonId rather than the lesson. Change allowed us to reduce the amount cached in the context. This fixed various issues with Optional and Parallel activities.

- -1
- +1
./java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
./java/org/.../service/TestLearnerService.java

8:38 pm

fmalikoff

More
2bfd424
changed 15 files
v4.7, v4.8

Changed calls to update lesson to use the lessonId rather than the lesson. Change allowed us to reduce the amount cached in the context. This fixed various issues with Optional and Parallel activities.

- -1
- +1
./java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
- History
- Source
- Diff
./java/org/.../TestExportPortfolioService.java
- -20
- +17
./java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
./java/org/.../service/TestLearnerService.java
… 13 more files in changeset.

3:24 pm

fmalikoff

More
9c471a7
changed 11 files
v4.7, v4.8

Replaced getActiveLessons with getLesson, to suit the change from listing all the lessons in the learner client to just working with a single lesson.

Also moved the logic to cache the lesson learners into the lams.jar (in the LessonService).

- -11
- +2
./java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
./java/org/.../service/TestLearnerService.java
- -24
- +0
./java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java
- History
- Source
- Diff
./java/org/.../action/TestGateAction.java
- -16
- +0
./java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
- History
- Source
- Diff
./java/org/.../action/TestGroupingAction.java
… 8 more files in changeset.

1:39 pm

fmalikoff

More
0977a83
changed 11 files
v4.7, v4.8

Got the existing grouping and gate screens working from the learner interface. More work yet to be done on them.

- -4
- +4
./java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
./java/org/.../service/TestLearnerService.java
… 10 more files in changeset.

1:27 pm

fmalikoff

More
7d5e18b
changed 10 files
v4.7, v4.8

Worked on the learner progress. Was always going back to the first activity when we exited a lesson - the learner progress in the session was out of date (wasn't updated as the tool's called the complete tool method). The learner progress is now in the special LAMS session object and is updated when tool's call the complete method.

Also set up the string that will be used to inform Flash of the learner's progress. This string (attempted&=completed&=current) will be passed to Flash via passon.swf in the tool display jsp.

- -3
- +0
./java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java
- History
- Source
- Diff
./java/org/.../action/TestGateAction.java
- -3
- +0
./java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
- History
- Source
- Diff
./java/org/.../action/TestGroupingAction.java
- -5
- +0
./java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java
- History
- Source
- Diff
./java/org/.../action/TestLearnerAction.java
… 7 more files in changeset.

2:42 pm

fmalikoff

More
cdab818
changed 10 files
v4.7, v4.8

Tool deployment utility has been changed to update the context path and class path when the tool is deployed. Conf versions of web-settings and manifest files modified to suit and the main tool context application file moved so that only the tool's have a context file classpath of /org/lamsfoundation/lams/tool.

- -1
- +1
./java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
- History
- Source
- Diff
./java/org/.../TestExportPortfolioService.java
- -1
- +1
./java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
./java/org/.../service/TestLearnerService.java
- -1
- +1
./java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java
- History
- Source
- Diff
./java/org/.../action/AbstractTestAction.java
- -1
- +1
./web/WEB-INF/web.xml
- History
- Source
- Diff
./web/WEB-INF/web.xml
… 6 more files in changeset.

8:36 am

fmalikoff

More
fc085e0
changed 40 files
v4.7, v4.8

Updated copyright statement - only support GPL v 2.0

- -140
- +37
./web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
./web/WEB-INF/struts/struts-config.xml
- -13
- +13
./web/WEB-INF/struts/tiles-defs.xml
- History
- Source
- Diff
./web/WEB-INF/struts/tiles-defs.xml
- -213
- +162
./web/WEB-INF/web.xml
- History
- Source
- Diff
./web/WEB-INF/web.xml
… 37 more files in changeset.

7:08 am

fmalikoff

More
cdb910b
changed 67 files
v4.7, v4.8

Updated copyright statement - only support GPL v 2.0

- -20
- +23
./java/org/lamsfoundation/lams/DblSubmitTest.java
- History
- Source
- Diff
./java/org/.../lams/DblSubmitTest.java
- -3
- +23
./java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
- History
- Source
- Diff
./java/org/.../TestExportPortfolioService.java
- -19
- +23
./java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
./java/org/.../service/TestLearnerService.java
- -21
- +24
./java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java
- History
- Source
- Diff
./java/org/.../action/AbstractTestAction.java
- -21
- +24
./java/org/lamsfoundation/lams/learning/web/action/TestDblSubmitAction.java
- History
- Source
- Diff
./java/org/.../action/TestDblSubmitAction.java
- -5
- +7
./java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java
- History
- Source
- Diff
./java/org/.../TestDisplayActivityAction.java
- -5
- +7
./java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java
- History
- Source
- Diff
./java/org/.../action/TestGateAction.java
- -5
- +7
./java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
- History
- Source
- Diff
./java/org/.../action/TestGroupingAction.java
- -5
- +7
./java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java
- History
- Source
- Diff
./java/org/.../action/TestLearnerAction.java
- -20
- +23
./java/org/lamsfoundation/lams/learning/web/form/TestDblSubmitForm.java
- History
- Source
- Diff
./java/org/.../form/TestDblSubmitForm.java
… 57 more files in changeset.

1:52 pm

fmalikoff

More
01a4035
changed 39 files
v4.7, v4.8

Changed learning design activities and transition collections to use all-delete-orphan cascade management. This will ensure that the secondary records are created and removed as required.

This required fixing code that trigger cascade problems and also highlighted some session problems with the learner cache created by Jacky.

- -1
- +1
./java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
./java/org/.../service/TestLearnerService.java
… 38 more files in changeset.

4:26 pm

fmalikoff

More
937a2bb
changed 20 files
v4.7, v4.8

Upgraded to JSTL 1.1 library

- -4
- +1
./web/WEB-INF/struts/tiles-defs.xml
- History
- Source
- Diff
./web/WEB-INF/struts/tiles-defs.xml
… 19 more files in changeset.

1:13 pm

fmalikoff

More
a068098
changed 19 files
v4.7, v4.8

Setup dummy learning functionality so that learner interface can be used in the Alpha version. Supports joining a lesson.

- -2
- +2
./java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java
- History
- Source
- Diff
./java/org/.../action/TestGateAction.java
- -1
- +1
./java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
- History
- Source
- Diff
./java/org/.../action/TestGroupingAction.java
… 17 more files in changeset.

8:40 am

mtruong

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

updated to use new getOrderedActivityList(LearnerProgress)

- -1
- +1
./java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
- History
- Source
- Diff
./java/org/.../TestExportPortfolioService.java

7:08 am

fmalikoff

More
29cf7c9
changed 7 files
v4.7, v4.8

Modified the "leaveToolSession" and related code to allow the tool to pass the userid (which it gets from UserDTO in the shared session) rather than pass User (which the tool doesn't have).

Rejigged the tool jars loaded on the classpath so suit the most "completed" tools.

- -1
- +2
./java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
./java/org/.../service/TestLearnerService.java
… 6 more files in changeset.

1:25 pm

fmalikoff

More
571c9c2
changed 12 files
v4.7, v4.8

Fixed problem where the learner interface didn't start the first time the learner joined the lesson. This was due to the activity in the request being a proxy activity rather than a real activity. Fixed it by having some common code that puts it in the activity, and get Hibernate to load a "real" activity before putting it in the request.

- -1
- +1
./java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
- History
- Source
- Diff
./java/org/.../action/TestGroupingAction.java
… 11 more files in changeset.

3:52 pm

mtruong

More
226c997
changed 1 file
v4.7, v4.8

*** empty log message ***

- -92
- +90
./java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
- History
- Source
- Diff
./java/org/.../TestExportPortfolioService.java

8:12 pm

fmalikoff

More
4e143f1
changed 20 files
v4.7, v4.8

More changes to suit Hibernate 3

- -23
- +25
./java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
./java/org/.../service/TestLearnerService.java
- -3
- +1
./java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java
- History
- Source
- Diff
./java/org/.../action/AbstractTestAction.java
- -152
- +0
./web/WEB-INF/spring/applicationContext.xml
- History
- Source
- Diff
./web/WEB-INF/.../applicationContext.xml
- -74
- +0
./web/WEB-INF/spring/dataAccessContext.xml
- History
- Source
- Diff
./web/WEB-INF/spring/dataAccessContext.xml
- -19
- +0
./web/WEB-INF/spring/dbConnection.properties
- History
- Source
- Diff
./web/WEB-INF/.../dbConnection.properties
- -76
- +0
./web/WEB-INF/spring/learningApplicationContext.xml
- History
- Source
- Diff
./web/.../learningApplicationContext.xml
- -2
- +10
./web/WEB-INF/web.xml
- History
- Source
- Diff
./web/WEB-INF/web.xml
… 13 more files in changeset.

8:09 pm

fmalikoff

More
29879f8
changed 2 files
v4.7, v4.8

*** empty log message ***

- -38
- +19
./web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
./web/WEB-INF/struts/struts-config.xml
- -1
- +7
./web/WEB-INF/struts/tiles-defs.xml
- History
- Source
- Diff
./web/WEB-INF/struts/tiles-defs.xml

9:29 am

steven

More
17b63b1
changed 1 file
v4.7, v4.8

Update to Hibernate3

- -1
- +1
./web/WEB-INF/spring/applicationContext.xml
- History
- Source
- Diff
./web/WEB-INF/.../applicationContext.xml

2:40 pm

fmalikoff

More
7f80ba8
changed 15 files
v4.7, v4.8

lams.war no longer exists so build task removed

- -1
- +1
./java/log4j.properties
- History
- Source
- Diff
./java/log4j.properties
- -21
- +7
./java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
- History
- Source
- Diff
./java/org/.../TestExportPortfolioService.java
- -1
- +1
./web/WEB-INF/spring/applicationContext.xml
- History
- Source
- Diff
./web/WEB-INF/.../applicationContext.xml
- -1
- +1
./web/WEB-INF/spring/dataAccessContext.xml
- History
- Source
- Diff
./web/WEB-INF/spring/dataAccessContext.xml
- -1
- +1
./web/WEB-INF/web.xml
- History
- Source
- Diff
./web/WEB-INF/web.xml
… 10 more files in changeset.

8:48 am

fmalikoff

More
6c44418
changed 8 files
v4.7, v4.8

Removed ISOLATION_READ_COMMITTED from the transactions as it is not supported by the JTA transaction manager. We will have to rely on the database settings.

- -8
- +8
./web/WEB-INF/spring/learningApplicationContext.xml
- History
- Source
- Diff
./web/.../learningApplicationContext.xml
… 7 more files in changeset.

9:06 am

mtruong

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

included the export service bean

- -0
- +16
./web/WEB-INF/spring/learningApplicationContext.xml
- History
- Source
- Diff
./web/.../learningApplicationContext.xml

9:01 am

mtruong

More
061c77c
added 1 file
v4.7, v4.8

Testing export service bean

- -0
- +327
./java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
- History
- Source
./java/org/.../TestExportPortfolioService.java

12:56 pm

fmalikoff

More
6faa512
changed 9 files
v4.7, v4.8

The common test code has been removed from lams.jar, which triggered the abstract lams test case class to change package. New version uses the "new" package.