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.23 -r1.24 --- openacs-4/packages/imsld/tcl/imsld-procs.tcl 1 Feb 2006 15:20:47 -0000 1.23 +++ openacs-4/packages/imsld/tcl/imsld-procs.tcl 2 Feb 2006 13:52:31 -0000 1.24 @@ -2062,12 +2062,22 @@ set activities "$activity_title
[join [lindex $activities_list 3] " "]" - set feedbacks "" if { [llength [lindex $activities_list 4]] } { set feedbacks "[lindex [lindex $activities_list 4] 0]
" append feedbacks "[join [lindex [lindex $activities_list 4] 1] " "]" } + + set resources_activities_list [imsld::process_learning_activity -activity_item_id $activity_item_id -resource_mode "t"] + foreach resource_activity [join $resources_activities_list] { + if {[db_0or1row is_assessment {} ] } { + db_1row get_as_site_node {} + set as_feedback_url "[site_node::get_url -node_id $node_id][export_vars -base sessions {assessment_id $assessment_id}]" + set as_feedback_link "\"$as_feedback_url\"" + append feedbacks $as_feedback_link + } + } + template::multirow append imsld_multirow $prerequisites \ $objectives \ $environments \ @@ -2542,9 +2552,14 @@ } #find all the resouces in the same activity - set resources_item_list [imsld::process_learning_activity -activity_item_id $activity_item_id -resource_mode "t"] -# lappend resources_item_list [imsld::process_environment -environment_item_id $activity_item_id -resource_mode "t"] - + set first_resources_item_list [imsld::process_learning_activity -activity_item_id $activity_item_id -resource_mode "t"] + +#only the learning_activities must be finished + set resources_item_list [lindex $first_resources_item_list 3] + if { [llength $resources_item_list] == 0 } { + set resources_item_list [lindex $first_resources_item_list 2] + } + set resource_list [list] foreach resource_item_id $resources_item_list { foreach res_id $resource_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.2 -r1.3 --- openacs-4/packages/imsld/tcl/imsld-procs.xql 1 Feb 2006 12:31:32 -0000 1.2 +++ openacs-4/packages/imsld/tcl/imsld-procs.xql 2 Feb 2006 13:52:31 -0000 1.3 @@ -1261,7 +1261,28 @@ + + + select acs_object_id as assessment_id + from imsld_cp_resourcesi + where type='imsqti_xmlv1p0' + and item_id=:resource_activity + + + + + + select sn.node_id as node_id + from acs_objects ao, + site_nodes sn + where ao.package_id=sn.object_id + and ao.object_id=:assessment_id; + + + + + select imsld_id