Index: openacs-4/packages/dotlrn-ecommerce/www/applications-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/applications-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn-ecommerce/www/applications-postgresql.xql 17 Oct 2006 23:19:00 -0000 1.1 +++ openacs-4/packages/dotlrn-ecommerce/www/applications-postgresql.xql 7 Dec 2006 05:27:06 -0000 1.2 @@ -60,7 +60,7 @@ - select person__name(r.user_id) as person_name, member_state, r.community_id, r.user_id as applicant_user_id, s.section_name, t.course_name, s.section_id, r.rel_id, e.phone, o.creation_user as patron_id, + select person__name(r.user_id) as person_name, member_state, r.community_id, r.user_id as applicant_user_id, s.section_name, t.course_name, s.section_id, r.rel_id, e.phone, o.creation_user as patron_id, m.completed_datetime, (select count(*) from (select * from dotlrn_member_rels_full rr, Index: openacs-4/packages/dotlrn-ecommerce/www/applications.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/applications.tcl,v diff -u -r1.52 -r1.53 --- openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 7 Dec 2006 04:50:09 -0000 1.52 +++ openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 7 Dec 2006 05:27:06 -0000 1.53 @@ -461,7 +461,8 @@ set csv_session_ids [list] -db_multirow -extend { approve_url reject_url asm_url section_edit_url person_url register_url comments comments_text_plain comments_truncate add_comment_url target calendar_id item_type_id num_sessions } applications applications [subst { }] { +db_multirow -extend { unique_id approve_url reject_url asm_url section_edit_url person_url register_url comments comments_text_plain comments_truncate add_comment_url target calendar_id item_type_id num_sessions } applications applications [subst { }] { + set unique_id "${applicant_user_id}-${section_id}" set list_type [ad_decode $member_state "needs approval" full "request approval" prereq "application sent" payment full] set approve_url [export_vars -base application-approve { community_id {user_id $applicant_user_id} {type $list_type} return_url }] @@ -525,7 +526,10 @@ if {$csv_p == 1} { set csv_cols {} - lappend csv_cols applicant_user_id section_id + lappend csv_cols unique_id applicant_user_id section_id completed_datetime + set csv_cols_labels(completed_datetime) "Application Date" + set csv_cols_labels(unique_id) "Unique_ID" + set csv_cols_labels(applicant_user_id) "User_ID" set csv_cols_labels(section_id) "Section_ID" set all_cols [list "section_name" "number" "person_name" "member_state" "phone" "comments_text_plain"]