Index: openacs-4/contrib/packages/project-manager/www/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.adp,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/contrib/packages/project-manager/www/tasks.adp	10 Dec 2004 19:05:10 -0000	1.5.2.2
+++ openacs-4/contrib/packages/project-manager/www/tasks.adp	25 Apr 2005 11:09:05 -0000	1.5.2.3
@@ -4,8 +4,9 @@
   
   <property name="title">@task_term@s</property>
   <property name="context">@context@</property>
-  
-  
+  <if @passed_project_item_id@ ne 0>
+    <property name="project_item_id">@passed_project_item_id@</property>  
+  </if>
   <table cellpadding="3" cellspacing="3">
     
     <tr>
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.5.2.18 -r1.5.2.19
--- openacs-4/contrib/packages/project-manager/www/tasks.tcl	12 Apr 2005 08:12:24 -0000	1.5.2.18
+++ openacs-4/contrib/packages/project-manager/www/tasks.tcl	25 Apr 2005 11:09:05 -0000	1.5.2.19
@@ -26,13 +26,15 @@
     {page ""}
     {page_size 25}
     role_id:optional
+    project_item_id:optional
 } -properties {
     task_term:onevalue
     context:onevalue
     tasks:multirow
     hidden_vars:onevalue
 }
 
+
 # if someone clicks on a party, then we want to see those tasks.
 if {[exists_and_not_null party_id]} {
     set mine_p "f"
@@ -48,6 +50,13 @@
 
 set use_days_p      [parameter::get -parameter "UseDayInsteadOfHour" -default "t"]
 
+# Check if a project_item_id was passed in and store it
+if [exists_and_not_null project_item_id] {
+    set passed_project_item_id $project_item_id
+} else {
+    set passed_project_item_id 0
+}
+
 set exporting_vars { status_id party_id orderby mine_p }
 set hidden_vars [export_vars -form $exporting_vars]
 # how to get back here
@@ -114,7 +123,7 @@
 
 
 set elements {
-    task_number {
+    task_id {
         label "\#"
         link_url_col item_url
         link_html { title "View this project version" }
@@ -164,6 +173,26 @@
     }
 }
 
+if {[string is true $use_days_p]} {
+    append elements {
+        actual_days_worked {
+            label "Days worked"
+            html {
+                align right
+            }
+        } 
+    }
+} else {
+    append elements {
+        actual_hours_worked {
+            label "Hours worked"
+            html {
+                align right
+            }
+        } 
+    }
+}
+
 append elements {
     project_item_id {
         label "Project"
@@ -205,13 +234,21 @@
             values {$status_list}
             where_clause "$status_where_clause"
         }
+	project_item_id {
+	    label "Project"
+	    values {[pm::project::get_list_of_open]}
+	    where_clause {
+		t.parent_id = :project_item_id
+	    }
+	} 
         role_id {
             label "Roles"
             values {[pm::role::select_list_filter]}
             where_clause {
                 ta.role_id = :role_id
             }
         }
+
         party_id {
             label "People"
             values {[pm::task::assignee_filter_select -status_id $status_id]}
@@ -225,10 +262,10 @@
     } \
     -orderby {
         default_value $default_orderby
-        task_number {
+        task_id {
             label "Task \#"
-            orderby_desc "ts.task_number desc, p.first_names, p.last_name"
-            orderby_asc "ts.task_number asc, p.first_names, p.last_name"
+            orderby_desc "ts.task_id desc, p.first_names, p.last_name"
+            orderby_asc "ts.task_id asc, p.first_names, p.last_name"
             default_direction asc
         }
         title {
@@ -282,9 +319,6 @@
         width 100%
     }
 
-
-
-
 db_multirow -extend { item_url latest_start_pretty latest_finish_pretty slack_time log_url hours_remaining days_remaining} tasks tasks {
 } {
     set item_url [export_vars -base "task-one" {{task_id $task_id}}]
@@ -317,6 +351,8 @@
              -estimated_hours_work_max $estimated_hours_work_max \
              -percent_complete $percent_complete]
 
+    set actual_days_worked [expr $actual_hours_worked / 24]
+
 }