Index: openacs-4/packages/logger/lib/entries.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/logger/lib/entries.tcl 4 Jan 2004 21:27:48 -0000 1.1 +++ openacs-4/packages/logger/lib/entries.tcl 5 Jan 2004 20:54:25 -0000 1.2 @@ -27,6 +27,19 @@ set weekdayno [clock format [clock seconds] -format %w] set monthdayno [string trimleft [clock format [clock seconds] -format %d] 0] +# Projections +set projection_values [list] +if { [exists_and_not_null project_id] } { + db_foreach select_projections {} -column_array row { + lappend projection_values \ + [list $row(name) [list [list projection_id $row(projection_id)] \ + [list time_stamp:multiple [list $row(start_date_ansi) $row(end_date_ansi)]]]] + } +} + +ds_comment $projection_values + + # Define the list list::create \ @@ -113,6 +126,11 @@ add_url_eval {[ad_decode [exists_and_not_null project_id] 1 [export_vars -base "log" { project_id { variable_id $__filter_value } }] ""]} has_default_p t } + projection_id { + label "Projections" + type multivar + values $projection_values + } user_id { label "Users" values {[db_list_of_lists select_users {}]} Index: openacs-4/packages/logger/lib/entries.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/logger/lib/entries.xql 4 Jan 2004 21:27:48 -0000 1.1 +++ openacs-4/packages/logger/lib/entries.xql 5 Jan 2004 20:54:25 -0000 1.2 @@ -68,13 +68,13 @@ - select lpe.projection_id as unique_id, - lpe.name, - to_char(lpe.start_time, 'YYYY-MM-DD') as start_date, - to_char(lpe.end_time, 'YYYY-MM-DD') as end_date - from logger_projections lpe - where lpe.project_id = :selected_project_id - and lpe.variable_id = :selected_variable_id + select p.projection_id, + p.name, + to_char(p.start_time, 'YYYY-MM-DD') as start_date_ansi, + to_char(p.end_time, 'YYYY-MM-DD') as end_date_ansi + from logger_projections p + where p.project_id = :project_id + order by p.start_time, p.end_time, lower(p.name) Index: openacs-4/packages/logger/tcl/package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/package-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/logger/tcl/package-procs.tcl 1 May 2003 14:14:33 -0000 1.4 +++ openacs-4/packages/logger/tcl/package-procs.tcl 5 Jan 2004 20:54:25 -0000 1.5 @@ -37,7 +37,7 @@ } ad_proc -public logger::package::all_projects_in_package { - {-package_id:required} + {-package_id:required} } { Return a list of ids for all logger projects mapped to the given package.x Index: openacs-4/packages/logger/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/index.adp,v diff -u -r1.14 -r1.15 --- openacs-4/packages/logger/www/index.adp 5 Jan 2004 20:23:50 -0000 1.14 +++ openacs-4/packages/logger/www/index.adp 5 Jan 2004 20:54:25 -0000 1.15 @@ -9,6 +9,7 @@ &="time_stamp" &="start_date" &="end_date" + &="projection_id" &="groupby" &="orderby" &="format" Index: openacs-4/packages/logger/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/index.tcl,v diff -u -r1.18 -r1.19 --- openacs-4/packages/logger/www/index.tcl 4 Jan 2004 21:27:48 -0000 1.18 +++ openacs-4/packages/logger/www/index.tcl 5 Jan 2004 20:54:25 -0000 1.19 @@ -13,6 +13,7 @@ {time_stamp:multiple,optional {[clock format [clock scan "-[clock format [clock seconds] -format %w] days"] -format "%Y-%m-%d"] [clock format [clock scan "[expr 6-[clock format [clock seconds] -format %w]] days"] -format "%Y-%m-%d"]}} groupby:optional orderby:optional + projection_id:optional {format "normal"} page:integer,optional } -validate { @@ -39,3 +40,10 @@ } set instance_name [ad_conn instance_name] + +if { ![exists_and_not_null project_id] } { + set package_projects [logger::package::all_projects_in_package -package_id [ad_conn package_id]] + if { [llength $package_projects] == 1 } { + set project_id $package_projects + } +}