Index: lams_common/db/sql/insert_types_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_types_data.sql,v
diff -u -r1.72 -r1.73
--- lams_common/db/sql/insert_types_data.sql	16 Nov 2007 04:48:55 -0000	1.72
+++ lams_common/db/sql/insert_types_data.sql	14 Jan 2008 23:34:56 -0000	1.73
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/updatescripts/Attic/alter_21_branching.sql,v
diff -u -r1.26 -r1.27
--- lams_common/db/sql/updatescripts/alter_21_branching.sql	21 Dec 2007 03:47:41 -0000	1.26
+++ lams_common/db/sql/updatescripts/alter_21_branching.sql	14 Jan 2008 23:34:56 -0000	1.27
@@ -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