• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
fixed wddxtags type (firstActivityUIID) + improvement in loading sequences for branching activity

  1. … 4 more files in changeset.
branching activity saves start/end connector coords

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

    • -13
    • +13
    ./lams/lesson/service/ILessonService.java
    • -15
    • +13
    ./lams/lesson/service/LessonService.java
  1. … 4 more files in changeset.
complete updateFederationRegistry so that outdated servers are deleted

    • -0
    • +11
    ./lams/federation/FederationServer.java
    • -1
    • +14
    ./lams/federation/service/FederationService.java
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. … 2 more files in changeset.
file LessonFederation.java was initially added on branch shibboleth_2_0.

    • -0
    • +0
    ./lams/federation/LessonFederation.java
added new table to record list of external lessons joined by local groups

    • -11
    • +13
    ./lams/federation/FederationLesson.java
    • -0
    • +21
    ./lams/federation/FederationServer.java
    • -0
    • +116
    ./lams/federation/LessonFederation.java
    • -1
    • +10
    ./lams/federation/service/FederationService.java
    • -0
    • +12
    ./lams/federation/service/IFederationService.java
  1. … 4 more files in changeset.
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

    • -7
    • +16
    ./lams/lesson/service/ILessonService.java
    • -4
    • +17
    ./lams/lesson/service/LessonService.java
  1. … 6 more files in changeset.
add wddx methods to service, and test jsp page for them

    • -11
    • +18
    ./lams/federation/service/FederationService.java
    • -13
    • +23
    ./lams/federation/service/IFederationService.java
  1. … 2 more files in changeset.
clarify methods covered by spring transaction

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

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.

    • -0
    • +11
    ./lams/util/audit/IAuditService.java
  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.

    • -3
    • +2
    ./lams/learningdesign/ChosenGrouping.java
    • -0
    • +160
    ./lams/learningdesign/GroupBranchActivityEntry.java
    • -2
    • +29
    ./lams/learningdesign/Grouping.java
    • -6
    • +5
    ./lams/learningdesign/RandomGrouping.java
    • -1
    • +14
    ./lams/learningdesign/dto/GroupDTO.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.

    • -2
    • +2
    ./lams/learningdesign/RandomGrouper.java
  1. … 4 more files in changeset.
Split branching activity into 3 activities - one for each method of branching (teacher chosen, grouped and tool based)

    • -7
    • +49
    ./lams/learningdesign/Activity.java
    • -0
    • +132
    ./lams/learningdesign/ChosenBranchingActivity.java
  1. … 4 more files in changeset.
merge with lams2_0_3 tag on HEAD

    • -2
    • +8
    ./lams/integration/service/IntegrationService.java
    • -3
    • +63
    ./lams/learningdesign/Activity.java
    • -4
    • +44
    ./lams/learningdesign/LearningDesign.java
    • -1
    • +2
    ./lams/learningdesign/ToolActivity.java
    • -6
    • +33
    ./lams/learningdesign/dto/DesignDetailDTO.java
    • -12
    • +46
    ./lams/lesson/LearnerProgress.java
  1. … 115 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

    • -2
    • +22
    ./lams/learningdesign/Activity.java
    • -0
    • +140
    ./lams/learningdesign/BranchingActivity.java
  1. … 3 more files in changeset.
update list of federation servers from registry

    • -6
    • +86
    ./lams/federation/service/FederationService.java
    • -0
    • +32
    ./lams/federation/service/IFederationService.java
  1. … 6 more files in changeset.
implement getFedServerGroups and getFedServerLessons, methods to call remote server

    • -0
    • +28
    ./lams/federation/FederationException.java
    • -0
    • +34
    ./lams/federation/dto/ExtLessonDTO.java
    • -0
    • +40
    ./lams/federation/dto/ExtOrgDTO.java
    • -3
    • +132
    ./lams/federation/service/FederationService.java
    • -1
    • +23
    ./lams/federation/service/IFederationService.java
  1. … 3 more files in changeset.
file FederationException.java was initially added on branch shibboleth_2_0.

    • -0
    • +0
    ./lams/federation/FederationException.java
file ExtOrgDTO.java was initially added on branch shibboleth_2_0.

    • -0
    • +0
    ./lams/federation/dto/ExtOrgDTO.java
file ExtLessonDTO.java was initially added on branch shibboleth_2_0.

    • -0
    • +0
    ./lams/federation/dto/ExtLessonDTO.java
added fed_id column to lams_fed_server (common id number maintained across federation)

    • -0
    • +17
    ./lams/federation/FederationServer.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.