lams-github / lams_common / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 32
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 05 Sep 2007
4:13 pm

fmalikoff

LDEV-1109: Fixing bugs in the authoring support for tool output based branching and getting the progress engine working. A rough implementation of the condition checking down for one MCQ condition for demonstration purposes. Two new methods added to the tool contract.

Options
    • -1
    • +5
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -3
    • +115
    ./lamsfoundation/lams/learningdesign/BranchCondition.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -0
    • +5
    ./lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/OptionsActivity.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/ParallelActivity.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -1
    • +12
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +10
    ./lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
    • -1
    • +36
    ./lamsfoundation/lams/tool/ToolSessionManager.java
    • -0
    • +64
    ./lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -5
    • +126
    ./lamsfoundation/lams/tool/service/LamsCoreToolService.java
    • -1
    • +3
    ./lamsfoundation/lams/util/wddx/WDDXTAGS.java
  16. … 22 more files in changeset.
Friday 31 Aug 2007
3:41 pm

jliew

putting ldap's add/create/update user into it's own spring transaction'd bean; added some more config parameters for ldap

Options
    • -0
    • +24
    ./lamsfoundation/lams/usermanagement/ldapContext.xml
    • -0
    • +41
    ./lamsfoundation/lams/usermanagement/service/ILdapService.java
    • -0
    • +261
    ./lamsfoundation/lams/usermanagement/service/LdapService.java
    • -1
    • +7
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  5. … 5 more files in changeset.
3:39 pm

jliew

adding authenticationMethodId to UserDTO so profile.jsp knows not to display 'edit profile/password'

Options
    • -1
    • +3
    ./lamsfoundation/lams/usermanagement/User.java
    • -1
    • +8
    ./lamsfoundation/lams/usermanagement/dto/UserDTO.java
  3. … 1 more file in changeset.
9:27 am

fmalikoff

LDEV-1109: Fixed up a couple of bugs with copying the learning design that crept in due to the addition of the tool output based branching - the branch mappings weren't being copied properly.

Options
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/SequenceActivity.java
Wednesday 29 Aug 2007
12:47 pm

fmalikoff

LDEV-1109: Implement more of the authoring support for tool output based branching. Added the table to store the conditions designed in authoring and refactored the branch mapping table to support the conditions. Modified the authoring code to expect the new objects from the authoring client.

Options
    • -7
    • +7
    ./lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
11:45 am

fmalikoff

LDEV-1109: Implement more of the authoring support for tool output based branching. Added the table to store the conditions designed in authoring and refactored the branch mapping table to support the conditions. Modified the authoring code to expect the new objects from the authoring client.

Options
    • -1
    • +5
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +235
    ./lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -0
    • +178
    ./lamsfoundation/lams/learningdesign/BranchCondition.java
    • -17
    • +6
    ./lamsfoundation/lams/learningdesign/Group.java
    • -187
    • +0
    ./lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -0
    • +13
    ./lamsfoundation/lams/learningdesign/Grouping.java
    • -5
    • +21
    ./lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -0
    • +43
    ./lamsfoundation/lams/learningdesign/dao/IBranchActivityEntryDAO.java
    • -0
    • +47
    ./lamsfoundation/lams/learningdesign/dao/hibernate/BranchActivityEntryDAO.java
    • -0
    • +101
    ./lamsfoundation/lams/learningdesign/dto/BranchActivityEntryDTO.java
    • -0
    • +125
    ./lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
    • -111
    • +0
    ./lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -3
    • +3
    ./lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -0
    • +48
    ./lamsfoundation/lams/learningdesign/dto/ToolOutputBranchActivityEntryDTO.java
    • -12
    • +8
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  16. … 6 more files in changeset.
Wednesday 22 Aug 2007
3:02 pm

fmalikoff

LDEV-1134: Adding more support for the tool output based branching. Added a couple of simple tool output definitions for MCQ and Forum and added a class to the core to help tools create the tool output definitions (OutputDefinitionFactory), which required a change to MessageService. Also added the call to the core tool service to support calling the tools for their output definitions.

Options
    • -0
    • +223
    ./lamsfoundation/lams/tool/OutputDefinitionFactory.java
    • -1
    • +12
    ./lamsfoundation/lams/tool/ToolContentManager.java
    • -7
    • +11
    ./lamsfoundation/lams/tool/ToolOutputDefinition.java
    • -1
    • +12
    ./lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
    • -1
    • +18
    ./lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -0
    • +49
    ./lamsfoundation/lams/tool/service/LamsCoreToolService.java
    • -8
    • +15
    ./lamsfoundation/lams/util/MessageService.java
