Activity lams/

Fixing up Grouping related code so it will cope with more cases during grouping, and so that groupingDAO can better find all the groups in a learning design.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -0
- +1
/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
/lams_common/src/.../lams/commonContext.xml
- -33
- +49
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java
- History
- Source
- Diff
/lams_common/src/.../ChosenGrouper.java
- -7
- +10
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
- History
- Source
- Diff
/lams_common/src/.../Grouper.java
- -3
- +2
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
- History
- Source
- Diff
/lams_common/src/.../RandomGrouper.java
- -10
- +26
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java
- History
- Source
- Diff
/lams_common/src/.../GroupingDAO.java
- -34
- +31
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
- History
- Source
- Diff
/lams_common/src/.../LearningDesignDTO.java
- -11
- +17
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
- History
- Source
- Diff
/lams_common/.../LearningDesignService.java
- -3
- +4
/lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
- History
- Source
- Diff
/lams_common/src/.../LessonService.java
- -2
- +5
/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java
- History
- Source
- Diff
/lams_common/.../TestLearningDesignDAO.java

11:45 am

mseaton

More
MAIN:mseaton:20070731034548
changed 11 files
MAIN

group naming dialog + saving groups

- -1
- +1
/lams_central/conf/flashxml/lams/authoring/en_AU_dictionary.xml
- History
- Source
- Diff
/lams_central/conf/.../en_AU_dictionary.xml
- -1
- +1
/lams_central/conf/flashxml/lams/authoring/en_dictionary.xml
- History
- Source
- Diff
/lams_central/conf/.../en_dictionary.xml
- -2
- +2
/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
- History
- Source
- Diff
/lams_central/src/.../ObjectExtractor.java
- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- binary
/lams_flash/src/central/flash/lams_authoring.fla
- History
- Source
- Diff
/lams_flash/src/.../flash/lams_authoring.fla
- -0
- +88
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Group.as
- History
- Source
/lams_flash/src/central/.../authoring/Group.as
- -10
- +69
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/Grouping.as
- -11
- +38
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupNamingDialog.as
- History
- Source
- Diff
/lams_flash/src/.../br/GroupNamingDialog.as
- -1
- +0
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
- History
- Source
- Diff
/lams_flash/src/.../cv/PropertyInspector.as
- -2
- +3
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
- History
- Source
- Diff
/lams_flash/.../PropertyInspectorControls.as

10:13 am

jliew

add results text when federation server list is updated

- -1
- +16
/lams_central/src/java/org/lamsfoundation/lams/web/FedRegistryUpdateServlet.java
- History
- Source
- Diff
/lams_central/.../FedRegistryUpdateServlet.java
- -2
- +10
/lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java
- History
- Source
- Diff
/lams_common/src/.../FederationService.java
- -1
- +7
/lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
- History
- Source
- Diff
/lams_common/src/.../IFederationService.java

6:57 pm

asukkar

More
MAIN:asukkar:20070730105756
changed 1 file
MAIN

Added adminURL

LDEV-1256

- -2
- +9
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
- History
- Source
- Diff
/lams_common/src/.../LibraryActivityDTO.java

2:46 pm

fmalikoff

More
MAIN:fmalikoff:20070727064643
updated 2 files
MAIN

Branching: basic group naming and branch -> group mapping screens. They don't save data to the server yet.

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf

2:43 pm

fmalikoff

More
MAIN:fmalikoff:20070727064348
changed 2 files
MAIN

LDEV-1134: Preview now lets the author run through multiple branches, but if a stop point is reached then it stops the lesson.

- -17
- +52
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../BranchingActivityStrategy.java
- -14
- +22
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
/lams_learning/src/.../LearnerService.java

1:13 pm

fmalikoff

More
MAIN:fmalikoff:20070727051324
changed 7 files
MAIN

LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branches, the author needs to run preview multiple times.

- -2
- +2
/lams_learning/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_learning/.../ApplicationResources.properties
- -2
- +2
/lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_learning/.../ApplicationResources_en_AU.properties
- -0
- +2
/lams_learning/conf/xdoclet/struts-forms.xml
- History
- Source
- Diff
/lams_learning/conf/.../struts-forms.xml
- -0
- +7
/lams_learning/web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
/lams_learning/web/.../struts-config.xml
- -0
- +4
/lams_learning/web/WEB-INF/struts/tiles-defs.xml
- History
- Source
- Diff
/lams_learning/web/.../struts/tiles-defs.xml
- -0
- +139
/lams_learning/web/branching/preview.jsp
- History
- Source
/lams_learning/web/branching/preview.jsp
- -5
- +0
/lams_learning/web/branching/wait.jsp
- History
- Source
- Diff
/lams_learning/web/branching/wait.jsp

8:38 am

fmalikoff

More
MAIN:fmalikoff:20070727003802
changed 4 files
MAIN

LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branches, the author needs to run preview multiple times. Did some small refactoring to have only one piece of code that creates the branching mapping related to a group as we have many bits that need to do this (authoring, import, chosen branching in monitoring and now preview!)

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -7
- +8
/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
- History
- Source
- Diff
/lams_central/src/.../ObjectExtractor.java
- -1
- +13
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
- History
- Source
- Diff
/lams_common/src/.../Group.java
- -20
- +11
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
/lams_common/.../ExportToolContentService.java

8:36 am

