lams

lams_common

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 27
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 98,785
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 05 Sep 2007
4:05 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
    • -0
    • +3
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
    • -9
    • +16
    ./db/model/lams_11.clay
    • -6
    • +7
    ./db/sql/create_lams_11_tables.sql
    • -6
    • +7
    ./db/sql/updatescripts/alter_21_branching.sql
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -4
    • +116
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -2
    • +13
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.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
    • -2
    • +5
    ./db/sql/insert_lams_unix_config_data.sql
    • -2
    • +5
    ./db/sql/insert_lams_windows_config_data.sql
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -0
    • +41
    ./src/java/org/lamsfoundation/lams/usermanagement/service/ILdapService.java
    • -0
    • +261
    ./src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
    • -2
    • +8
    ./src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  7. … 3 more files in changeset.
3:39 pm

jliew

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

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/usermanagement/User.java
    • -2
    • +9
    ./src/java/org/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
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
Thursday 30 Aug 2007
3:51 pm

mseaton

fixed for lessons call on service + desc value changes in flash

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
  2. … 4 more files in changeset.
10:06 am

mseaton

add description field

Options
    • -0
    • +9
    ./conf/hibernate/mappings/org/lamsfoundation/lams/federation/LessonFederation.hbm.xml
9:35 am

mseaton

fixed up service - missing methods

Options
    • -3
    • +16
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -1
    • +10
    ./src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
Wednesday 29 Aug 2007
4:15 pm

jliew

adding description field to extLessonDTO received from remote lams server

Options
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/federation/dto/ExtLessonDTO.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
  3. … 1 more file in changeset.
3:28 pm

jliew

removing unused methods

Options
    • -20
    • +0
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -28
    • +1
    ./src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
2:40 pm

jliew

adding field for lesson description of remote shared lessons

Options
    • -0
    • +1
    ./db/sql/create_sharedlesson_tables.sql
    • -1
    • +19
    ./src/java/org/lamsfoundation/lams/federation/LessonFederation.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
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
    • -8
    • +8
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
12:44 pm

jliew

complete toString method

Options
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/federation/LessonFederation.java
11:56 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
    • -12
    • +132
    ./db/model/lams_11.clay
    • -2
    • +19
    ./db/sql/create_lams_11_tables.sql
    • -2
    • +19
    ./db/sql/updatescripts/alter_21_branching.sql
  4. … 8 more files in changeset.
11:44 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
    • -4
    • +4
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +46
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml
    • -0
    • +51
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
    • -1
    • +1
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
    • -48
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.hbm.xml
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +235
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -0
    • +178
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
    • -18
    • +7
    ./src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -187
    • +0
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -1
    • +14
    ./src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
    • -6
    • +22
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -0
    • +43
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/IBranchActivityEntryDAO.java
    • -0
    • +47
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/BranchActivityEntryDAO.java
    • -0
    • +101
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/BranchActivityEntryDTO.java
  16. … 6 more files in changeset.
11:32 am

jliew

adding saveLessonFed servlet, for saving external lessons

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/federation/LessonFederation.java
    • -0
    • +36
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
  4. … 1 more file in changeset.
Monday 27 Aug 2007
1:46 pm

jliew

adding saveFedLessons servlet for flash

Options
    • -0
    • +50
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
  3. … 18 more files in changeset.
11:24 am

jliew

adding orgCode field to extLessonDTO

Options
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/federation/dto/ExtLessonDTO.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
  3. … 3 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
    ./src/java/org/lamsfoundation/lams/tool/OutputDefinitionFactory.java
    • -2
    • +13
    ./src/java/org/lamsfoundation/lams/tool/ToolContentManager.java
    • -8
    • +12
    ./src/java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java
    • -2
    • +13
    ./src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
    • -2
    • +19
    ./src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -1
    • +50
    ./src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
    • -10
    • +17
    ./src/java/org/lamsfoundation/lams/util/MessageService.java
8:59 am

jliew

change call to update local list of federation servers to pass key as request header rather than get parameter

Options
    • -7
    • +19
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -10
    • +0
    ./src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
  3. … 2 more files in changeset.
Tuesday 21 Aug 2007
8:20 am

jliew

file FedServerDTO.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/federation/dto/FedServerDTO.java
8:20 am

jliew

adding getFedServerIds servlet to allow flash to read locally the names and ids of each lams server in 'federation'

Options
    • -0
    • +35
    ./src/java/org/lamsfoundation/lams/federation/dto/FedServerDTO.java
    • -0
    • +30
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
  4. … 3 more files in changeset.
Monday 20 Aug 2007
2:56 pm

mseaton

updated organisation DTO for new boolean fields (joint lessons) and tested access to values in flash

Options
    • -2
    • +18
    ./src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTOFactory.java
  3. … 3 more files in changeset.
12:28 pm

jliew

more LDAP support; UserManagementService.setRolesForUserOrganisations has LazyInitialisationException problem

Options
    • -1
    • +23
    ./db/sql/insert_lams_unix_config_data.sql
    • -1
    • +23
    ./db/sql/insert_lams_windows_config_data.sql
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.java
    • -1
    • +20
    ./src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +21
    ./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -1
    • +45
    ./src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  7. … 4 more files in changeset.
10:20 am

mseaton

temp call for returning Tool Output Definitions

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

fmalikoff

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

Options
    • -8
    • +13
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -1
    • +60
    ./db/model/lams_11.clay
    • -2
    • +14
    ./db/sql/create_lams_11_tables.sql
    • -1
    • +17
    ./db/sql/updatescripts/alter_21_branching.sql
    • -3
    • +31
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -2
    • +8
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -5
    • +33
    ./src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -3
    • +7
    ./src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
    • -3
    • +7
    ./src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
  16. … 18 more files in changeset.
Thursday 02 Aug 2007
12:22 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
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +15
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java
    • -1
    • +36
    ./src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
11:51 am

fmalikoff

Made spelling of branchingActivityUIID entry consistent between DTO and WDDXTAGS

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
8:49 am

fmalikoff

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

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java
    • -2
    • +6
    ./src/java/org/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
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -33
    • +49
    ./src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java
    • -7
    • +10
    ./src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
    • -10
    • +26
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java
    • -34
    • +31
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -11
    • +17
    ./src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -2
    • +5
    ./test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java
  10. … 1 more file in changeset.
10:13 am

jliew

add results text when federation server list is updated

Options
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
  3. … 1 more file in changeset.