• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
fixed from previews revision

Allows to open gates for synch, permission and schedule activities. If gate is schedule gate, it unshedules the job from the scheduler (LDEV-1271)

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.

  1. … 8 more files in changeset.
Made the userlist in the GroupDTO optional, so that it isn't passed to authoring.

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

  1. … 7 more files in changeset.
LDEV-1134: Branching: View screen for the class export portfolio

  1. … 10 more files in changeset.
View branch screen done for the group based branching and tool based branching activities.

  1. … 5 more files in changeset.
Branching: Teacher chosen branch screen basically working. Still a bit of clean up on the messages to go.

  1. … 10 more files in changeset.
Further work on the teacher chosen branching screen. This included ensuring that the tool sessions aren't created for the activities within a branch when a lesson is created (as the users aren't known in advance) and also ensuring that there is always a grouping object attached to a branching activity during a lesson so that the grouping logic doesn't have to create it.

    • -0
    • +72
    ./org/lamsfoundation/lams/monitoring/BranchDTO.java
Branching: Create the Teacher Chosen branching screen, based on the existing Chosen Grouping screen. Not working yet but the changes have required changing the LessonService (in lams.jar) to take Grouping as a parameter, rather than GroupingActivity, so checking in Monitoring changes to match.

  1. … 2 more files in changeset.
LDEV-1237: Permission gate couldn't be opened if the class export portfolio had been done, as the export set the readonly flag to true and the readonly flag wasn't being reset. Now all fields are reset before the gate screen is displayed.

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

  1. … 72 more files in changeset.
Merging RAMS and Edit On Fly changes from branch to the head.

  1. … 158 more files in changeset.
Split the scheduling of gates into a separate public method, so I can schedule gates from live edit.

  1. … 1 more file in changeset.
Breaking the completeToolSession functionality into two parts. Now the tool session is completed but it forwards to another call to complete the activity and calculate the next activity. This is to reduce the chances of collisions when live edit is being started, in a clustering environment. See the live edit wiki page for more details.

  1. … 14 more files in changeset.
Merging 2.0.2 changes from the HEAD

  1. … 14 more files in changeset.
2.0.2 Fix - LDEV-1166 Used servlet and wddx packet to perform initialize lesson call in replacement of struts action call (url). Removes utf8 encoding problem.

Fixed wizard preloader movie - adjusted position of lams logo

  1. … 11 more files in changeset.
Merging 2.0.1 changes from the HEAD

  1. … 66 more files in changeset.
Removing temporary hack from previous version - have worked out how to delete the tool sessions in authoring for edit on fly, so can go back to preparing the tool sessions as normal.

Got the basic gate window working in monitoring - needed for the class wide export portfolio.

Temporary fix for deleting activity and their matching tool sessions - just don't create the tool sessions in the first place.

LDEV-1153: Creator of a lesson is no longer automatically added to the lesson as a learner - they are now only made a learner if they are on the list of learners.

LDEV-1097: Remove the finish button from the learner progress view of the grouping screen, plus updated some out of date method calls relating to force complete.

  1. … 1 more file in changeset.
Added some extra privilege checks on various monitoring url calls.

  1. … 1 more file in changeset.
LDEV-1097: The url for the learner progress screen was wrong. The learner progress url shouldn't use the current user's id, it should use the id in the request.

changes for adding removal option to monitor

  1. … 8 more files in changeset.
LDEV-1042: Allow users to be added to staff group and learner group in a lesson class after the lesson has started. Code has been written for both the LAMS monitoring interface + integration. Neither set of code is tested yet - need the clients to test it.

  1. … 6 more files in changeset.
Adding a flag to control whether or not the export portfolio button appears on the learner client. Flash sets the flag through either the initializeLesson call or through the learnerExportPortfolioAvailable method.

improved handling in lesson status changes - updated revert method to handle multiple activate conditions

userID fix for action calls

  1. … 1 more file in changeset.