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
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.
Monday 30 Jul 2007
6:57 pm

asukkar

Added adminURL

LDEV-1256

Options
    • -2
    • +9
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
Friday 27 Jul 2007
2:43 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
    • -17
    • +52
    ./src/java/org/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
    • -1
    • +13
    ./src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -20
    • +11
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  3. … 2 more files in changeset.
Wednesday 25 Jul 2007
3:39 pm

fmalikoff

The Edit Class button didn't work in monitoring for Shibboleth users - they don't have a role in the organisation that backs the lesson, so they couldn't get the organisation details. Changed the getOrganisationsForUserWithRole call so that if they don't have a role in the org, it still returns the basic details such as the name, etc.

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -7
    • +20
    ./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
7:21 am

jliew

adding ShibAttrEmail to lams_configuration, removing ShibIdpEntityId

Options
    • -7
    • +7
    ./db/sql/insert_lams_unix_config_data.sql
    • -7
    • +7
    ./db/sql/insert_lams_windows_config_data.sql
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
Friday 20 Jul 2007
10:58 am

jliew

added new shib attribute for the ServerURL of the origin LAMS server to help determine whether user is local or not; added roles for shib users in ShibLoginServlet

Options
    • -1
    • +3
    ./db/sql/insert_lams_unix_config_data.sql
    • -0
    • +2
    ./db/sql/insert_lams_windows_config_data.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  5. … 3 more files in changeset.
Thursday 19 Jul 2007
3:09 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
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
    • -1
    • +3
    ./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
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/SystemGateActivity.java
  16. … 4 more files in changeset.
9:14 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
    • -0
    • +1
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +13
    ./db/model/lams_11.clay
    • -1
    • +2
    ./db/sql/create_lams_11_tables.sql
    • -1
    • +3
    ./db/sql/updatescripts/alter_21_branching.sql
    • -2
    • +25
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -3
    • +17
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
  9. … 2 more files in changeset.
Tuesday 17 Jul 2007
1:36 pm

jliew

switch from getting user from SessionManager to using shib username attribute

Options
    • -0
    • +36
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
  3. … 2 more files in changeset.
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
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
9:33 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
    • -62
    • +67
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -13
    • +13
    ./db/sql/insert_types_data.sql
    • -19
    • +17
    ./db/sql/updatescripts/alter_21_branching.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -5
    • +27
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -4
    • +9
    ./src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -4
    • +21
    ./src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -4
    • +8
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -4
    • +22
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -0
    • +45
    ./src/java/org/lamsfoundation/lams/learningdesign/ISystemToolActivity.java
    • -8
    • +20
    ./src/java/org/lamsfoundation/lams/learningdesign/LearningDesignProcessor.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -128
    • +0
    ./src/java/org/lamsfoundation/lams/learningdesign/SystemToolActivity.java
    • -3
    • +7
    ./src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -17
    • +8
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  16. … 5 more files in changeset.
Thursday 12 Jul 2007
2:24 pm

jliew

fix getFedServerByURLHost to enclose search parameter with '%'

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
10:53 am

jliew

changing shib authentication to 'on/off' rather than try to have db/shib authentication happening at the same time

Options
    • -1
    • +2
    ./db/sql/insert_lams_unix_config_data.sql
    • -1
    • +2
    ./db/sql/insert_lams_windows_config_data.sql
    • -3
    • +1
    ./db/sql/insert_types_data.sql
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  8. … 7 more files in changeset.
Monday 09 Jul 2007
3:20 pm

jliew

pre-select idp in lesson link for learner

Options
    • -2
    • +4
    ./db/sql/insert_lams_unix_config_data.sql
    • -2
    • +4
    ./db/sql/insert_lams_windows_config_data.sql
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  4. … 3 more files in changeset.
Friday 06 Jul 2007
12:05 pm

fmalikoff

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

Options
    • -0
    • +16
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/SystemTool.hbm.xml
    • -0
    • +15
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
    • -4
    • +16
    ./db/model/lams_11.clay
    • -1
    • +3
    ./db/sql/create_lams_11_tables.sql
    • -2
    • +6
    ./db/sql/updatescripts/alter_21_branching.sql
    • -1
    • +13
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -7
    • +1
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -1
    • +20
    ./src/java/org/lamsfoundation/lams/tool/SystemTool.java
    • -1
    • +21
    ./src/java/org/lamsfoundation/lams/tool/Tool.java
Thursday 05 Jul 2007
3:51 pm

fmalikoff

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

Options
    • -0
    • +11
    ./src/java/org/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
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -3
    • +15
    ./src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 4 more files in changeset.
Wednesday 04 Jul 2007
4:15 pm

fmalikoff

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

Options
    • -1
    • +1
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -6
    • +31
    ./src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
    • -3
    • +40
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -6
    • +7
    ./src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -6
    • +8
    ./src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
  6. … 9 more files in changeset.
2:11 pm

jliew

add 2 servlets at /servlet/getFedServerGroups and /servlet/getFedServerLessons for flash to use

Options
    • -11
    • +53
    ./src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
  3. … 2 more files in changeset.
2:10 pm

jliew

add new column to lams_lesson_fed to store local lesson state of external lessons (for later)

Options
    • -0
    • +10
    ./conf/hibernate/mappings/org/lamsfoundation/lams/federation/LessonFederation.hbm.xml
    • -0
    • +1
    ./db/sql/create_sharedlesson_tables.sql
    • -1
    • +19
    ./src/java/org/lamsfoundation/lams/federation/LessonFederation.java
  4. … 1 more file in changeset.
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
    • -9
    • +17
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +60
    ./src/java/org/lamsfoundation/lams/learningdesign/ActivityTitleComparator.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -2
    • +11
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -2
    • +23
    ./src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -4
    • +16
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -2
    • +31
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -0
    • +39
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/IContributionTypeStrategy.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/SimpleActivityStrategy.java
  12. … 1 more file in changeset.
Tuesday 03 Jul 2007
2:50 pm

mseaton

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

Options
    • -3
    • +4
    ./src/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
    ./src/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
    • -0
    • +13
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -2
    • +54
    ./db/model/lams_11.clay
    • -1
    • +5
    ./db/sql/create_lams_11_tables.sql
    • -1
    • +6
    ./db/sql/updatescripts/alter_21_branching.sql
    • -4
    • +65
    ./src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -4
    • +10
    ./src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -85
    • +129
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -4
    • +6
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -13
    • +13
    ./src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -15
    • +13
    ./src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
9:20 am

jliew

added collection of external servers, since it's stored locally in new table (lams_lesson_fed)

Options
    • -0
    • +19
    ./conf/hibernate/mappings/org/lamsfoundation/lams/federation/FederationServer.hbm.xml
9:20 am

jliew

changed lessonId property to lesson object, since it's on the local server

Options
    • -7
    • +10
    ./conf/hibernate/mappings/org/lamsfoundation/lams/federation/FederationLesson.hbm.xml
9:16 am

jliew

complete updateFederationRegistry so that outdated servers are deleted

Options
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/federation/FederationServer.java
    • -1
    • +14
    ./src/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
    ./src/java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
  2. … 2 more files in changeset.