Activity lams/lams_learning/src/java/org/lamsfoundation

integrate web layer with service layer

Rename Struts action from "xxxActivity" to "xxxActivityAction".

changed complete tool activity from loading the next tool directly to a lams learning loading page

Remove notebook related Struts action and form bean from learning web app.

They will be moved into notebook module.

- -83
- +0
./lams/learning/web/action/DisplayNotebookEntry.java
- History
- Source
- Diff
./lams/learning/.../DisplayNotebookEntry.java
- -31
- +0
./lams/learning/web/action/NotebookAction.java
- History
- Source
- Diff
./lams/learning/.../action/NotebookAction.java
- -95
- +0
./lams/learning/web/action/SaveNotebookEntry.java
- History
- Source
- Diff
./lams/learning/.../SaveNotebookEntry.java
- -134
- +0
./lams/learning/web/form/NotebookForm.java
- History
- Source
- Diff
./lams/learning/web/form/NotebookForm.java
… 3 more files in changeset.

The main progress engine calculation completed and tested.

- -7
- +42
./lams/learning/progress/ProgressEngine.java
- History
- Source
- Diff
./lams/learning/.../ProgressEngine.java
- -8
- +9
./lams/learning/service/LearnerService.java
- History
- Source
- Diff
./lams/learning/.../LearnerService.java
… 4 more files in changeset.

Replaced ActionMappings with ActivityMapping and

ActivityMappingStrategy. Should now work properly with parallel

activity waits

get calculate progress working.

- -62
- +106
./lams/learning/progress/ProgressEngine.java
- History
- Source
- Diff
./lams/learning/.../ProgressEngine.java
- -1
- +5
./lams/learning/service/LearnerService.java
- History
- Source
- Diff
./lams/learning/.../LearnerService.java
… 3 more files in changeset.

*** empty log message ***

- -0
- +83
./lams/learning/web/action/DisplayNotebookEntry.java
- History
- Source
./lams/learning/.../DisplayNotebookEntry.java
- -0
- +31
./lams/learning/web/action/NotebookAction.java
- History
- Source
./lams/learning/web/action/NotebookAction.java
- -0
- +95
./lams/learning/web/action/SaveNotebookEntry.java
- History
- Source
./lams/learning/.../action/SaveNotebookEntry.java
- -0
- +134
./lams/learning/web/form/NotebookForm.java
- History
- Source
./lams/learning/web/form/NotebookForm.java

just changed the comment from the myeclipse default

renamed leaner learner

Changed references to sessionBean.getLearner()

Moved base learning stuff to a base action LearnerAction

- -31
- +2
./lams/learning/web/action/ActivityAction.java
- History
- Source
- Diff
./lams/learning/.../action/ActivityAction.java
- -0
- +60
./lams/learning/web/action/LearnerAction.java
- History
- Source
./lams/learning/web/action/LearnerAction.java

Added new Error action and comments

accomodate the change of tool session constructor

- -25
- +31
./lams/learning/progress/ProgressEngine.java
- History
- Source
- Diff
./lams/learning/.../ProgressEngine.java
- -9
- +17
./lams/learning/service/LearnerService.java
- History
- Source
- Diff
./lams/learning/.../LearnerService.java
… 6 more files in changeset.

all conditions of joining lesson tested.

- -4
- +5
./lams/learning/progress/ProgressEngine.java
- History
- Source
- Diff
./lams/learning/.../ProgressEngine.java
- -1
- +2
./lams/learning/service/ILearnerService.java
- History
- Source
- Diff
./lams/learning/.../ILearnerService.java
- -10
- +21
./lams/learning/service/LearnerService.java
- History
- Source
- Diff
./lams/learning/.../LearnerService.java
… 12 more files in changeset.

get join lesson bit to work

- -61
- +65
./lams/learning/service/LearnerService.java
- History
- Source
- Diff
./lams/learning/.../LearnerService.java
… 7 more files in changeset.

change the learner service Spring configuration file

- -7
- +29
./lams/learning/service/LearnerService.java
- History
- Source
- Diff
./lams/learning/.../LearnerService.java
… 3 more files in changeset.

join lesson added

join lesson added

Added GPL header

updated use of ActivityURL to String

Updated to use ActionMappings

Updated some comments

Replaced use of ActivityURL with String.

Added actionMappings as bean property.

implement join lesson and progress engine

Changed getLearnerProgressByLeaner to getLearnerProgressByLearner

- -2
- +2
./lams/learning/service/LearnerService.java
- History
- Source
- Diff
./lams/learning/.../LearnerService.java
… 3 more files in changeset.

Renamed getNextActivityURL to getProgressURL

Moved URL mapping to ActionMappings

- -5
- +220
./lams/learning/web/util/ActionMappings.java
- History
- Source
- Diff
./lams/learning/.../util/ActionMappings.java
- -0
- +166
./lams/learning/web/util/ActionMappingsWithToolWait.java
- History
- Source
./lams/learning/.../ActionMappingsWithToolWait.java
- -315
- +0
./lams/learning/web/util/Utils.java
- History
- Source
- Diff
./lams/learning/web/util/Utils.java

Updated to match the changes to LearnerProgress and the URL mappings

lamsfoundation

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)