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
Thursday 05 Jul 2007
8:29 am

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
10:18 am

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.
5: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
8:51 am

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.
8:10 am

mseaton

branching activity saves start/end connector coords

Options
    • -0
    • +7
    ./lamsfoundation/lams/util/wddx/WDDXTAGS.java
  2. … 4 more files in changeset.
4: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
9:29 am

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.
7:19 am

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
    • -9
    • +18
    ./lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -3
    • +13
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -3
    • +31
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  4. … 4 more files in changeset.
1: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
    ./lamsfoundation/lams/learningdesign/Group.java
    • -8
    • +6
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
Thursday 28 Jun 2007
4:08 pm

fmalikoff

Branching: Getting the import working for grouped branching

Options
    • -0
    • +10
    ./lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -12
    • +105
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
8:49 am

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
    • +3
    ./lamsfoundation/lams/learningdesign/Group.java
    • -3
    • +21
    ./lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -0
    • +10
    ./lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -6
    • +15
    ./lamsfoundation/lams/lesson/service/ILessonService.java
    • -3
    • +16
    ./lamsfoundation/lams/lesson/service/LessonService.java
    • -0
    • +1
    ./lamsfoundation/lams/util/wddx/WDDXTAGS.java
    • -0
    • +2
    ./lamsfoundation/lams/web/util/AttributeNames.java
  8. … 6 more files in changeset.
Wednesday 20 Jun 2007
6:43 am

fmalikoff

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

Options
    • -0
    • +3
    ./lamsfoundation/lams/commonContext.xml
Tuesday 19 Jun 2007
7:28 am

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
    ./lamsfoundation/lams/util/audit/AuditService.java
    • -0
    • +11
    ./lamsfoundation/lams/util/audit/IAuditService.java
  3. … 11 more files in changeset.
Friday 15 Jun 2007
7:44 am

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
    ./lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
Thursday 14 Jun 2007
2:53 am

jliew

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

Options
    • -11
    • +15
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
Wednesday 13 Jun 2007
12: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
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -2
    • +1
    ./lamsfoundation/lams/learningdesign/ChosenGrouping.java
    • -5
    • +71
    ./lamsfoundation/lams/learningdesign/Group.java
    • -0
    • +160
    ./lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -1
    • +28
    ./lamsfoundation/lams/learningdesign/Grouping.java
    • -5
    • +4
    ./lamsfoundation/lams/learningdesign/RandomGrouping.java
    • -0
    • +91
    ./lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -0
    • +13
    ./lamsfoundation/lams/learningdesign/dto/GroupDTO.java
    • -1
    • +22
    ./lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -0
    • +11
    ./lamsfoundation/lams/util/wddx/WDDXTAGS.java
  11. … 9 more files in changeset.
Tuesday 12 Jun 2007
1: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
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/RandomGrouper.java
    • -15
    • +12
    ./lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
  4. … 4 more files in changeset.
Friday 08 Jun 2007
8:22 am

fmalikoff

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

Options
    • -6
    • +48
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -19
    • +4
    ./lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +132
    ./lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -0
    • +130
    ./lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -0
    • +131
    ./lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -3
    • +9
    ./lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -5
    • +22
    ./lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
  8. … 4 more files in changeset.
Tuesday 05 Jun 2007
9:26 am

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
    ./lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
6:33 am

mseaton

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

Options
    • -1
    • +21
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -0
    • +140
    ./lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +3
    ./lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -0
    • +5
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +7
    ./lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -0
    • +79
    ./lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/SystemTool.java
  8. … 3 more files in changeset.
Wednesday 30 May 2007
3: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
    ./lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -0
    • +5
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
Tuesday 29 May 2007
1: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
    ./lamsfoundation/lams/lesson/LearnerProgress.java
  2. … 1 more file in changeset.
8:17 am

jliew

LDEV-1155 revert to storing temp portfolio on server as a constant 'export.zip'; URLEncoded the portfolio name when it is passed as a URL parameter (for i18n purposes); strip out punctuation chars from the export portfolio filename that is downloaded by users.

Options
    • -0
    • +22
    ./lamsfoundation/lams/util/FileUtil.java
  2. … 5 more files in changeset.
Friday 25 May 2007
8:02 am

asukkar

LDEV-1224

Sorted locale list to ensure the returned locale is consistent for a given input.

Options
    • -0
    • +3
    ./lamsfoundation/lams/integration/service/IntegrationService.java
Wednesday 23 May 2007
2:51 am

jliew

LDEV-1183 group managers get learner as well as monitor in subgroups

Options
    • -11
    • +28
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
Tuesday 22 May 2007
8:08 am

fmalikoff

LDEV-1225: When a 2.0 export file was imported, the system tool id wasn't being set for grouping. So if the design was run without being saved again, the grouping page in export portfolio didn't work. Once the design was saved, the field was set hence we didn't pick up the problem before.

Options
    • -0
    • +1
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
Monday 21 May 2007
10:20 am

fmalikoff

LDEV-1180: Grouping page for export portfolio failing - the import was not setting the system tool column in the grouping activity.

Options
    • -0
    • +1
    ./lamsfoundation/lams/learningdesign/service/LD102Importer.java
Wednesday 16 May 2007
1:43 am

fmalikoff

LDEV-1051 and LDEV-1198: Fixed the break out of frames logic for parallels at the end of a design and inside an optional activity.

Options
    • -3
    • +10
    ./lamsfoundation/lams/lesson/LearnerProgress.java
  2. … 12 more files in changeset.
Tuesday 15 May 2007
1:53 am

fmalikoff

LDEV-1227: Export failing when the content directory under lams-www/secure had an images directory but no files in the images directory. Wasn't detected the directory as empty (as there was an images directory) but the zip failed as there were no files in the zip file. Now the check for an empty directory checks for empty subdirectories as well.

Options
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -6
    • +27
    ./lamsfoundation/lams/util/FileUtil.java
Monday 14 May 2007
8:04 am

fmalikoff

Error message of new exception didn't actually include the message of the causing exception.

Options
    • -4
    • +4
    ./lamsfoundation/lams/util/zipfile/ZipFileUtil.java