Index: openacs-4/contrib/packages/project-manager/www/one-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one-postgresql.xql,v diff -u -r1.23.2.2 -r1.23.2.3 --- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 2 Jul 2004 23:13:49 -0000 1.23.2.2 +++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 15 Jul 2004 22:13:10 -0000 1.23.2.3 @@ -56,7 +56,9 @@ t.estimated_hours_work, t.estimated_hours_work_min, t.estimated_hours_work_max, - t.actual_hours_worked + t.actual_hours_worked, + s.status_type, + s.description as status_description FROM (select * from pm_tasks_revisionsx LEFT JOIN @@ -76,8 +78,7 @@ t.parent_id = :project_item_id and t.revision_id = i.live_revision and t.item_id = ti.task_id and - ti.status = s.status_id and - s.status_type = :status_type + ti.status = s.status_id [template::list::orderby_clause -name tasks -orderby] Index: openacs-4/contrib/packages/project-manager/www/one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.adp,v diff -u -r1.31.2.2 -r1.31.2.3 --- openacs-4/contrib/packages/project-manager/www/one.adp 2 Jul 2004 23:13:49 -0000 1.31.2.2 +++ openacs-4/contrib/packages/project-manager/www/one.adp 15 Jul 2004 22:13:10 -0000 1.31.2.3 @@ -265,9 +265,6 @@ - - - Index: openacs-4/contrib/packages/project-manager/www/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v diff -u -r1.30.2.3 -r1.30.2.4 --- openacs-4/contrib/packages/project-manager/www/one.tcl 2 Jul 2004 23:13:49 -0000 1.30.2.3 +++ openacs-4/contrib/packages/project-manager/www/one.tcl 15 Jul 2004 22:13:10 -0000 1.30.2.4 @@ -28,7 +28,6 @@ project_id:integer,optional {orderby_subproject ""} {orderby_tasks ""} - {status_type "o"} {logger_variable_id:integer ""} {logger_days:integer "30"} @@ -76,11 +75,6 @@ -project_item_id $project_item_id] } } - status_type_exists { - if {![string equal $status_type "o"] && ![string equal $status_type "c"]} { - set status_type "o" - } - } logger_days_positive { if {$logger_days < 1} { set logger_days 1 @@ -195,12 +189,6 @@ # Tasks, using list-builder --------------------------------- -if {$use_uncertain_completion_times_p} { - set work_display_template "@tasks.estimated_hours_work_min@ - @tasks.estimated_hours_work_max@ h" -} else { - set work_display_template "@tasks.estimated_hours_work@ h" -} - set process_link "process-use?project_item_id=$project_item_id" template::list::create \ @@ -213,10 +201,7 @@ } title { label "Subject" - display_col title - display_template { - @tasks.title@ - } + display_template "@tasks.title@@tasks.title@ -- closed" } parent_task_id { label "Dep" @@ -266,11 +251,6 @@ narrow } \ -filters { - status_type { - label "Status" - values {{"Open" "o"} {"Closed" "c"}} - where_clause {s.status_type = :status_type} - } project_item_id { hide_p 1 } @@ -309,9 +289,7 @@ default_direction asc } } \ - -orderby_name orderby_tasks \ - -html { - } + -orderby_name orderby_tasks db_multirow -extend { item_url earliest_start_pretty earliest_finish_pretty latest_start_pretty latest_finish_pretty slack_time} tasks project_tasks_query { Index: openacs-4/contrib/packages/project-manager/www/style.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/style.css,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/contrib/packages/project-manager/www/style.css 12 Mar 2004 13:44:45 -0000 1.9 +++ openacs-4/contrib/packages/project-manager/www/style.css 15 Jul 2004 22:13:10 -0000 1.9.2.1 @@ -1 +1,3 @@ +TD.highlighted { + background-color:ccccff; +}