Index: openacs-4/packages/expenses/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/expenses/www/admin/index.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/expenses/www/admin/index.tcl 19 Jun 2005 06:05:08 -0000 1.4 +++ openacs-4/packages/expenses/www/admin/index.tcl 24 Jun 2005 13:05:39 -0000 1.5 @@ -1,6 +1,6 @@ ad_page_contract { - List line expenses for a given class + List line expenses for all courses @author Hamilton Chua (hamilton.chua@gmail.com) @creation-date 2005-05-14 @@ -21,6 +21,7 @@ -name expenses \ -multirow expenses \ -key exp_id \ + -no_data "No expense have been recorded yet." \ -actions { "Export All Non-Transferred and MARK ALL Transfered" "export-confirm?all=1&mark=1" "Export All Expenses" "Export All but DO NOT MARK Transferred" "export-confirm?all=1&mark=0" "Export Expenses" @@ -54,20 +55,25 @@ expense_codes { label "Expense Codes" } + terms { + label "Term" + } } -orderby { exp_date { orderby exp_date } exp_amount { orderby exp_amount } + term { orderby term } } # build the multirow set orderby_clause "[template::list::orderby_clause -name expenses -orderby]" -db_multirow -extend {course expense_codes} expenses get_expenses { } { +db_multirow -extend {course expense_codes terms } expenses get_expenses { } { # retrieve course/section for this expense if { [db_0or1row "section_info" "select section_name, course_id from dotlrn_ecommerce_section where community_id =:community_id"] } { set course_name [db_string "getcoursename" "select course_name from dotlrn_catalog where course_id = (select latest_revision from cr_items where item_id =:course_id)"] set course "$course_name/$section_name" set expense_codes [expenses::list_expense_codes -id $exp_id] + set terms [expenses::list_terms -id $exp_id] } } \ No newline at end of file