Index: openacs-4/contrib/packages/project-manager/www/tasks.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.tcl,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/contrib/packages/project-manager/www/tasks.tcl 10 Jan 2004 01:04:02 -0000 1.1.2.4 +++ openacs-4/contrib/packages/project-manager/www/tasks.tcl 4 Feb 2004 20:17:19 -0000 1.1.2.5 @@ -62,6 +62,7 @@ label "\#" link_url_col item_url link_html { title "View this project version" } + display_template {@tasks.task_id@} } title { label "Subject" @@ -73,9 +74,15 @@ description { label "Description" } - end_date { - label "Deadline" + slack_time { + label "Slack time" } + latest_start_pretty { + label "Latest Start" + } + latest_finish_pretty { + label "Latest Finish" + } actual_hours_worked { label "Hours completed" display_template "@tasks.actual_hours_worked@/@tasks.estimated_hours_work@" @@ -93,13 +100,10 @@ -filters { searchterm { label "Search" - where_clause { - t.title ilike '%:searchterm%' - } } party_id { label "People" - values {[db_list_of_lists get_people "select first_names || ' ' || last_name, u.party_id from all_users u, pm_task_assignment a where u.party_id = a.party_id order by upper(first_names), upper(last_name)"]} + values {[db_list_of_lists get_people "select distinct(first_names || ' ' || last_name) as fullname, u.person_id from persons u, pm_task_assignment a where u.person_id = a.party_id order by fullname"]} where_clause { t.party_id = :party_id } @@ -126,9 +130,24 @@ } -db_multirow -extend { item_url } tasks tasks { +db_multirow -extend { item_url latest_start_pretty latest_finish_pretty slack_time} tasks tasks { } { set item_url [export_vars -base "task-one" {task_id}] + + set latest_start_pretty [lc_time_fmt $latest_start "%x"] + set latest_finish_pretty [lc_time_fmt $latest_finish "%x"] + + if {[exists_and_not_null earliest_start_j]} { + if {$earliest_start_j < $today_j} { + set slack_time "[expr $latest_start_j - $today_j] days" + } else { + set slack_time "[expr $latest_start_j - $earliest_start_j] days" + } + } else { + set slack_time "n/a" + } + + }