Index: openacs-4/packages/project-manager/lib/tasks-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks-postgresql.xql,v diff -u -r1.23 -r1.24 --- openacs-4/packages/project-manager/lib/tasks-postgresql.xql 10 May 2006 19:40:52 -0000 1.23 +++ openacs-4/packages/project-manager/lib/tasks-postgresql.xql 29 May 2006 17:36:02 -0000 1.24 @@ -131,7 +131,7 @@ and cp.live_revision = o.object_id [template::list::filter_where_clauses -and -name tasks] group by t.item_id, t.title, t.description, status, t.end_date, - t.latest_finish, t.latest_start, t.earliest_start, t.priority + t.latest_finish, t.latest_start, t.earliest_start, t.priority, t.estimated_hours_work_max [template::list::orderby_clause -name tasks -orderby] Index: openacs-4/packages/project-manager/lib/tasks.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks.tcl,v diff -u -r1.55 -r1.56 --- openacs-4/packages/project-manager/lib/tasks.tcl 22 May 2006 06:16:44 -0000 1.55 +++ openacs-4/packages/project-manager/lib/tasks.tcl 29 May 2006 17:36:02 -0000 1.56 @@ -227,6 +227,10 @@ label "[_ project-manager.Project_1]" \ where_clause "$project_item_where_clause" ] \ + page_size [list \ + label "[_ project-manager.Page_Size]" \ + values {10 20 30 50 100 500} + ] \ project_item_id [list \ label "[_ project-manager.Project_1]" \ where_clause "$project_item_where_clause" @@ -347,6 +351,11 @@ orderby_desc "end_date desc, task_item_id desc" default_direction asc } \ + estimated_hours_work_max { + orderby_asc "estimated_hours_work_max, task_item_id asc" + orderby_desc "estimated_hours_work_max desc, task_item_id desc" + default_direction desc + } \ ] } else { set order_by_list [list] Index: openacs-4/packages/project-manager/www/tasks.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/tasks.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/project-manager/www/tasks.adp 10 Nov 2005 17:47:07 -0000 1.9 +++ openacs-4/packages/project-manager/www/tasks.adp 29 May 2006 17:36:02 -0000 1.10 @@ -24,7 +24,7 @@ page_num="@page_num@" base_url="@base_url@" searchterm="@searchterm@" - orderby="@orderby@" + orderby_tasks="@orderby_tasks@" role_id="@role_id@" filter_package_id="@filter_package_id@" subproject_tasks="@subproject_tasks@" Index: openacs-4/packages/project-manager/www/tasks.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/tasks.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/project-manager/www/tasks.tcl 16 Dec 2005 17:28:52 -0000 1.11 +++ openacs-4/packages/project-manager/www/tasks.tcl 29 May 2006 17:36:02 -0000 1.12 @@ -19,7 +19,7 @@ still allow people to view everyone. } { - {orderby ""} + {orderby_tasks ""} {filter_party_id ""} {searchterm ""} {status_id "1"}