Index: openacs-4/packages/project-manager/tcl/calendar-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/calendar-procs.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/project-manager/tcl/calendar-procs.tcl 21 Jul 2005 21:15:17 -0000 1.4 +++ openacs-4/packages/project-manager/tcl/calendar-procs.tcl 21 Jul 2005 22:10:20 -0000 1.5 @@ -48,6 +48,7 @@ {-user_id:required} {-date ""} {-hide_closed_p "t"} + {-display_p ""} } { Creates a month widget for tasks } { @@ -59,6 +60,7 @@ set package_id [dotlrn_community::get_package_id_from_package_key -package_key project-manager -community_id [dotlrn_community::get_community_id]] + set base_url [ad_conn package_url]project-manager/ if { ![string eq [ad_conn package_id] [dotlrn::get_package_id]]} { set instance_clause "and o.package_id=:package_id" @@ -90,9 +92,11 @@ set last_task_id "" set last_latest_start_j "" set assignee_list [list] - - - db_foreach select_monthly_tasks {} { + set task_query_name "select_monthly_tasks" + if { [string eq $display_p d]} { + set task_query_name "select_monthly_tasks_by_deadline" + } + db_foreach $task_query_name {} { # highlight what you're assigned to. if {[string equal $person_id $user_id]} { @@ -134,7 +138,7 @@ } # begin setting up this calendar item - set day_details "

${detail_begin}$task_id
$title${detail_end}

$project_name
" + set day_details "

${detail_begin}$task_id
$title${detail_end}

$project_name
" # only add to the list if we want to see closed tasks append day_details "