Index: openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl,v
diff -u -r1.13.4.2 -r1.13.4.3
--- openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl	26 Jun 2007 10:27:55 -0000	1.13.4.2
+++ openacs-4/packages/imsld/tcl/imsld-instance-procs.tcl	26 Jun 2007 15:57:31 -0000	1.13.4.3
@@ -426,7 +426,8 @@
         }
         
         # 1. items --> learning objectives, prerequisites, roles, 
-        #      learning objects, activity description, information(activity structures)
+        #      learning objects, activity description, information(activity structures),
+	#      feedback
         
         # 1.1 learning objectives items
         set linear_item_list [db_list item_in_imsld_loi {
@@ -512,6 +513,16 @@
             and ast.component_id = :component_item_id
         }]]
 
+        # 1.8. feedbak (learning activities)
+        set linear_item_list [concat $linear_item_list [db_list item_in_la_feedback {
+            select ii.imsld_item_id
+            from acs_rels ar, imsld_itemsi ii, imsld_learning_activitiesi la
+            where ar.object_id_one = la.on_completion_id
+            and ar.object_id_two = ii.item_id
+            and ar.rel_type = 'imsld_feedback_rel'
+            and la.component_id = :component_item_id
+        }]]
+
         foreach imsld_item_id $linear_item_list {
             db_foreach nested_associated_items {
                 select ii.imsld_item_id, ii.item_id,
Index: openacs-4/packages/imsld/tcl/imsld-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.tcl,v
diff -u -r1.95.2.2 -r1.95.2.3
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl	4 Jun 2007 14:00:04 -0000	1.95.2.2
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl	26 Jun 2007 15:57:31 -0000	1.95.2.3
@@ -2496,7 +2496,7 @@
     $feedback_head_node appendChild $text
     $feedback_node appendChild $feedback_head_node
     if { [db_0or1row completed_activity { *SQL* }] } {
-        if { ![string eq "" $on_completion_item_id] } {
+        if { ![string eq "" $on_completion_item_id] && [db_0or1row is_feedback { *SQL* }] } {
             # the feedback is not processed to ckeck if all the activity resources have been finished
             # so we don't need to store the result
             imsld::process_feedback_as_ul -on_completion_item_id $on_completion_item_id \
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 -r1.37.4.1
--- openacs-4/packages/imsld/tcl/imsld-procs.xql	25 Apr 2007 10:52:30 -0000	1.37
+++ openacs-4/packages/imsld/tcl/imsld-procs.xql	26 Jun 2007 15:57:31 -0000	1.37.4.1
@@ -1602,7 +1602,8 @@
         la.learning_objective_id as learning_objective_item_id,
         la.activity_id,
         la.title as activity_title
-        from imsld_learning_activitiesi la, imsld_attribute_instances attr
+        from imsld_attribute_instances attr,
+        imsld_learning_activitiesi la
         where la.item_id = :activity_item_id
         and content_revision__is_live(la.activity_id) = 't'
         and attr.owner_id = la.activity_id
@@ -1668,6 +1669,14 @@
    		</querytext>
 	</fullquery>
 
+	<fullquery name="imsld::process_learning_activity_as_ul.is_feedback">
+		<querytext>
+    
+	select 1 from acs_rels where object_id_one = :on_completion_item_id and rel_type = 'imsld_feedback_rel'
+
+   		</querytext>
+	</fullquery>
+
 	<fullquery name="imsld::process_learning_activity_as_ul.la_associated_environments">
 		<querytext>