Activity lams-github/lams

LDEV-988: Made the GroupingAction page handle both doing a grouping and going back to the screen later via the progress bar. To do this I had to make change performGrouping so it checks if the grouping has been done before trying to do it. Also changed the completeActivity to move the logic that closes the popup window to completeActivity rather than completeToolSession - now it is called for system tools like grouping as well as the normal tools.

- -2
- +4
./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
- History
- Source
- Diff
./src/java/.../ICoreLearnerService.java
- -52
- +55
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java
- -1
- +1
./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
- History
- Source
- Diff
./src/java/org/.../web/action/GateAction.java
- -39
- +18
./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
- History
- Source
- Diff
./src/java/org/.../action/GroupingAction.java

Monday 06 Nov 2006

6:52 am

mseaton

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

fixed learner - double click on grouping activity + fixed casting error

- -1
- +1
./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
- History
- Source
- Diff
./src/java/org/.../util/ActivityMapping.java
- binary
./web/lams_learner.swf
- History
- Source
- Diff
./web/lams_learner.swf
… 1 more file in changeset.

Friday 03 Nov 2006

8:13 am

fmalikoff

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

Open tool windows in a new page using target="_blank"

- -1
- +1
./web/WEB-INF/tags/ExportPortOutput.tag
- History
- Source
- Diff
./web/WEB-INF/tags/ExportPortOutput.tag
… 1 more file in changeset.

8:13 am

fmalikoff

More
14cc5c1
changed 1 file
v4.7, v4.8

Avoiding a potential null ptr exception, although not sure why we ever end up with no forward!

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

6:11 am

erniegx <ernieg@gmail.com>

More
322909e
changed 1 file
v4.7, v4.8

Updating Korean

- -3
- +3
./conf/language/ApplicationResources_ko_KR.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_ko_KR.properties

Thursday 02 Nov 2006

5:47 am

asukkar

More
b73ea10
changed 22 files
v4.7, v4.8

Updated DOCTYPE.

Leaving out the dtd causes rendering problems.

- -1
- +2
./web/exportPortfolio/main.jsp
- History
- Source
- Diff
./web/exportPortfolio/main.jsp
- -1
- +2
./web/exportPortfolio/notSupported.jsp
- History
- Source
- Diff
./web/exportPortfolio/notSupported.jsp
- -1
- +2
./web/exportPortfolio/notebook.jsp
- History
- Source
- Diff
./web/exportPortfolio/notebook.jsp
- -1
- +2
./web/exportWaitingPage.jsp
- History
- Source
- Diff
./web/exportWaitingPage.jsp
- -1
- +2
./web/layout/gateLayout.jsp
- History
- Source
- Diff
./web/layout/gateLayout.jsp
- -1
- +2
./web/test/dblSubmitTest.jsp
- History
- Source
- Diff
./web/test/dblSubmitTest.jsp
… 16 more files in changeset.

Tuesday 31 Oct 2006

6:22 am

mseaton

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

changed url pattern on security constraint to match + added roles (authoring update + others)

- -0
- +1
./conf/xdoclet/web-security.xml
- History
- Source
- Diff
./conf/xdoclet/web-security.xml
… 2 more files in changeset.

Monday 30 Oct 2006

12:29 am

fmalikoff

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

Fixing the probem breaking out of a parallel activity within an optional activity. Rather than trying to fix it in the web layer, I've changed the progress engine so that as it processes up the hierarchy of complex activityes, it sets any completed complex activities to be the previous activity. Then the web layer works correctly.