Activity lams/

Branching: Tweaking the branch objects so that the contribution flags are right for teacher chosen activities (and hence the button will appear to do the selection in monitoring) and some changes to make the teacher chosen screen logic easier.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -9
- +17
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../Activity.hbm.xml
- -0
- +60
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityTitleComparator.java
- History
- Source
/lams_common/src/.../ActivityTitleComparator.java
- -4
- +4
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
- History
- Source
- Diff
/lams_common/src/.../BranchingActivity.java
- -1
- +7
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
- History
- Source
- Diff
/lams_common/src/.../ComplexActivity.java
- -2
- +2
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java
- History
- Source
- Diff
/lams_common/src/.../ContributionTypes.java
- -2
- +11
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
- History
- Source
- Diff
/lams_common/.../GroupBranchActivityEntry.java
- -2
- +23
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
- History
- Source
- Diff
/lams_common/src/.../SequenceActivity.java
- -4
- +16
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../BranchingActivityStrategy.java
- -2
- +31
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../ComplexActivityStrategy.java
- -0
- +39
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/IContributionTypeStrategy.java
- History
- Source
/lams_common/.../IContributionTypeStrategy.java
- -2
- +2
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SimpleActivityStrategy.java
- History
- Source
- Diff
/lams_common/.../SimpleActivityStrategy.java

11:33 am

fmalikoff

More
MAIN:fmalikoff:20070704033332
changed 1 file
MAIN

Branching: Branching activities always have a grouping during a lesson, as this is set up at lesson creation time. But they might not have any groups!

- -2
- +2
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
/lams_learning/src/.../LearnerService.java

11:31 am

fmalikoff

More
MAIN:fmalikoff:20070704033110
changed 7 files
MAIN

Further work on the teacher chosen branching screen. This included ensuring that the tool sessions aren't created for the activities within a branch when a lesson is created (as the users aren't known in advance) and also ensuring that there is always a grouping object attached to a branching activity during a lesson so that the grouping logic doesn't have to create it.

- -0
- +72
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/BranchDTO.java
- History
- Source
/lams_monitoring/src/.../monitoring/BranchDTO.java
- -0
- +86
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/BranchingDTO.java
- History
- Source
/lams_monitoring/src/.../BranchingDTO.java
- -2
- +3
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeActivityDTO.java
- History
- Source
- Diff
/lams_monitoring/.../ContributeActivityDTO.java
- -12
- +36
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeDTOFactory.java
- History
- Source
- Diff
/lams_monitoring/.../ContributeDTOFactory.java
- -5
- +3
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java
- History
- Source
- Diff
/lams_monitoring/.../ContributeActivitiesProcessor.java
- -14
- +36
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
/lams_monitoring/.../MonitoringService.java
- -126
- +131
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
- History
- Source
- Diff
/lams_monitoring/.../ChosenBranchingAJAXAction.java

11:18 am

mseaton

More
MAIN:mseaton:20070704031811
changed 12 files
MAIN

updated branching types + fixed end connector position (applying dto data)

- 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
- -3
- +21
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/Activity.as
- -9
- +16
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
- History
- Source
- Diff
/lams_flash/src/.../BranchingActivity.as
- -1
- +3
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
- History
- Source
- Diff
/lams_flash/src/.../DesignDataModel.as
- -0
- +1
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateActivity.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/GateActivity.as
- -0
- +2
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
- History
- Source
- Diff
/lams_flash/src/.../SequenceActivity.as
- -1
- +1
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
- History
- Source
- Diff
/lams_flash/src/.../br/CanvasBranchView.as
- -2
- +2
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasController.as
- -5
- +5
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
- History
- Source
- Diff
/lams_flash/src/central/.../cv/CanvasModel.as
- -1
- +1
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
- History
- Source
- Diff
/lams_flash/src/central/.../cv/CanvasView.as
- -162
- +193
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
- History
- Source
- Diff
/lams_flash/src/.../cv/PropertyInspector.as

2:50 pm

mseaton

More
MAIN:mseaton:20070703065015
changed 5 files
MAIN

fixed wddxtags type (firstActivityUIID) + improvement in loading sequences for branching activity

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- 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
- -3
- +4
/lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
- History
- Source
- Diff
/lams_common/src/java/.../wddx/WDDXTAGS.java
- -8
- +7
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
- History
- Source
- Diff
/lams_flash/src/.../br/CanvasBranchView.as

2:15 pm

mseaton

More
MAIN:mseaton:20070703061524
changed 6 files
MAIN

branching activity saves start/end connector coords + update to contribute activity in monitor

- -1
- +58
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
- History
- Source
- Diff
/lams_flash/src/.../BranchingActivity.as
- -2
- +12
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
- History
- Source
- Diff
/lams_flash/src/.../br/CanvasBranchView.as
- -0
- +13
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasActivity.as
- -1
- +8
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasController.as
- -4
- +3
/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ContributeActivity.as
- History
- Source
- Diff
/lams_flash/src/.../ContributeActivity.as
- -89
- +36
/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
- History
- Source
- Diff
/lams_flash/src/.../tabviews/LessonTabView.as

2:09 pm

mseaton

More
MAIN:mseaton:20070703060922
changed 5 files
MAIN

branching activity saves start/end connector coords

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -2
- +7
/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
- -1
- +8
/lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
- History
- Source
- Diff
/lams_common/src/java/.../wddx/WDDXTAGS.java

10:23 am

jliew

make name validation work

- -2
- +5
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationAction.java
- History
- Source
- Diff
/lams_admin/src/.../FederationAction.java

10:07 am

fmalikoff

More
MAIN:fmalikoff:20070703020700
changed 6 files
MAIN

Branching: Create the Teacher Chosen branching screen, based on the existing Chosen Grouping screen. Not working yet but the changes have required changing the LessonService (in lams.jar) to take Grouping as a parameter, rather than GroupingActivity, so checking in Monitoring changes to match.