lams / lams_common

src

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 25
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 81,741
Net change in LoC this week: 0

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:35 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
    • -0
    • +60
    ./java/org/lamsfoundation/lams/learningdesign/ActivityTitleComparator.java
    • -4
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -1
    • +7
    ./java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -2
    • +11
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -2
    • +23
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -4
    • +16
    ./java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -2
    • +31
    ./java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -0
    • +39
    ./java/org/lamsfoundation/lams/learningdesign/strategy/IContributionTypeStrategy.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/strategy/SimpleActivityStrategy.java
  11. … 2 more files in changeset.
Tuesday 03 Jul 2007
2:50 pm

mseaton

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

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

mseaton

branching activity saves start/end connector coords

Options
    • -1
    • +8
    ./java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
  2. … 4 more files in changeset.
10:00 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
    • -4
    • +65
    ./java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -4
    • +10
    ./java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -1
    • +9
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -1
    • +9
    ./java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -85
    • +129
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -4
    • +6
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -13
    • +13
    ./java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -15
    • +13
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
  9. … 4 more files in changeset.
9:16 am

jliew

complete updateFederationRegistry so that outdated servers are deleted

Options
    • -0
    • +11
    ./java/org/lamsfoundation/lams/federation/FederationServer.java
    • -1
    • +14
    ./java/org/lamsfoundation/lams/federation/service/FederationService.java
Friday 29 Jun 2007
3:28 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
    • -24
    • +40
    ./java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
  2. … 2 more files in changeset.
2:55 pm

jliew

file LessonFederation.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./java/org/lamsfoundation/lams/federation/LessonFederation.java
2:55 pm

jliew

added new table to record list of external lessons joined by local groups

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -11
    • +13
    ./java/org/lamsfoundation/lams/federation/FederationLesson.java
    • -0
    • +21
    ./java/org/lamsfoundation/lams/federation/FederationServer.java
    • -0
    • +116
    ./java/org/lamsfoundation/lams/federation/LessonFederation.java
    • -1
    • +10
    ./java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -0
    • +12
    ./java/org/lamsfoundation/lams/federation/service/IFederationService.java
  7. … 4 more files in changeset.
1:13 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
    • -10
    • +19
    ./java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -4
    • +14
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -3
    • +31
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  4. … 4 more files in changeset.
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
    • -5
    • +10
    ./java/org/lamsfoundation/lams/learningdesign/Group.java
    • -8
    • +6
    ./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
    • -1
    • +11
    ./java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -12
    • +105
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
2:43 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
    • -3
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/Group.java
    • -4
    • +22
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -1
    • +11
    ./java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -7
    • +16
    ./java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -4
    • +17
    ./java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/web/util/AttributeNames.java
  8. … 6 more files in changeset.
Friday 22 Jun 2007
1:17 pm

jliew

add wddx methods to service, and test jsp page for them

Options
    • -11
    • +18
    ./java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -13
    • +23
    ./java/org/lamsfoundation/lams/federation/service/IFederationService.java
  3. … 2 more files in changeset.
1:16 pm

jliew

clarify methods covered by spring transaction

Options
    • -4
    • +1
    ./java/org/lamsfoundation/lams/federationContext.xml
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
    ./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
    ./java/org/lamsfoundation/lams/util/audit/AuditService.java
    • -0
    • +11
    ./java/org/lamsfoundation/lams/util/audit/IAuditService.java
  3. … 11 more files in changeset.
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
    • -1
    • +7
    ./java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
Thursday 14 Jun 2007
8:53 am

jliew

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

Options
    • -12
    • +16
    ./java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
Wednesday 13 Jun 2007
6:36 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
    • +1
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -3
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java
    • -6
    • +72
    ./java/org/lamsfoundation/lams/learningdesign/Group.java
    • -0
    • +160
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -2
    • +29
    ./java/org/lamsfoundation/lams/learningdesign/Grouping.java
    • -6
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java
    • -0
    • +91
    ./java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -1
    • +14
    ./java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java
    • -2
    • +23
    ./java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -1
    • +12
    ./java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
  11. … 9 more files in changeset.
Tuesday 12 Jun 2007
7:42 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
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
    • -16
    • +13
    ./java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
  4. … 4 more files in changeset.
Friday 08 Jun 2007
2:19 pm

fmalikoff

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

Options
    • -7
    • +49
    ./java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -20
    • +5
    ./java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +132
    ./java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -0
    • +130
    ./java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -0
    • +131
    ./java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -4
    • +10
    ./java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -6
    • +23
    ./java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
  8. … 4 more files in changeset.
Thursday 07 Jun 2007
9:26 am

jliew

merge with lams2_0_3 tag on HEAD

Options
    • binary
    ./flash/org/lamsfoundation/lams/common/AboutDialog.as
    • binary
    ./flash/org/lamsfoundation/lams/common/ApplicationParent.as
    • binary
    ./flash/org/lamsfoundation/lams/common/LearnerActivity.as
    • binary
    ./flash/org/lamsfoundation/lams/common/Sequence.as
    • binary
    ./flash/org/lamsfoundation/lams/common/comms/Communication.as
    • binary
    ./flash/org/lamsfoundation/lams/common/layout/ILayoutManager.as
    • binary
    ./flash/org/lamsfoundation/lams/common/layout/LFLayout.as
    • binary
    ./flash/org/lamsfoundation/lams/common/layout/LFLayoutItem.as
    • binary
    ./flash/org/lamsfoundation/lams/common/layout/LFLayoutManager.as
    • binary
    ./flash/org/lamsfoundation/lams/common/mvc/AbstractView.as
    • binary
    ./flash/org/lamsfoundation/lams/common/ui/Cursor.as
    • binary
    ./flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as
    • binary
    ./flash/org/lamsfoundation/lams/common/ui/Point.as
    • binary
    ./flash/org/lamsfoundation/lams/common/ws/Workspace.as
    • binary
    ./flash/org/lamsfoundation/lams/common/ws/WorkspaceController.as
  16. … 115 more files 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
    • -14
    • +25
    ./java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
12:33 pm

mseaton

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

Options
    • -2
    • +22
    ./java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -0
    • +140
    ./java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -1
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -1
    • +6
    ./java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -1
    • +8
    ./java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -0
    • +79
    ./java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/SystemTool.java
  8. … 3 more files in changeset.
12:31 pm

jliew

update list of federation servers from registry

Options
    • -6
    • +86
    ./java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -0
    • +32
    ./java/org/lamsfoundation/lams/federation/service/IFederationService.java
    • -1
    • +5
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  4. … 6 more files in changeset.
11:19 am

mseaton

removing flash fla and as files

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

jliew

implement getFedServerGroups and getFedServerLessons, methods to call remote server

Options
    • -0
    • +28
    ./java/org/lamsfoundation/lams/federation/FederationException.java
    • -0
    • +34
    ./java/org/lamsfoundation/lams/federation/dto/ExtLessonDTO.java
    • -0
    • +40
    ./java/org/lamsfoundation/lams/federation/dto/ExtOrgDTO.java
    • -3
    • +132
    ./java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -1
    • +23
    ./java/org/lamsfoundation/lams/federation/service/IFederationService.java
  6. … 3 more files in changeset.
12:52 pm

jliew

file FederationException.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./java/org/lamsfoundation/lams/federation/FederationException.java
12:52 pm

jliew

file ExtOrgDTO.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./java/org/lamsfoundation/lams/federation/dto/ExtOrgDTO.java
12:52 pm

jliew

file ExtLessonDTO.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./java/org/lamsfoundation/lams/federation/dto/ExtLessonDTO.java