Index: lams_common/db/sql/insert_types_data.sql =================================================================== diff -u -rac99dd8a79daaa42b1e6cdbe9b1a5fd197107b83 -r871606a998d7eb07d714ac9592c178f9df6173af --- lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision ac99dd8a79daaa42b1e6cdbe9b1a5fd197107b83) +++ lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 871606a998d7eb07d714ac9592c178f9df6173af) @@ -183,7 +183,7 @@ export_pfolio_class_url, monitor_url, contribute_url, create_date_time) VALUES (6, 10, 'Monitor Chosen Branching', 'Select between multiple sequence activities, with the branch chosen in monitoring.', 'learning/branching.do?method=performBranching', 'learning/branching.do?method=performBranching', - 'learning/branching.do?method=viewBranching&mode=teacher', NULL, + 'monitoring/complexProgress.do', NULL, 'monitoring/branchingExportPortfolio?mode=teacher', 'monitoring/chosenBranching.do?method=assignBranch', 'monitoring/chosenBranching.do?method=assignBranch', now()); @@ -192,7 +192,7 @@ export_pfolio_class_url, monitor_url, contribute_url, create_date_time) VALUES (7, 11, 'Group Based Branching', 'Select between multiple sequence activities, with the branch chosen by an existing group.', 'learning/branching.do?method=performBranching', 'learning/branching.do?method=performBranching', - 'learning/branching.do?method=viewBranching&mode=teacher', NULL, + 'monitoring/complexProgress.do', NULL, 'monitoring/branchingExportPortfolio?mode=teacher', 'monitoring/groupedBranching.do?method=viewBranching', 'monitoring/groupedBranching.do?method=assignBranch', now()); @@ -201,7 +201,7 @@ export_pfolio_class_url, monitor_url, contribute_url, create_date_time) VALUES (8, 12, 'Tool Output Based Branching', 'Select between multiple sequence activities, with the branch chosen on results of another activity.', 'learning/branching.do?method=performBranching', 'learning/branching.do?method=performBranching', - 'learning/branching.do?method=viewBranching&mode=teacher', NULL, + 'monitoring/complexProgress.do', NULL, 'monitoring/branchingExportPortfolio?mode=teacher', 'monitoring/toolBranching.do?method=viewBranching', 'monitoring/toolBranching.do?method=viewBranching', now()); @@ -210,7 +210,7 @@ export_pfolio_class_url, monitor_url, contribute_url, create_date_time) VALUES (9, 8, 'Sequence', 'A sequence of activities', 'learning/SequenceActivity.do', 'learning/SequenceActivity.do', - NULL, NULL, + 'monitoring/complexProgress.do', NULL, 'monitoring/sequenceExportPortfolio?mode=teacher', 'monitoring/sequence.do?method=viewSequence', 'monitoring/sequence.do?method=viewSequence', now()); Index: lams_common/db/sql/updatescripts/alter_21_branching.sql =================================================================== diff -u -r396082286ff017a5a2f985f41f6ba090e2b222cf -r871606a998d7eb07d714ac9592c178f9df6173af --- lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision 396082286ff017a5a2f985f41f6ba090e2b222cf) +++ lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision 871606a998d7eb07d714ac9592c178f9df6173af) @@ -282,3 +282,6 @@ -- LDEV-1284 integration organisation no longer mandatory alter table lams_ext_server_org_map modify column orgid bigint(20); + +-- LDEV-1473 learner progress url for branching and sequence system tools +update lams_system_tool set learner_progress_url='monitoring/complexProgress.do' where system_tool_id > 5; \ No newline at end of file