fmalikoff

More
MAIN:fmalikoff:20070727003629
changed 8 files
MAIN

LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branches, the author needs to run preview multiple times.

- -0
- +2
/lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
- History
- Source
- Diff
/lams_learning/.../learningApplicationContext.xml
- -6
- +11
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
- History
- Source
- Diff
/lams_learning/.../ICoreLearnerService.java
- -31
- +86
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
/lams_learning/src/.../LearnerService.java
- -15
- +107
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
- History
- Source
- Diff
/lams_learning/.../BranchingActivityAction.java
- -10
- +3
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
- History
- Source
- Diff
/lams_learning/.../DisplayOptionsActivityAction.java
- -1
- +10
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityURL.java
- History
- Source
- Diff
/lams_learning/src/.../bean/ActivityURL.java
- -2
- +16
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
- History
- Source
- Diff
/lams_learning/src/.../LearningWebUtil.java
- -7
- +2
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
/lams_monitoring/.../MonitoringService.java

4:45 pm

mseaton

More
MAIN:mseaton:20070726084553
changed 24 files
MAIN

branching changes + group/branch matching dialog + group naming dialog + some code cleanup + spliting PI class + PI and Branch/Sequence integration

- binary
/lams_flash/src/central/flash/lams_authoring.fla
- History
- Source
- Diff
/lams_flash/src/.../flash/lams_authoring.fla
- -8
- +3
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/Application.as
- -2
- +4
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/Branch.as
- -41
- +20
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
- History
- Source
- Diff
/lams_flash/src/.../DesignDataModel.as
- -1
- +17
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/Grouping.as
- -0
- +4
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
- History
- Source
- Diff
/lams_flash/src/.../br/BranchConnector.as
- -1
- +1
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
- History
- Source
- Diff
/lams_flash/src/.../br/CanvasBranchView.as
- -0
- +299
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as
- History
- Source
/lams_flash/src/.../br/GroupMatchingDialog.as
- -0
- +226
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupNamingDialog.as
- History
- Source
/lams_flash/src/.../br/GroupNamingDialog.as
- -3
- +5
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
- History
- Source
- Diff
/lams_flash/src/central/.../cv/CanvasModel.as
- -774
- +41
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
- History
- Source
- Diff
/lams_flash/src/.../cv/PropertyInspector.as
- -0
- +933
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
- History
- Source
/lams_flash/src/.../PropertyInspectorControls.as
- -1
- +1
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as
- History
- Source
- Diff
/lams_flash/src/central/.../tb/Toolbar.as
- -3
- +1
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as
- History
- Source
- Diff
/lams_flash/src/central/.../tb/ToolbarView.as
- -10
- +2
/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as
- History
- Source
- Diff
/lams_flash/src/.../learner/Application.as
… 9 more files in changeset.

11:46 am

jliew

added shib servlets to web-security so that ShibLogin is invoked (and shib user created if necessary) before shib servlets have to add shib user to lesson class; refactored ShibExportPortfolioServlet to extend ShibLearnerServlet; moved xdoclet out of .java files because it doesn't work properly with a servlet extending another servlet

- -0
- +15
/lams_central/conf/xdoclet/servlet-mappings.xml
- History
- Source
- Diff
/lams_central/conf/.../servlet-mappings.xml
- -0
- +24
/lams_central/conf/xdoclet/servlets.xml
- History
- Source
- Diff
/lams_central/conf/xdoclet/servlets.xml
- -0
- +3
/lams_central/conf/xdoclet/web-security.xml
- History
- Source
- Diff
/lams_central/conf/.../web-security.xml
- -58
- +2
/lams_central/src/java/org/lamsfoundation/lams/web/ShibExportPortfolioServlet.java
- History
- Source
- Diff
/lams_central/.../ShibExportPortfolioServlet.java
- -9
- +24
/lams_central/src/java/org/lamsfoundation/lams/web/ShibLearnerServlet.java
- History
- Source
- Diff
/lams_central/src/.../ShibLearnerServlet.java
- -6
- +16
/lams_central/src/java/org/lamsfoundation/lams/web/ShibMonitorServlet.java
- History
- Source
- Diff
/lams_central/src/.../ShibMonitorServlet.java

9:40 am

jliew

add check for 'failed' parameter in request so that ShibLogin doesn't keep getting called when j_security_check login fails

- -2
- +7
/lams_central/web/login.jsp
- History
- Source
- Diff
/lams_central/web/login.jsp

9:39 am

jliew

fix logger class name

- -1
- +1
/lams_central/src/java/org/lamsfoundation/lams/web/ShibExportPortfolioServlet.java
- History
- Source
- Diff
/lams_central/.../ShibExportPortfolioServlet.java
- -1
- +1
/lams_central/src/java/org/lamsfoundation/lams/web/ShibMonitorServlet.java
- History
- Source
- Diff
/lams_central/src/.../ShibMonitorServlet.java

9:39 am

jliew

fix error text

- -2
- +2
/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
- History
- Source
- Diff
/lams_central/src/.../web/HomeAction.java

3:39 pm

fmalikoff

The Edit Class button didn't work in monitoring for Shibboleth users - they don't have a role in the organisation that backs the lesson, so they couldn't get the organisation details. Changed the getOrganisationsForUserWithRole call so that if they don't have a role in the org, it still returns the basic details such as the name, etc.