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.18 -r1.19
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl	30 Jan 2006 12:00:46 -0000	1.18
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl	30 Jan 2006 19:31:05 -0000	1.19
@@ -68,15 +68,15 @@
         select icm.manifest_id,
         ii.imsld_id,
         im.method_id, 
-        tl.time_in_seconds,
+        ca.time_in_seconds,
         icm.creation_date
         from imsld_cp_manifestsi icm, imsld_cp_organizationsi ico, 
-        imsld_imsldsi ii, imsld_methodsi im, imsld_time_limitsi tl
+        imsld_imsldsi ii, imsld_methodsi im, imsld_complete_actsi ca
         where im.imsld_id = ii.item_id
         and ii.organization_id = ico.item_id
         and ico.manifest_id = icm.item_id
-        and im.time_limit_id is not null
-        and im.time_limit_id = tl.item_id
+        and im.complete_act_id = ca.item_id
+        and ca.time_in_secontds is not null
         and content_revision__is_live(im.method_id) = 't'
     }] {
         set manifest_id [lindex $referenced_method 0]
@@ -107,17 +107,17 @@
         select icm.manifest_id,
         ii.imsld_id,
         ip.play_id,
-        tl.time_in_seconds,
+        ca.time_in_seconds,
         icm.creation_date
         from imsld_cp_manifestsi icm, imsld_cp_organizationsi ico, 
         imsld_imsldsi ii, imsld_methodsi im, imsld_plays ip,
-        imsld_time_limitsi tl
+        imsld_complete_actsi ca
         where ip.method_id = im.item_id
         and im.imsld_id = ii.item_id
         and ii.organization_id = ico.item_id
         and ico.manifest_id = icm.item_id
-        and ip.time_limit_id is not null
-        and ip.time_limit_id = tl.item_id
+        and ip.complete_act_id = ca.item_id
+        and ca.time_in_seconds is not null
         and content_revision__is_live(ip.play_id) = 't'
     }] {
         set manifest_id [lindex $referenced_play 0]
@@ -149,18 +149,18 @@
         ii.imsld_id,
         ip.play_id,
         ia.act_id,
-        tl.time_in_seconds,
+        ca.time_in_seconds,
         icm.creation_date
         from imsld_cp_manifestsi icm, imsld_cp_organizationsi ico, 
         imsld_imsldsi ii, imsld_methodsi im, imsld_playsi ip, imsld_acts ia,
-        imsld_time_limitsi tl
+        imsld_complete_actsi ca
         where ia.play_id = ip.item_id
         and ip.method_id = im.item_id
         and im.imsld_id = ii.item_id
         and ii.organization_id = ico.item_id
         and ico.manifest_id = icm.item_id
-        and ia.time_limit_id is not null
-        and ia.time_limit_id = tl.item_id
+        and ia.complete_act_id = tl.item_id
+        and ca.time_in_seconds is not null
         and content_revision__is_live(ia.act_id) = 't'
     }] {
         set manifest_id [lindex $referenced_act 0]
@@ -197,21 +197,21 @@
         ip.play_id,
         ia.act_id,
         irp.role_part_id,
-        tl.time_in_seconds,
+        ca.time_in_seconds,
         icm.creation_date
         from imsld_cp_manifestsi icm, imsld_cp_organizationsi ico, 
         imsld_imsldsi ii, imsld_methodsi im, imsld_playsi ip, 
         imsld_actsi ia, imsld_role_partsi irp, imsld_support_activitiesi sa,
-        imsld_time_limitsi tl
+        imsld_complete_actsi ca
         where sa.item_id = irp.support_activity_id
         and irp.act_id = ia.item_id
         and ia.play_id = ip.item_id
         and ip.method_id = im.item_id
         and im.imsld_id = ii.item_id
         and ii.organization_id = ico.item_id
         and ico.manifest_id = icm.item_id
-        and sa.time_limit_id is not null
-        and sa.time_limit_id = tl.item_id
+        and sa.complete_act_id = tl.item_id
+        and ca.time_in_seconds is not null
         and content_revision__is_live(sa.activity_id) = 't'
     }] {
         set manifest_id [lindex $referenced_sa 0] 
@@ -253,21 +253,21 @@
         ip.play_id,
         ia.act_id,
         irp.role_part_id,
-        tl.time_in_seconds,
+        ca.time_in_seconds,
         icm.creation_date
         from imsld_cp_manifestsi icm, imsld_cp_organizationsi ico, 
         imsld_imsldsi ii, imsld_methodsi im, imsld_playsi ip, 
         imsld_actsi ia, imsld_role_partsi irp, imsld_learning_activitiesi la,
-        imsld_time_limitsi tl
+        imsld_complete_actsi ca
         where la.item_id = irp.learning_activity_id
         and irp.act_id = ia.item_id
         and ia.play_id = ip.item_id
         and ip.method_id = im.item_id
         and im.imsld_id = ii.item_id
         and ii.organization_id = ico.item_id
         and ico.manifest_id = icm.item_id
-        and la.time_limit_id is not null
-        and la.time_limit_id = tl.item_id
+        and la.complete_act_id = tl.item_id
+        and ca.time_in_seconds is not null
         and content_revision__is_live(la.activity_id) = 't'
     }] {
         set manifest_id [lindex $referenced_la 0] 
@@ -762,16 +762,17 @@
             ip.item_id as play_item_id,
             ia.act_id,
             ia.item_id as act_item_id,
-            ip.when_last_act_completed_p,
+            ica.when_last_act_completed_p,
             im.method_id,
             im.item_id as method_item_id
-            from imsld_imsldsi ii, imsld_methodsi im, imsld_playsi ip, imsld_actsi ia, imsld_role_parts irp
+            from imsld_imsldsi ii, imsld_actsi ia, imsld_role_parts irp, 
+               imsld_methodsi im, imsld_playsi ip left outer join imsld_complete_actsi ica on (ip.complete_act_id = ica.item_id)
             where irp.role_part_id = :role_part_id
             and irp.act_id = ia.item_id
             and ia.play_id = ip.item_id
             and ip.method_id = im.item_id
             and im.imsld_id = ii.item_id
-            and content_revision__is_live(ii.imsld_id) = 't'
+            and content_revision__is_live(ii.imsld_id) = 't';
         }
 
         set completed_act_p 1 
