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.12 -r1.5.2.13
--- openacs-4/contrib/packages/project-manager/www/tasks.tcl	5 Nov 2004 23:04:40 -0000	1.5.2.12
+++ openacs-4/contrib/packages/project-manager/www/tasks.tcl	25 Nov 2004 01:16:08 -0000	1.5.2.13
@@ -38,12 +38,13 @@
 
 # --------------------------------------------------------------- #
 
-# terminology
+# terminology and parameters
 set task_term       [parameter::get -parameter "TaskName" -default "Task"]
 set task_term_lower [parameter::get -parameter "taskname" -default "task"]
 set project_term    [parameter::get -parameter "ProjectName" -default "Project"]
 set project_term_lower [parameter::get -parameter "projectname" -default "project"]
 
+set use_days_p      [parameter::get -parameter "UseDayInsteadOfHour" -default "t"]
 
 set exporting_vars { status_id party_id orderby mine_p }
 set hidden_vars [export_vars -form $exporting_vars]
@@ -104,49 +105,68 @@
 }
 
 
-template::list::create \
-    -name tasks \
-    -multirow tasks \
-    -key task_id \
-    -elements {
+set elements {
         task_number {
             label "\#"
             link_url_col item_url
             link_html { title "View this project version" }
             display_template {<a href="@tasks.item_url@">@tasks.task_id@</a>}
-        }
+        } 
         title {
             label "Subject"
-        }
+        } 
         slack_time {
             label "Slack"
             display_template "<if @tasks.slack_time@ gt 1>@tasks.slack_time@</if><else><font color=\"red\">@tasks.slack_time@</font></else>"
-        }
+        } 
         latest_start_pretty {
             label "Latest Start"
-        }
+        } 
         latest_finish_pretty {
             label "Latest Finish"
             display_template {
                 <b>@tasks.latest_finish_pretty@</b>
             }
-        }
+        } 
+}
+
+if {[string is true $use_days_p]} {
+    append elements {
+        days_remaining {
+            label "Days remaining"
+            html {
+                align right
+            }
+        } 
+    }
+} else {
+    append elements {
         hours_remaining {
             label "Hours remaining"
             html {
                 align right
             }
-        }
+        } 
+    }
+}
+
+append elements {
         project_item_id {
             label "Project"
             display_col project_name
             link_url_eval {[export_vars -base one {project_item_id $tasks(project_item_id)}]}
-        }
+        } 
         log_url {
             label "Log"
             display_template {<a href="@tasks.log_url@">L</a>}
-        }
-    } \
+        } 
+}
+
+template::list::create \
+    -name tasks \
+    -multirow tasks \
+    -key task_id \
+    -elements $elements \
     -actions [list "Add task" [export_vars -base task-select-project {return_url}] "Add a task"] \
     -bulk_actions {
         "Log hours" "log-bulk" "Log hours for several tasks"
@@ -239,7 +259,7 @@
 
 
 
-db_multirow -extend { item_url latest_start_pretty latest_finish_pretty slack_time log_url hours_remaining} tasks tasks {
+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}]
 
@@ -264,6 +284,13 @@
              -estimated_hours_work_max $estimated_hours_work_max \
              -percent_complete $percent_complete]
 
+    set days_remaining \
+        [pm::task::days_remaining \
+             -estimated_hours_work $estimated_hours_work \
+             -estimated_hours_work_min $estimated_hours_work_min \
+             -estimated_hours_work_max $estimated_hours_work_max \
+             -percent_complete $percent_complete]
+
 }