Index: openacs-4/packages/dotlrn-ecommerce/www/admin/course-info.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/course-info.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn-ecommerce/www/admin/course-info.tcl 4 Jun 2005 10:05:18 -0000 1.2 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/course-info.tcl 19 Jun 2005 06:05:07 -0000 1.3 @@ -19,17 +19,17 @@ # TODO DaveB is there a Tcl proc for course info? if { [string equal $index ""] } { - set context [list [list "course-list" "[_ dotlrn-catalog.course_list]"] "[_ dotlrn-catalog.one_course_info]"] + set context [list [list "course-list" "Course List"] "$course_name"] } else { - set context [list [list "../course-info?course_id=$course_id" "[_ dotlrn-catalog.one_course_info]"] "$course_name [_ dotlrn-catalog.course_info]"] + set context [list [list "../course-info?course_id=$course_id" "[_ dotlrn-catalog.one_course_info]"] "$course_name"] set return_url "${return_url}&index=yes" } # Check permission over course_id permission::require_permission -object_id $course_id -privilege "admin" db_1row get_course_info { } -set page_title "$course_key" +set page_title "$course_name" set asm_name [db_string get_asm_name { } -default "[_ dotlrn-catalog.not_associated]"] set item_id [dotlrn_catalog::get_item_id -revision_id $course_id] @@ -162,6 +162,7 @@ @com_list.pretty_name@ + } } } @@ -172,7 +173,7 @@ set community_url "" -db_multirow -extend {community_url calendar_url num_sessions attendees available_slots} section_list section_list { +db_multirow -extend {community_url calendar_url num_sessions attendees available_slots sessions} section_list section_list { select s.section_id, s.section_name, s.product_id, s.community_id, v.maxparticipants from dotlrn_ecommerce_section s, dotlrn_catalogi c, ec_custom_product_field_values v where s.course_id = c.item_id @@ -204,6 +205,8 @@ if { ! [empty_string_p $maxparticipants] } { set available_slots [expr $maxparticipants - $attendees] } + + set sessions [util_memoize [list dotlrn_ecommerce::section::sessions $calendar_id]] } template::list::create \ @@ -215,54 +218,27 @@ name { label "Name" display_template { - @section_list.section_name@ + @section_list.section_name@ } } - community { - label "Community" + dates { + label "Dates" display_template { - User-Admin + @section_list.sessions;noquote@ } } - product { - label "Product" - display_template { - Product - } - } registration { label "Registration" display_template { Registrants
@section_list.attendees@ participants,
@section_list.available_slots@ available
} } - num_sessions { - label "Sessions" - display_template { - @section_list.num_sessions@ Sessions Scheduled.
Add Session - } - } - attendance { - label "Attendance" - display_template { - Attendance
- Related Users
- } - } - expenses { - label "Expenses" - display_template { - Expenses - } - } members { label "Purchases" html { align center } display_template { - - Individual
- Group + Process Purchase } } actions {