lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 04 Jul 2007
4:18 pm

fmalikoff

Branching: Teacher chosen branch screen basically working. Still a bit of clean up on the messages to go.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -5
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
    • -2
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -5
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -5
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -0
    • +8
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +8
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -13
    • +23
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -10
    • +88
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -69
    • +22
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -4
    • +4
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -173
    • +67
    /lams_monitoring/web/branching/chosenSelection.jsp
    • -0
    • +70
    /lams_monitoring/web/branching/viewBranches.jsp
4:16 pm

fmalikoff

Avoid copying class files to WEB-INF when doing synchronise deploy - don't want multiple versions of the classes floating around.

Options
    • -0
    • +1
    /lams_monitoring/build.xml
4:16 pm

fmalikoff

Should have been removed when we split LAMS and RAMS

Options
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_da_DK.properties
    • -60
    • +0
    /lams_monitoring/conf/language/ApplicationResources_de_DE.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_el_GR.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_es_ES.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_fr_FR.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_ko_KR.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_mi_NZ.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_no_NO.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_pl_PL.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_sv_SE.properties
2:14 pm

mseaton

remove NONE type option for Gate Activity(s)

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
2:03 pm

mseaton

removed unused CA duplicate

Options
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
2:02 pm

mseaton

added labels for Branching

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_AU_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_dictionary.xml
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -7
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
1:26 pm

mseaton

fixes for PI (branching activity)

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -0
    • +15
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
    • -484
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasBranchingActivity.as
    • -4
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -3
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
    • -28
    • +32
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
11:40 am

fmalikoff

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.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -9
    • +17
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +60
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityTitleComparator.java
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -1
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -1
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -3
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -1
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -0
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/IContributionTypeStrategy.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SimpleActivityStrategy.java
11:33 am

fmalikoff

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!

Options
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
11:31 am

fmalikoff

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.

Options
    • -0
    • +72
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/BranchDTO.java
    • -0
    • +86
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/BranchingDTO.java
    • -2
    • +3
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeActivityDTO.java
    • -12
    • +36
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeDTOFactory.java
    • -5
    • +3
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java
    • -13
    • +35
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -125
    • +130
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
11:18 am

mseaton

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

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -3
    • +21
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
    • -9
    • +16
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
    • -1
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -0
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateActivity.as
    • -0
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -2
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -5
    • +5
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
    • -161
    • +192
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
Tuesday 03 Jul 2007
2:51 pm

mseaton

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

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
    • -8
    • +7
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
2:15 pm

mseaton

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

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

mseaton

branching activity saves start/end connector coords

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -0
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
10:07 am

fmalikoff

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.

Options
    • -1
    • +1
    /lams_monitoring/build.xml
    • -8
    • +30
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -37
    • +94
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +392
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -5
    • +5
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -0
    • +477
    /lams_monitoring/web/branching/chosenSelection.jsp
10:05 am

fmalikoff

Branching: moved the types to the BranchingActivity so they can be accessed from learner and monitor.

Options
    • -7
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
10:03 am

fmalikoff

Branching: Adding x and y co-ordinates for the start and stop points. This is to support to UI - the details are not used by the progress engine.

Options
    • -0
    • +13
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -2
    • +54
    /lams_common/db/model/lams_11.clay
    • -0
    • +4
    /lams_common/db/sql/create_lams_11_tables.sql
    • -1
    • +6
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -3
    • +64
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -3
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -84
    • +128
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -4
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -12
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -14
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
Monday 02 Jul 2007
2:47 pm

mseaton

improved canvas branch view - adding canvas activities (group, branching, optional activities etc)

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -4
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -18
    • +28
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -11
    • +39
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -1
    • +1
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as
12:09 pm

dcarlier

LI-120 creating the build ant scipt for the unix installer package.

Options
    • -0
    • +81
    /unix_installer/installer-package/build-package.xml
12:07 pm

dcarlier

Updating with changes that fiona made for 2.0.4 release. Some files replace with code downloaded from the installer package website

Options
    • binary
    /unix_installer/installer-package/ant-scripts/.createdabase.xml.swp
    • -7
    • +5
    /unix_installer/installer-package/sql-scripts/create-database.sql
9:38 am

dcarlier

File is generated by installer, so should not be in the build package

Options
    • -12
    • +0
    /unix_installer/installer-package/ant-scripts/update-configuration.xml
9:13 am

fmalikoff

Branching: Improved validation logic for adding branch connectors or transitions in Branching Activity view. Added firstActivityUIID field to SequenceActivity. Creating branches on fly (onload of sequence activities in branching activity).

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
Friday 29 Jun 2007
4:37 pm

mseaton

added firstActivityUIID field to SequenceActivity + improve branching validation logic + creating branches on fly (onload of sequence activities in branching activity)

Options
    • -3
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as
    • -2
    • +5
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -0
    • +27
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
    • -13
    • +30
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -2
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -21
    • +34
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
4:23 pm

fmalikoff

Rolling back previous update as the validation changes caused problems with drawing the "transitions" from the start hub.

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
3:29 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -3
    • +31
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -23
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
    • -1
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
1:35 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
1:19 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -2
    • +10
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +13
    /lams_common/db/model/lams_11.clay
    • -0
    • +1
    /lams_common/db/sql/create_lams_11_tables.sql
    • -0
    • +3
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -9
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -3
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -3
    • +31
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
9:40 am

mseaton

improved validation logic for adding branch connectors or transitions in Branching Activity view

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -2
    • +5
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -1
    • +10
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -16
    • +50
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • binary
    /lams_flash/src/common/flash/LFWindow.fla
    • -3
    • +0
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMessage.as
    • -12
    • +7
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/LFError.as
7:52 am

fmalikoff

Clarifying comparison for group - will now work even if the groups have the same order id. Removed unneeded saving logic from the import code now that the comparison is fixed.

Options
    • -4
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -8
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
7:14 am

fmalikoff

Branching: Wasn't updating the branch link when we copied the branch mappings (when copying a design).

Options
    • -0
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java