Monday 20 Aug 2007
12:32 pm

jliew

more LDAP support; UserManagementService.setRolesForUserOrganisations has LazyInitialisationException problem

Options
    • -0
    • +4
    ./lamsfoundation/lams/usermanagement/AuthenticationMethodType.java
    • -0
    • +19
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -0
    • +20
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -0
    • +44
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  5. … 6 more files in changeset.
10:20 am

mseaton

temp call for returning Tool Output Definitions

Options
    • -0
    • +113
    ./lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
  2. … 3 more files in changeset.
Wednesday 15 Aug 2007
9:54 am

fmalikoff

Changes to support tool output based branching. Work in progress!

Options
    • -2
    • +30
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -1
    • +7
    ./lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -1
    • +5
    ./lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -4
    • +32
    ./lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -1
    • +3
    ./lamsfoundation/lams/learningdesign/GateActivity.java
    • -0
    • +4
    ./lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -1
    • +4
    ./lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -2
    • +6
    ./lamsfoundation/lams/learningdesign/OptionsActivity.java
    • -2
    • +6
    ./lamsfoundation/lams/learningdesign/ParallelActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/PermissionGateActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
    • -21
    • +7
    ./lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -2
    • +5
    ./lamsfoundation/lams/learningdesign/SimpleActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/SynchGateActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/SystemGateActivity.java
  16. … 18 more files in changeset.
Thursday 02 Aug 2007
12:23 pm

fmalikoff

Added validation for grouping activities - if the number of groups in the design is more than the specified number of groups then there is a validation error.

Options
    • -0
    • +14
    ./lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java
    • -0
    • +35
    ./lamsfoundation/lams/learningdesign/service/LearningDesignService.java
  3. … 2 more files in changeset.
11:51 am

fmalikoff

Made spelling of branchingActivityUIID entry consistent between DTO and WDDXTAGS

Options
    • -1
    • +1
    ./lamsfoundation/lams/util/wddx/WDDXTAGS.java
8:52 am

fmalikoff

Made the userlist in the GroupDTO optional, so that it isn't passed to authoring.

Options
    • -2
    • +2
    ./lamsfoundation/lams/learningdesign/Group.java
    • -2
    • +2
    ./lamsfoundation/lams/learningdesign/Grouping.java
    • -2
    • +2
    ./lamsfoundation/lams/learningdesign/dto/GroupDTO.java
    • -2
    • +2
    ./lamsfoundation/lams/learningdesign/dto/GroupingDTO.java
    • -1
    • +5
    ./lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
  6. … 2 more files in changeset.
Tuesday 31 Jul 2007
2:09 pm

fmalikoff

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.

Options
    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -32
    • +48
    ./lamsfoundation/lams/learningdesign/ChosenGrouper.java
    • -6
    • +9
    ./lamsfoundation/lams/learningdesign/Grouper.java
    • -2
    • +1
    ./lamsfoundation/lams/learningdesign/RandomGrouper.java
    • -9
    • +25
    ./lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java
    • -33
    • +30
    ./lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -10
    • +16
    ./lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -2
    • +3
    ./lamsfoundation/lams/lesson/service/LessonService.java
  9. … 2 more files in changeset.
Monday 30 Jul 2007
6:57 pm

asukkar

Added adminURL

LDEV-1256

Options
    • -1
    • +8
    ./lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
Friday 27 Jul 2007
2:44 pm

fmalikoff

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

Options
    • -16
    • +51
    ./lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
  2. … 1 more file in changeset.
8:38 am

fmalikoff

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!)

Options
    • -0
    • +12
    ./lamsfoundation/lams/learningdesign/Group.java
    • -20
    • +11
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  3. … 2 more files in changeset.
Thursday 19 Jul 2007
3:10 pm

fmalikoff

LDEV-1134: Branching: Added stopAfterActivity flag to activity, which will allow us to "end" a lesson at the end of the activity. Progress engine changes done.