@@ -1173,7 +1174,7 @@
             }
         }
         default {
-            return "not_implemented_yet"
+            return "not_implemented_yet ($service_type)"
         }
     }
     if {[string eq "t" $resource_mode]} {
@@ -1855,7 +1856,7 @@
             set environments_list [imsld::process_environment -environment_item_id $environment_item_id]
         }
     }
-    return [list $environments_list]
+    return $environments_list
 }
 
 ad_proc -public imsld::next_activity { 
@@ -2040,12 +2041,15 @@
                         from imsld_activity_structuresi
                         where structure_id = :completed_id
                     }
-                    set structure_list [imsld::process_activity_structure -structure_item_id $structure_item_id]
-                    if { [llength [lindex $structure_list 0]] } {
-                        set environments "[lindex [lindex $structure_list 0] 0] <br/>"
-                        append environments "[join [lindex [lindex $structure_list 0] 1] " "] "
-                        append environments "[join [lindex [lindex $structure_list 0] 2] " "] "
-                        append environments "[join [lindex [lindex $structure_list 0] 3] " "]"
+                    set structure_envs [imsld::process_activity_structure -structure_item_id $structure_item_id]
+                    set environments ""
+                    foreach structure_list $structure_envs {
+                        if { [llength [lindex $structure_list 0]] } {
+                            append environments "[lindex $structure_list 0] <br/>"
+                            append environments "[join [lindex $structure_list 1] " "] "
+                            append environments "[join [lindex $structure_list 2] " "] "
+                            append environments "[join [lindex $structure_list 3] " "]<br/>"
+                        }
                     }
                     template::multirow append imsld_multirow {} {} $environments $activity_title {} finished
                 }
@@ -2168,11 +2172,14 @@
             set environment_list [lindex $activity_list 2]
         }
     }
+    set environments ""
     if { [llength $environment_list] } {
-        set environments "[lindex $environment_list 0] <br/>"
-        append environments "[join [lindex $environment_list 1] " "] "
-        append environments "[join [lindex $environment_list 2] " "] "
-        append environments "[join [lindex $environment_list 3] " "]"
+        foreach environment $environment_list {
+            append environments "[lindex $environment 0] <br/>"
+            append environments "[join [lindex $environment 1] " "] "
+            append environments "[join [lindex $environment 2] " "] "
+            append environments "[join [lindex $environment 3] " "]<br/>"
+        }
     }
     
     # learning activity
@@ -2181,8 +2188,7 @@
             select la.activity_id,
             la.item_id as activity_item_id,
             la.title as activity_title,
-            la.identifier,
-            la.user_choice_p
+            la.identifier
             from imsld_learning_activitiesi la
             where la.activity_id = :activity_id
         }
@@ -2205,10 +2211,6 @@
         }
         set files ""
         set activities "$activity_title <br /> [join [lindex $activities_list 3] " "]"
-#         if { [llength [lindex $activities_list 3]] } {
-#             set files "[join [lindex $activities_list 3] "<br />"]"
-#             regsub -all {<li>[ ]*</li>} $files "" files
-#         }
 
         template::multirow append imsld_multirow $prerequisites \
             $objectives \
@@ -2224,8 +2226,7 @@
             select sa.activity_id,
             sa.item_id as activity_item_id,
             sa.title as activity_title,
-            sa.identifier,
-            sa.user_choice_p
+            sa.identifier
             from imsld_support_activitiesi sa
             where sa.activity_id = :activity_id
         }