Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

  1. … 4 more files in changeset.
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.

Branching: Getting the import working for grouped branching

Branching: Getting the progress engine working so it will display the branch activities if the sequence/branch contains one or no activities

    • -0
    • +1
    ./lamsfoundation/lams/util/wddx/WDDXTAGS.java
  1. … 6 more files in changeset.
Methods in the UserManagementService were missing from the transaction definitions, and this was causing issues in the roles import.

    • -0
    • +3
    ./lamsfoundation/lams/commonContext.xml
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.

  1. … 11 more files in changeset.
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.

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

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.

    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +160
    ./lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -0
    • +11
    ./lamsfoundation/lams/util/wddx/WDDXTAGS.java
  1. … 9 more files in changeset.
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.

  1. … 4 more files in changeset.
Split branching activity into 3 activities - one for each method of branching (teacher chosen, grouped and tool based)

    • -0
    • +132
    ./lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
  1. … 4 more files in changeset.
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.

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

    • -0
    • +140
    ./lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/SystemTool.java
  1. … 3 more files in changeset.
LDEV-1244: If an imported design was read only when exported, it will now be read only when imported.

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.

    • -8
    • +35
    ./lamsfoundation/lams/lesson/LearnerProgress.java
  1. … 1 more file in changeset.
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.

    • -0
    • +22
    ./lamsfoundation/lams/util/FileUtil.java
  1. … 5 more files in changeset.
LDEV-1224

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

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

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.

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

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.

    • -3
    • +10
    ./lamsfoundation/lams/lesson/LearnerProgress.java
  1. … 12 more files in changeset.
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.

    • -6
    • +27
    ./lamsfoundation/lams/util/FileUtil.java
Error message of new exception didn't actually include the message of the causing exception.

Merging RAMS and Edit On Fly changes from branch to the head.

    • -0
    • +149
    ./lamsfoundation/lams/learningdesign/SystemGateActivity.java
    • -4
    • +36
    ./lamsfoundation/lams/lesson/Lesson.java
  1. … 225 more files in changeset.
LDEV-1100

Encoded the username component in the userinfo callback url.

JIRA-1174

Moved extCourseId from the 'code' to the 'description' field.

LDEV-167 refactor cleanup file functions (cleansup lamstmp_* as well as lamszip_* files)

    • -0
    • +80
    ./lamsfoundation/lams/util/FileUtil.java
    • -0
    • +67
    ./lamsfoundation/lams/util/TempDirectoryFilter.java
  1. … 1 more file in changeset.
updated authoring, monitoring, wizard to load their library swf's from a common (swf serving) jsp.

  1. … 14 more files in changeset.
LDEV-1152 sql was checking existence of role and organisation membership separately, they should both be in the same UserOrganisationRole

LDEV-1107 extserver classes are created as subgroups, not groups; make extuser a member of the group as well as the subgroup; don't give extusers group manager role as they don't need it, especially in a subgroup

  1. … 1 more file in changeset.