Options
    • -2
    • +4
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -1
    • +2
    ./lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -1
    • +3
    ./lamsfoundation/lams/learningdesign/GateActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -1
    • +3
    ./lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/OptionsActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/ParallelActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/PermissionGateActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -2
    • +4
    ./lamsfoundation/lams/learningdesign/SimpleActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/SynchGateActivity.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/SystemGateActivity.java
  16. … 4 more files in changeset.
9:17 am

fmalikoff

LDEV-1134: Branching: Added stopAfterActivity flag to activity, which will allow us to "end" a lesson at the end of the activity. Authoring changes done.

Options
    • -1
    • +24
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -2
    • +16
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +5
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +1
    ./lamsfoundation/lams/util/wddx/WDDXTAGS.java
  5. … 6 more files in changeset.
Tuesday 17 Jul 2007
12:34 pm

fmalikoff

LDEV-1134: Branching: View screen for the class export portfolio. Required refactoring of classes and moving the system tool link to move to an interface.

Options
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/GateActivity.java
    • -2
    • +1
    ./lamsfoundation/lams/learningdesign/GroupingActivity.java
9:35 am

fmalikoff

LDEV-1134: Branching: View screen for the class export portfolio. Required refactoring of classes and moving the system tool link to move to an interface.

Options
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -4
    • +26
    ./lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -3
    • +8
    ./lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -3
    • +20
    ./lamsfoundation/lams/learningdesign/GateActivity.java
    • -3
    • +7
    ./lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -3
    • +21
    ./lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -0
    • +45
    ./lamsfoundation/lams/learningdesign/ISystemToolActivity.java
    • -8
    • +20
    ./lamsfoundation/lams/learningdesign/LearningDesignProcessor.java
    • -1
    • +2
    ./lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -128
    • +0
    ./lamsfoundation/lams/learningdesign/SystemToolActivity.java
    • -2
    • +6
    ./lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -17
    • +8
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -15
    • +13
    ./lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
    • -1
    • +3
    ./lamsfoundation/lams/tool/SystemTool.java
  15. … 6 more files in changeset.
Friday 06 Jul 2007
12:06 pm

fmalikoff

LDEV-1256: Added admin_url column to tool and system tool tables

Options
    • -0
    • +12
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -7
    • +1
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +19
    ./lamsfoundation/lams/tool/SystemTool.java
    • -0
    • +20
    ./lamsfoundation/lams/tool/Tool.java
  5. … 5 more files in changeset.
Thursday 05 Jul 2007
3:51 pm

fmalikoff

Branching: The start and end co-ordinates were missing during the import.

Options
    • -0
    • +11
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
2:29 pm

fmalikoff

LDEV-1261: Fixing a lazy loading exception that started when we removed the hibernate session filter on the user role import. The organisation can't be passed in from the web layer as it isn't connected to the session, and so when it tries to get the user organisation from the organisation, it throws a lazy loading exception.

Options
    • -2
    • +2
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -2
    • +14
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 4 more files in changeset.
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
    • -5
    • +30
    ./lamsfoundation/lams/learningdesign/Grouper.java
    • -2
    • +39
    ./lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -5
    • +6
    ./lamsfoundation/lams/lesson/service/ILessonService.java
    • -5
    • +7
    ./lamsfoundation/lams/lesson/service/LessonService.java
  5. … 10 more files in changeset.
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
    • -0
    • +60
    ./lamsfoundation/lams/learningdesign/ActivityTitleComparator.java
    • -3
    • +3
    ./lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +6
    ./lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -2
    • +2
    ./lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -1
    • +10
    ./lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -1
    • +22
    ./lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -3
    • +15
    ./lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -1
    • +30
    ./lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -0
    • +39
    ./lamsfoundation/lams/learningdesign/strategy/IContributionTypeStrategy.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/strategy/SimpleActivityStrategy.java
  11. … 2 more files in changeset.
Tuesday 03 Jul 2007
2:51 pm

mseaton

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

Options
    • -2
    • +3
    ./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
    ./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
    • -3
    • +64
    ./lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -3
    • +9
    ./lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -0
    • +8
    ./lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -0
    • +8
    ./lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -84
    • +128
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -4
    • +6
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -12
    • +12
    ./lamsfoundation/lams/lesson/service/ILessonService.java
    • -14
    • +12
    ./lamsfoundation/lams/lesson/service/LessonService.java
  9. … 4 more files in changeset.
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
    ./lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
  2. … 2 more files in changeset.