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.26.2.3 -r1.26.2.4
--- openacs-4/contrib/packages/project-manager/www/one.tcl	13 Dec 2003 01:19:54 -0000	1.26.2.3
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	10 Jan 2004 01:04:02 -0000	1.26.2.4
@@ -121,29 +121,22 @@
     -multirow tasks \
     -key task_id \
     -elements {
+        task_id {
+            label "ID"
+        }
         title {
             label "Subject"
             display_col title
-            link_url_col item_url
-            link_html { title "View this task" }
             display_template {
-                @tasks.title@ 
-                <a href="task-one?task_id=@tasks.parent_task_id@">
-                <if @tasks.dependency_type@ eq start_before_start>
-                  <img border="0" src="resources/start_before_start.png">
-                </if>
-                <if @tasks.dependency_type@ eq start_before_finish>
-                  <img border="0" src="resources/start_before_finish.png">
-                </if>
-                <if @tasks.dependency_type@ eq finish_before_start>
-                  <img border="0" src="resources/finish_before_start.png">
-                </if>
-                <if @tasks.dependency_type@ eq finish_before_finish>
-                  <img border="0" src="resources/finish_before_finish.png">
-                </if>
-                </a>
+                <a href="@tasks.item_url@">@tasks.title@</a>
             }
         } 
+        parent_task_id {
+            label "Dep"
+            display_template {
+                <a href="task-one?task_id=@tasks.parent_task_id@">@tasks.parent_task_id@</a>
+            }
+        }
         slack_time {
             label "Slack"
             display_template "<font size=\"-2\" color=\"grey\"><if @tasks.slack_time@>@tasks.slack_time@</if></font>"
@@ -197,7 +190,6 @@
         earliest_start {orderby earliest_start}
         earliest_finish {orderby earliest_finish}
         latest_start {orderby latest_start}
-        slack_time {orderby slack_time}
         latest_finish {orderby latest_finish}
         default_value latest_start,asc
     } \
@@ -206,14 +198,25 @@
     }
 
 
-db_multirow -extend { item_url earliest_start_pretty earliest_finish_pretty latest_start_pretty latest_finish_pretty} tasks project_tasks_query {
+db_multirow -extend { item_url earliest_start_pretty earliest_finish_pretty latest_start_pretty latest_finish_pretty slack_time} tasks project_tasks_query {
 } {
     set item_url [export_vars -base "task-one" { revision_id task_id}]
 
     set earliest_start_pretty [lc_time_fmt $earliest_start "%x"]
     set earliest_finish_pretty [lc_time_fmt $earliest_finish "%x"]
     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"
+    }
+
 }
 
 
@@ -357,8 +360,6 @@
 
 db_1row custom_query { } -column_array custom 
 
-set custom(pretty_target_rollout) [lc_time_fmt $custom(target_rollout) "%x"]
-
 # end of customizations