Index: openacs-4/packages/imsld/lib/activity.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/imsld/lib/activity.tcl	4 Nov 2009 17:09:22 -0000	1.8
+++ openacs-4/packages/imsld/lib/activity.tcl	12 Jan 2010 21:45:50 -0000	1.9
@@ -16,181 +16,181 @@
 
 switch $type {
     learning {
-	# add the learning activity to the tree
+        # add the learning activity to the tree
 
-	db_1row get_learning_activity_info { *SQL* }
-	set started_activity_p [db_0or1row already_started {
-	    select 1 from imsld_status_user 
-	    where related_id = :activity_id 
-	    and user_id = :user_id 
-	    and run_id = :run_id
-	    and status = 'started'
-	}]
-	set completed_activity_p [db_0or1row already_completed {
-	    select 1 from imsld_status_user 
-	    where related_id = :activity_id 
-	    and user_id = :user_id 
-	    and run_id = :run_id
-	    and status = 'finished'
-	}]	
+        db_1row get_learning_activity_info { *SQL* }
+        set started_activity_p [db_0or1row already_started {
+            select 1 from imsld_status_user 
+            where related_id = :activity_id 
+            and user_id = :user_id 
+            and run_id = :run_id
+            and status = 'started'
+        }]
+        set completed_activity_p [db_0or1row already_completed {
+            select 1 from imsld_status_user 
+            where related_id = :activity_id 
+            and user_id = :user_id 
+            and run_id = :run_id
+            and status = 'finished'
+        }]  
 
-	set user_choice_p [db_string user_choice_p {
-	    select user_choice_p
-	    from imsld_complete_actsi
-	    where item_id = :complete_act_id
-	    and content_revision__is_live(complete_act_id) = 't'
-	} -default "f"]
+        set user_choice_p [db_string user_choice_p {
+            select user_choice_p
+            from imsld_complete_actsi
+            where item_id = :complete_act_id
+            and content_revision__is_live(complete_act_id) = 't'
+        } -default "f"]
 
-	set href [imsld::activity_url -activity_id $activity_id -run_id $run_id -user_id $user_id]
-	set div [imsld::activity_url -div -activity_id $activity_id -run_id $run_id -user_id $user_id]
+        set href [imsld::activity_url -activity_id $activity_id -run_id $run_id -user_id $user_id]
+        set div [imsld::activity_url -div -activity_id $activity_id -run_id $run_id -user_id $user_id]
 
-	if { $completed_activity_p 
-	     || ($structure_type eq "selection")
-	     || (!$completion_restriction)
-	     || ([lsearch -exact $next_activity_id_list $activity_id] != -1) 
-	     || ([string eq $complete_act_id ""] && [string eq $is_visible_p "t"] 
-		 && [lsearch -exact $active_acts_list $act_item_id] != -1) } {
+        if { $completed_activity_p 
+             || ($structure_type eq "selection")
+             || (!$completion_restriction)
+             || ([lsearch -exact $next_activity_id_list $activity_id] != -1) 
+             || ([string eq $complete_act_id ""] && [string eq $is_visible_p "t"] 
+                 && [lsearch -exact $active_acts_list $act_item_id] != -1) } {
 
-	    if { !$started_activity_p && [string eq $is_visible_p "t"] } {
-		# bold letters
-		set class "liOpen has_focus"
-		
-	    } else {
-		# the activity has been started
-		set class "liOpen"
+            if { !$started_activity_p && [string eq $is_visible_p "t"] } {
+                # bold letters
+                set class "liOpen has_focus"
+                
+            } else {
+                # the activity has been started
+                set class "liOpen"
 
-	    }
+            }
 
-	    set finish_href "finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-learning.imsld"
+            set finish_href "finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-learning.imsld"
 
-	}
+        }
     }
     support {
-	# add the support activity to the tree
-	db_1row get_support_activity_info { *SQL* }
-	set started_activity_p [db_0or1row already_started {
-	    select 1 from imsld_status_user 
-	    where related_id = :activity_id 
-	    and user_id = :user_id 
-	    and run_id = :run_id
-	    and status = 'started'
-	}]
-	set completed_activity_p [db_0or1row already_completed {
-	    select 1 from imsld_status_user 
-	    where related_id = :activity_id 
-	    and user_id = :user_id 
-	    and run_id = :run_id
-	    and status = 'finished'
-	}]
+        # add the support activity to the tree
+        db_1row get_support_activity_info { *SQL* }
+        set started_activity_p [db_0or1row already_started {
+            select 1 from imsld_status_user 
+            where related_id = :activity_id 
+            and user_id = :user_id 
+            and run_id = :run_id
+            and status = 'started'
+        }]
+        set completed_activity_p [db_0or1row already_completed {
+            select 1 from imsld_status_user 
+            where related_id = :activity_id 
+            and user_id = :user_id 
+            and run_id = :run_id
+            and status = 'finished'
+        }]
 
-	set user_choice_p [db_string user_choice_p {select user_choice_p from imsld_complete_actsi where item_id = :complete_act_id and content_revision__is_live(complete_act_id) = 't'} -default "f"]
+        set user_choice_p [db_string user_choice_p {select user_choice_p from imsld_complete_actsi where item_id = :complete_act_id and content_revision__is_live(complete_act_id) = 't'} -default "f"]
 
-	if { $completed_activity_p 
-	     || ($structure_type eq "selection")
-	     || (!$completion_restriction)
-	     || ([lsearch -exact $next_activity_id_list $activity_id] != -1)
-	     || ([string eq $complete_act_id ""] && [string eq $is_visible_p "t"]
-		 && [lsearch -exact $active_acts_list $act_item_id] != -1) } {
+        if { $completed_activity_p 
+             || ($structure_type eq "selection")
+             || (!$completion_restriction)
+             || ([lsearch -exact $next_activity_id_list $activity_id] != -1)
+             || ([string eq $complete_act_id ""] && [string eq $is_visible_p "t"]
+                 && [lsearch -exact $active_acts_list $act_item_id] != -1) } {
 
-	    if { !$started_activity_p && [string eq $is_visible_p "t"] } {
-		# bold letters
-		set href [imsld::activity_url -activity_id $activity_id -run_id $run_id -user_id $user_id]
-		set div [imsld::activity_url -div -activity_id $activity_id -run_id $run_id -user_id $user_id]
+            if { !$started_activity_p && [string eq $is_visible_p "t"] } {
+                # bold letters
+                set href [imsld::activity_url -activity_id $activity_id -run_id $run_id -user_id $user_id]
+                set div [imsld::activity_url -div -activity_id $activity_id -run_id $run_id -user_id $user_id]
 
-		set class "liOpen has_focus"
-	    } else {
-		set href [imsld::activity_url -activity_id $activity_id -run_id $run_id -user_id $user_id]
-		set div [imsld::activity_url -div -activity_id $activity_id -run_id $run_id -user_id $user_id]
+                set class "liOpen has_focus"
+            } else {
+                set href [imsld::activity_url -activity_id $activity_id -run_id $run_id -user_id $user_id]
+                set div [imsld::activity_url -div -activity_id $activity_id -run_id $run_id -user_id $user_id]
 
-		set class "liOpen"
-	    }
+                set class "liOpen"
+            }
 
-	    set finish_href "finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-support.imsld"
+            set finish_href "finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-support.imsld"
 
-	}
+        }
     }
     structure {
-	# this is a special case since there are some conditions to check
-	# in order to determine if the referenced activities have to be shown.
-	# because of that the proc generate_structure_activities_list is called,
-	# which returns a tcl list in tDOM format.
-	
-	# anyway, we add the structure to the tree only if:
-	# 1. the structure has already been started or finished
-	# 2. the referencer structure-type is "selection"
-	# (if it is the next activity to be done then it should had been marked as started 
-	#  in the "structure_next_activity" function. which is the case when structure-type is "sequence")
-	db_1row get_activity_structure_info { *SQL* }
-	set started_p [db_0or1row as_started_p { *SQL* }]
-	set completed_p [db_0or1row as_completed_p { *SQL* }]
-	set completion_restriction [imsld::structure_completion_resctriction_p -run_id $run_id -structure_item_id $structure_item_id]
+        # this is a special case since there are some conditions to check
+        # in order to determine if the referenced activities have to be shown.
+        # because of that the proc generate_structure_activities_list is called,
+        # which returns a tcl list in tDOM format.
+        
+        # anyway, we add the structure to the tree only if:
+        # 1. the structure has already been started or finished
+        # 2. the referencer structure-type is "selection"
+        # (if it is the next activity to be done then it should had been marked as started 
+        #  in the "structure_next_activity" function. which is the case when structure-type is "sequence")
+        db_1row get_activity_structure_info { *SQL* }
+        set started_p [db_0or1row as_started_p { *SQL* }]
+        set completed_p [db_0or1row as_completed_p { *SQL* }]
+        set completion_restriction [imsld::structure_completion_resctriction_p -run_id $run_id -structure_item_id $structure_item_id]
 
-	if { $started_p } {
-	    if { $completed_p } {
-		set href [imsld::activity_url -activity_id $structure_id -run_id $run_id -user_id $user_id]
-		set div [imsld::activity_url -div -activity_id $activity_id -run_id $run_id -user_id $user_id]
+        if { $started_p } {
+            if { $completed_p } {
+                set href [imsld::activity_url -activity_id $structure_id -run_id $run_id -user_id $user_id]
+                set div [imsld::activity_url -div -activity_id $activity_id -run_id $run_id -user_id $user_id]
 
-		set class "liOpen"
-	    } else {
-		set href [imsld::activity_url -activity_id $structure_id -run_id $run_id -user_id $user_id]
-		set div [imsld::activity_url -div -activity_id $activity_id -run_id $run_id -user_id $user_id]
+                set class "liOpen"
+            } else {
+                set href [imsld::activity_url -activity_id $structure_id -run_id $run_id -user_id $user_id]
+                set div [imsld::activity_url -div -activity_id $activity_id -run_id $run_id -user_id $user_id]
 
-		set class "liOpen has_focus"
-	    }
+                set class "liOpen has_focus"
+            }
 
-	    multirow create referenced_activities object_id_two rel_type rel_id sort_order activity_type activity_id
+            multirow create referenced_activities object_id_two rel_type rel_id sort_order activity_type activity_id
 
-	    db_foreach struct_referenced_activities { *SQL* } {
+            db_foreach struct_referenced_activities { *SQL* } {
 
-		set activity_id [content::item::get_live_revision -item_id $object_id_two]
+                set activity_id [content::item::get_live_revision -item_id $object_id_two]
 
-		set completed_activity_p [db_0or1row already_completed {
-		    select 1 from imsld_status_user 
-		    where related_id = :activity_id 
-		    and user_id = :user_id 
-		    and run_id = :run_id
-		    and status = 'finished'
-		}]
+                set completed_activity_p [db_0or1row already_completed {
+                    select 1 from imsld_status_user 
+                    where related_id = :activity_id 
+                    and user_id = :user_id 
+                    and run_id = :run_id
+                    and status = 'finished'
+                }]
 
-		if { $activity_type ne "structure" } {
-		    set visible_p [db_string get_visible {
-			select attr.is_visible_p
-			from imsld_attribute_instances attr
-			where attr.owner_id = :activity_id
-			and attr.run_id = :run_id
-			and attr.user_id = :user_id
-			and attr.type = 'isvisible'
-		    } -default "t"]
-		} else {
-		    set visible_p t
-		}
+                if { $activity_type ne "structure" } {
+                    set visible_p [db_string get_visible {
+                        select attr.is_visible_p
+                        from imsld_attribute_instances attr
+                        where attr.owner_id = :activity_id
+                        and attr.run_id = :run_id
+                        and attr.user_id = :user_id
+                        and attr.type = 'isvisible'
+                    } -default "t"]
+                } else {
+                    set visible_p t
+                }
 
-		set complete_act_id ""
-		if { $activity_type eq "learning" } {
-		    set complete_act_id [db_string completion_restriction {
-			select complete_act_id 
-			from imsld_learning_activities
-			where activity_id = :activity_id
-		    } -default ""]		    
-		} elseif { $activity_type eq "support" } {
-		    set complete_act_id [db_string completion_restriction {
-			select complete_act_id 
-			from imsld_support_activities
-			where activity_id = :activity_id
-		    } -default ""]		    
-		}
+                set complete_act_id ""
+                if { $activity_type eq "learning" } {
+                    set complete_act_id [db_string completion_restriction {
+                        select complete_act_id 
+                        from imsld_learning_activities
+                        where activity_id = :activity_id
+                    } -default ""]          
+                } elseif { $activity_type eq "support" } {
+                    set complete_act_id [db_string completion_restriction {
+                        select complete_act_id 
+                        from imsld_support_activities
+                        where activity_id = :activity_id
+                    } -default ""]          
+                }
 
-		if { $visible_p && (($structure_type eq "selection")
-				    || ([lsearch -exact $next_activity_id_list $activity_id] != -1)
-				    || !$completion_restriction
-				    || $completed_activity_p
-				    || $complete_act_id eq "" )
-		     || !$completion_restriction} {
-		    multirow append referenced_activities $object_id_two $rel_type $rel_id $sort_order $activity_type $activity_id
-		}
-		
-	    }
+                if { $visible_p && (($structure_type eq "selection")
+                                    || ([lsearch -exact $next_activity_id_list $activity_id] != -1)
+                                    || !$completion_restriction
+                                    || $completed_activity_p
+                                    || $complete_act_id eq "" )
+                     || !$completion_restriction} {
+                    multirow append referenced_activities $object_id_two $rel_type $rel_id $sort_order $activity_type $activity_id
+                }
+                
+            }
 
-	}
+        }
     }
 }