Index: openacs-4/packages/imsld/tcl/imsld-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.xql,v
diff -u -r1.37.4.2 -r1.37.4.3
--- openacs-4/packages/imsld/tcl/imsld-procs.xql	26 Jun 2007 16:34:05 -0000	1.37.4.2
+++ openacs-4/packages/imsld/tcl/imsld-procs.xql	9 Jul 2007 16:09:51 -0000	1.37.4.3
@@ -898,7 +898,8 @@
 	<fullquery name="imsld::structure_next_activity.get_la_info">
 		<querytext>
     
-                    select la.activity_id as learning_activity_id
+                    select la.activity_id as learning_activity_id,
+		    complete_act_id
                     from imsld_learning_activitiesi la
                     where la.item_id = :object_id_two
                     and content_revision__is_live(la.activity_id) = 't'
@@ -1905,7 +1906,7 @@
 		</querytext>
 	</fullquery>
 
-	<fullquery name="imsld::generate_structure_activities_list.as_completed_p">
+	<fullquery name="imsld::generate_structure_activities_list.as_started_p">
 		<querytext>
 
                     select 1 from imsld_status_user
@@ -1917,6 +1918,18 @@
 		</querytext>
 	</fullquery>
 
+	<fullquery name="imsld::generate_structure_activities_list.as_completed_p">
+		<querytext>
+
+                    select 1 from imsld_status_user
+                    where related_id = :structure_id 
+                    and user_id = :user_id 
+                    and status = 'finish'
+                    and run_id = :run_id
+                
+		</querytext>
+	</fullquery>
+
 	<fullquery name="imsld::generate_activities_tree.current_role">
 		<querytext>
 
@@ -1947,6 +1960,7 @@
         content_item__get_live_revision(coalesce(rp.learning_activity_id,rp.support_activity_id,rp.activity_structure_id)) as activity_id,
         rp.role_part_id,
         ia.act_id,
+        ia.item_id as act_item_id,
         ip.play_id
         from imsld_role_partsi rp, imsld_actsi ia, imsld_playsi ip, imsld_imsldsi ii, imsld_attribute_instances attr,
         imsld_methodsi im,imsld_rolesi iri
@@ -2017,7 +2031,7 @@
 		</querytext>
 	</fullquery>
 
-	<fullquery name="imsld::generate_activities_tree.as_completed_p">
+	<fullquery name="imsld::generate_activities_tree.as_started_p">
 		<querytext>
 
                     select 1 from imsld_status_user
@@ -2029,6 +2043,18 @@
 		</querytext>
 	</fullquery>
 
+	<fullquery name="imsld::generate_activities_tree.as_completed_p">
+		<querytext>
+
+                    select 1 from imsld_status_user
+                    where related_id = :activity_id 
+                    and user_id = :user_id 
+                    and status = 'finished'
+                    and run_id = :run_id
+                    
+		</querytext>
+	</fullquery>
+
 	<fullquery name="imsld::generate_runtime_assigned_activities_tree.imsld_info">
 		<querytext>