lams-github

lams_common

Clone Tools

Stats

Commits this week: 1
Total Committers: 37
Last Commit:
Commits this week: 1

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
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
    • -9
    • +17
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +60
    ./src/java/org/lamsfoundation/lams/learningdesign/ActivityTitleComparator.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -1
    • +10
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -3
    • +15
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -1
    • +30
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -0
    • +39
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/IContributionTypeStrategy.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/SimpleActivityStrategy.java
  12. … 1 more file in changeset.
Tuesday 03 Jul 2007
2:51 pm

mseaton

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

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
  2. … 4 more files in changeset.
2:10 pm

mseaton

branching activity saves start/end connector coords

Options
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
  2. … 4 more files in changeset.
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
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -2
    • +54
    ./db/model/lams_11.clay
    • -0
    • +4
    ./db/sql/create_lams_11_tables.sql
    • -1
    • +6
    ./db/sql/updatescripts/alter_21_branching.sql
    • -3
    • +64
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -3
    • +9
    ./src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -84
    • +128
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -4
    • +6
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -12
    • +12
    ./src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -14
    • +12
    ./src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
Friday 29 Jun 2007
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
    • -23
    • +39
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
  2. … 2 more files in changeset.
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
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +13
    ./db/model/lams_11.clay
    • -0
    • +1
    ./db/sql/create_lams_11_tables.sql
    • -0
    • +3
    ./db/sql/updatescripts/alter_21_branching.sql
    • -9
    • +18
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -3
    • +13
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -3
    • +31
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
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
    ./src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -8
    • +6
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
Thursday 28 Jun 2007
10:08 pm

fmalikoff

Branching: Getting the import working for grouped branching

Options
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -12
    • +105
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
2:49 pm

fmalikoff

Branching: Getting the progress engine working so it will display the branch activities if the sequence/branch contains one or no activities

Options
    • -2
    • +9
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.hbm.xml
    • -6
    • +26
    ./db/model/lams_11.clay
    • -4
    • +9
    ./db/sql/create_lams_11_tables.sql
    • -4
    • +8
    ./db/sql/updatescripts/alter_21_branching.sql
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -3
    • +21
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -6
    • +15
    ./src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -3
    • +16
    ./src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
  12. … 2 more files in changeset.
11:22 am

fmalikoff

Updating version to 2.0.4 / 2.0.4 Dev

Options
    • -5
    • +5
    ./db/sql/insert_lams_unix_config_data.sql
Thursday 21 Jun 2007
8:20 am

fmalikoff

Fix to add the system tool entry has been moved to a separate script on the lams2_0_3_fixes tag.

Options
    • -0
    • +30
    ./db/sql/updatescripts/alter_204_editonfly.sql
7:42 am

fmalikoff

Fix to add the system tool entry has been moved to a separate script on the lams2_0_3_fixes tag.

Options
    • -8
    • +0
    ./db/sql/updatescripts/alter_203_editonfly.sql
Wednesday 20 Jun 2007
12:43 pm

fmalikoff

Methods in the UserManagementService were missing from the transaction definitions, and this was causing issues in the roles import.

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/commonContext.xml
Tuesday 19 Jun 2007
1:28 pm

jliew

LDEV-1261 improve import user speed by running in separate thread (bypass hibernate filter), and update browser with progress every 5 seconds so it doesn't timeout.

Options
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/util/audit/AuditService.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/util/audit/IAuditService.java
  3. … 11 more files in changeset.
Monday 18 Jun 2007
3:30 pm

fmalikoff

Missed adding the system tool for the System Gate. As a result, if the user tries to go to the gate, they just get the index screen. The problem will have gone out in the Windows upgrader. Doing this fix now and will be okay in the Unix upgrader.

Options
    • -1
    • +9
    ./db/sql/updatescripts/alter_203_editonfly.sql
Friday 15 Jun 2007
1:44 pm

fmalikoff

LDEV-1257: Added support for Groups to be created in authoring (so that the names can be entered) and the mapping table to map groups to a sequence activity (ala branch) for a Group based branching activity.

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
7:49 am

fmalikoff

No need to keep deleting the content repository now as it the repository will overwrite the files.

Options
    • -1
    • +3
    ./build.xml
Thursday 14 Jun 2007
8:53 am

jliew

LDEV-1259 when saving organisations, check if child sets are null

Options
    • -11
    • +15
    ./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
Wednesday 13 Jun 2007
6:42 pm

fmalikoff

LDEV-1257: Added support for Groups to be created in authoring (so that the names can be entered) and the mapping table to map groups to a sequence activity (ala branch) for a Group based branching activity.

