Index: openacs-4/packages/lorsm/www/delivery/bottom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/bottom.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/lorsm/www/delivery/bottom.tcl 16 Jan 2008 16:54:45 -0000 1.4 +++ openacs-4/packages/lorsm/www/delivery/bottom.tcl 17 Nov 2008 13:38:35 -0000 1.5 @@ -1,10 +1,10 @@ # packages/lorsm/www/delivery-bottom-bar/bottom.tcl ad_page_contract { - + } { - man_id:integer,notnull - {item_id:integer ""} + man_id:integer,notnull + {item_id:integer ""} } -properties { } -validate { } -errors { @@ -15,52 +15,67 @@ set community_id [dotlrn_community::get_community_id] set user_id [ad_conn user_id] -if {[lorsm::track::istrackable -course_id $man_id -package_id $package_id]} { - +if {[lorsm::track::istrackable \ + -course_id $man_id \ + -package_id $package_id]} { set track_id [lorsm::track::new \ - -user_id $user_id \ - -community_id $community_id \ - -course_id $man_id] + -user_id $user_id \ + -community_id $community_id \ + -course_id $man_id] } else { set track_id 0 } # return_url -set return_url [dotlrn_community::get_community_url [dotlrn_community::get_community_id]] +set return_url [dotlrn_community::get_community_url \ + [dotlrn_community::get_community_id]] set item_list [lorsm::get_item_list $man_id $user_id] -set last_item_viewed [db_string select_last_item_viewed { - select ims_item_id - from views_views v, - ims_cp_items i, - ims_cp_organizations o - where v.viewer_id = :user_id - and v.object_id = i.ims_item_id - and i.org_id = o.org_id - and o.man_id = :man_id - order by v.last_viewed desc - limit 1 -} -default "no_item"] +set last_item_viewed [db_string select_last_item_viewed { + select ims_item_id + from views_views v, ims_cp_items i, ims_cp_organizations o + where v.viewer_id = :user_id + and v.object_id = i.ims_item_id + and i.org_id = o.org_id + and o.man_id = :man_id + order by v.last_viewed desc + limit 1 + } -default "no_item"] set first_item_id [lindex $item_list 0] -set first_item_url "" +set first_item_url "" set curr_index [expr [lsearch -exact $item_list $last_item_viewed]] set prev_item_id [lindex $item_list [expr $curr_index - 1]] set next_item_id [lindex $item_list [expr $curr_index + 1]] -set prev_url "" -set next_url "" +set prev_url "" +set next_url "" + if { [string eq $last_item_viewed "no_item"] } { - # first time accessing the course - set next_url "" - set prev_url "" -} elseif { ![expr [llength $item_list] - $curr_index - 1] } { - # last item - set next_url "" + # first time accessing the course + set next_url "" + set prev_url "" +} elseif { ![expr [llength $item_list] - $curr_index - 1] } { + # last item + set next_url "" } elseif { ![expr $curr_index] } { - # first item - set prev_url "" + # first item + set prev_url "" } -