Activity lams-github/lams

Added a new method forwardToLearnerActivityURL, that allow the server to go directly to a url, rather than sending the url to Flash which would then call the url (which is getLearnerActivityURL).

- -25
- +68
./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
- History
- Source
- Diff
./src/java/org/.../action/LearnerAction.java

2:07 am

Improving the "waiting" page for export portfolio. Now styled correctly, updates every 10 secs to give the user feedback and has a close button once the generation is complete. Java code also contains some test code that can be used to test the timeout (commented out).

- -0
- +3
./conf/language/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -1
- +16
./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
- History
- Source
- Diff
./src/java/.../action/MainExportServlet.java
- -15
- +43
./web/exportWaitingPage.jsp
- History
- Source
- Diff
./web/exportWaitingPage.jsp

6:48 am

fmalikoff

More
04802ea
changed 25 files
v4.7, v4.8

Moving from a tool activity to a grouped tool activity was throwing an exception as the "create tool session" code (which calls the tool to create the tool session details) was being called within the tool context.

Moved the call to create the tool session into LoadToolActivityAction so that it will always be run within the lams-learning war context and hence all the tools' beans are available in the Spring context.

To try to stop this sort of problem occuring again (ie a tool calling code that relies on all tools' beans being in the context) the ILearnerService has been split into two interfaces. ILearnerService now only contains the one method that should be called by tools (to complete a tool session). All other calls are in ICoreLearnerService. Any of the core modules may use the ICoreLearnerService but only tools should use the ILearnerService.

- -3
- +3
./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
- History
- Source
- Diff
./src/java/.../ExportPortfolioService.java
- -1
- +0
./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
- History
- Source
- Diff
./src/java/.../action/MainExportServlet.java
- -0
- +245
./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
- History
- Source
./src/java/org/.../service/ICoreLearnerService.java
- -202
- +2
./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
- History
- Source
- Diff
./src/java/.../service/ILearnerService.java
- -61
- +55
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java
- -2
- +2
./src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java
- History
- Source
- Diff
./src/java/.../LearnerServiceProxy.java
- -3
- +3
./src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
- History
- Source
- Diff
./src/java/org/.../action/ActivityAction.java
- -2
- +2
./src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
- History
- Source
- Diff
./src/java/.../ChooseActivityAction.java
- -2
- +2
./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
- History
- Source
- Diff
./src/java/.../CompleteActivityAction.java
- -2
- +2
./src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
- History
- Source
- Diff
./src/java/.../DisplayActivityAction.java
- -2
- +2
./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
- History
- Source
- Diff
./src/.../DisplayOptionsActivityAction.java
- -2
- +2
./src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
- History
- Source
- Diff
./src/java/.../DisplayToolActivityAction.java
- -3
- +3
./src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
- History
- Source
- Diff
./src/java/.../action/DummyLearnerAction.java
- -2
- +2
./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
- History
- Source
- Diff
./src/java/org/.../web/action/GateAction.java
- -5
- +5
./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
- History
- Source
- Diff
./src/java/org/.../action/GroupingAction.java
… 10 more files in changeset.

6:16 am

steven

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

Revmove useless ExportNotSupportServlet definition.

- -5
- +0
./conf/xdoclet/servlet-mappings.xml
- History
- Source
- Diff
./conf/xdoclet/servlet-mappings.xml
- -7
- +1
./conf/xdoclet/servlets.xml
- History
- Source
- Diff
./conf/xdoclet/servlets.xml

9:37 am

fmalikoff

More
493680e
changed 7 files
v4.7, v4.8

Learner Progress DTO changes made to so that Flash will know when a learner is finished. * Current activity now set to null (and hence won't appear in packet) when the learner has completed the lesson. * New field lessonComplete which is true when the learner has completed the lesson, false otherwise.