Options
    • -0
    • +10
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
    • -0
    • +41
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.hbm.xml
    • -97
    • +107
    ./db/model/lams_11.clay
    • -0
    • +16
    ./db/sql/create_lams_11_tables.sql
    • -0
    • +20
    ./db/sql/updatescripts/alter_21_branching.sql
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java
    • -5
    • +71
    ./src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -0
    • +160
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -1
    • +28
    ./src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
    • -5
    • +4
    ./src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java
    • -0
    • +91
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
  16. … 4 more files in changeset.
Tuesday 12 Jun 2007
7:43 am

fmalikoff

LDEV-1134: Dummying up a branching page for the progress engine. Had missed the entry for the abstract branching class in the Hibernate file when I switched from 1 branching class to 3.

Options
    • -8
    • +13
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
    • -15
    • +12
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
  5. … 3 more files in changeset.
Friday 08 Jun 2007
2:22 pm

fmalikoff

Split branching activity into 3 activities - one for each method of branching (teacher chosen, grouped and tool based)

Options
    • -1
    • +7
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -7
    • +26
    ./db/sql/insert_types_data.sql
    • -10
    • +31
    ./db/sql/updatescripts/alter_21_branching.sql
    • -6
    • +48
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -19
    • +4
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +132
    ./src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -0
    • +130
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -0
    • +131
    ./src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -3
    • +9
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -5
    • +22
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
  11. … 1 more file in changeset.
Tuesday 05 Jun 2007
3:26 pm

fmalikoff

LDEV-1134: Changed strategy to suit how we now expect a sequence activity to look - a whole pile of subactivities joined with transitions rather than order ids.

Options
    • -13
    • +24
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
3:16 pm

fmalikoff

Adding database changes script for branching

Options
    • -0
    • +13
    ./db/sql/updatescripts/alter_21_branching.sql
12:33 pm

mseaton

adding branch activity to sequence - basic model/dto changes and packet handling

Options
    • -0
    • +3
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +11
    ./db/sql/insert_types_data.sql
    • -1
    • +21
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -0
    • +140
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -0
    • +79
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/SystemTool.java
  10. … 1 more file in changeset.
11:22 am

mseaton

removing flash fla and as files

Options
    • binary
    ./src/flash/LFWindow.fla
    • binary
    ./src/flash/LFWindow.swc
    • binary
    ./src/flash/Panel.fla
    • binary
    ./src/flash/Panel.swc
    • binary
    ./src/flash/Panel.swf
    • binary
    ./src/flash/assets/3rd party components/DragAndDropTree.zip
    • binary
    ./src/flash/assets/3rd party components/MX180932_wddx.mxp
    • binary
    ./src/flash/assets/3rd party components/MX365880_FUIComponentsSet2.mxp
    • -64
    • +0
    ./src/flash/assets/3rd party components/Re Drag and Drop tree - license.txt
    • binary
    ./src/flash/assets/3rd party components/TabBar.swc
    • binary
    ./src/flash/assets/3rd party components/actionstep_alpha_1.zip
    • binary
    ./src/flash/assets/3rd party components/tooltip_as2.zip
    • binary
    ./src/flash/assets/3rd party components/tree dnd source.zip
    • binary
    ./src/flash/assets/aqua.clr
    • -1
    • +0
    ./src/flash/assets/bin.txt
  16. … 252 more files in changeset.
Friday 01 Jun 2007
11:52 am

erniegx <ernieg@gmail.com>

Updating greek

Options
    • -23
    • +23
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 8 more files in changeset.
Thursday 31 May 2007
2:39 pm

lfoxton

needed to add an extra row to lams_learning_activity_type for the edit on the fly to work

Options
    • -0
    • +1
    ./db/sql/updatescripts/alter_203_editonfly.sql
Wednesday 30 May 2007
9:13 am

fmalikoff

LDEV-1244: If an imported design was read only when exported, it will now be read only when imported.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
Tuesday 29 May 2007
7:12 pm

fmalikoff

LDEV-1241: Problem with progess engine getting stuck when a user is in a parallel activity within an optional activity and a force complete has occured. If the user selects the parallel activity after the force complete, the parallel activity is set to attempted, but the contained activities were left marked complete. So when the contained activities were "finished", they detected as complete and tried to forward the user to the current activity, which was the aforesaid parallel!

Now the code that sets an activity back to attempted will also check any completed child activities back to completed.

Options
    • -8
    • +35
    ./src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java
  2. … 1 more file in changeset.
7:12 pm

fmalikoff

LDEV-1241: Problem with progess engine getting stuck when a user is in a parallel activity within an optional activity required a change to the setProgressState method call. Test classes changed to match,

Options
    • -7
    • +7
    ./test/java/org/lamsfoundation/lams/learningdesign/TestComplexActivityStrategy.java
    • -3
    • +3
    ./test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java