Index: openacs-4/contrib/packages/project-manager/www/task-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl	26 Jan 2004 15:39:40 -0000	1.23
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl	12 Mar 2004 13:44:45 -0000	1.24
@@ -25,12 +25,12 @@
     orderby_revisions:optional
     orderby_dependency:optional
     orderby_dependency2:optional
-
 } -properties {
+    notification_chunk:onevalue
     task_info:onerow
     project_item_id:onevalue
     project_id:onevalue
-    context_bar:onevalue
+    context:onevalue
     write_p:onevalue
     create_p:onevalue
     revisions:multirow
@@ -43,17 +43,29 @@
     watcher_term:onevalue
     comments:onevalue
     comments_link:onevalue
+    use_uncertain_completion_times_p:onevalue
 } -validate {
     task_id_exists {
         if {![info exists task_id]} {
-            set task_id [db_string get_task_id { }]
+            set task_id [pm::task::get_item_id \
+                             -task_id $task_revision_id]
+            if {[string equal $task_id -1]} {
+                ad_complain
+            }
         }
     }
     revision_id_exists {
         if {![info exists task_revision_id]} {
-            set task_revision_id [db_string get_revision_id { }]
+            set task_revision_id [pm::task::get_revision_id \
+                                      -task_item_id $task_id]
+            if {[string equal $task_revision_id -1]} {
+                ad_complain
+            }
         }
     }
+} -errors {
+    task_id_exists {That task does not exist}
+    revision_id_exists {That task does not exist}
 }
 
 
@@ -65,10 +77,11 @@
 set assignee_term   [parameter::get -parameter "AssigneeName" -default "Assignee"]
 set watcher_term    [parameter::get -parameter "WatcherName" -default "Watcher"]
 set project_term    [parameter::get -parameter "ProjectName" -default "Project"]
+set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
 
 db_1row get_project_ids { }
 
-set context_bar [ad_context_bar "one?project_item_id=$project_item_id $project_term" "View"]
+set context [list "one?project_item_id=$project_item_id $project_term" "View"]
 
 
 # the unique identifier for this package
@@ -87,21 +100,39 @@
 set write_p  [permission::permission_p -object_id $package_id -privilege write] 
 set create_p [permission::permission_p -object_id $package_id -privilege create]
 
+
+
 # Task info ----------------------------------------------------------
 
 db_1row task_query { } -column_array task_info
 set task_info(description) [ad_text_to_html -- $task_info(description)]
 
 if {[exists_and_not_null task_info(earliest_start_j)]} {
-    if {$task_info(earliest_start_j) < $task_info(today_j)} {
-        set task_info(slack_time) "[expr $task_info(latest_start_j) - $task_info(today_j)] days"
-    } else {
-        set task_info(slack_time) "[expr $task_info(latest_start_j) - $task_info(earliest_start_j)] days"
-    }
-} else {
-    set task_info(slack_time) "n/a"
+    set task_info(slack_time) [pm::task::slack_time \
+                                   -earliest_start_j $task_info(earliest_start_j) \
+                                   -today_j $task_info(today_j) \
+                                   -latest_start_j $task_info(latest_start_j)]
 }
 
+set logger_project [pm::project::get_logger_project \
+                        -project_item_id $project_item_id]
+set logger_variable_id [logger::variable::get_default_variable_id]
+
+set log_url "[ad_conn package_url]log?project_id=$logger_project&pm_project_id=$project_item_id&pm_task_id=$task_id"
+
+set log_note "Task logged time listed below"
+
+# ------------------
+# Notifications info
+# ------------------
+set notification_chunk [notification::display::request_widget \
+                            -type pm_task_notif \
+                            -object_id $task_id \
+                            -pretty_name "$task_info(task_title)" \
+                            -url "[ad_conn url]?[ad_conn query]" \
+                           ]
+
+
 # Task Revisions, using list-builder ---------------------------------
 
 template::list::create \
@@ -142,7 +173,7 @@
         default_value revision_id,desc
     } \
     -orderby_name orderby_revisions \
-    -main_class {
+    -sub_class {
         narrow
     } \
     -filters {
@@ -165,7 +196,7 @@
 template::list::create \
     -name dependency \
     -multirow dependency \
-    -key task_id \
+    -key d_task_id \
     -elements {
         dependency_type {
             label "Type"
@@ -184,7 +215,7 @@
                 </if>
             }
         }
-        task_id {
+        d_task_id {
             label "Task"
             display_col task_title
             link_url_col item_url
@@ -203,7 +234,7 @@
         end_date {orderby end_date}
     } \
     -orderby_name orderby_dependency \
-    -main_class {
+    -sub_class {
         narrow
     } \
     -filters {
@@ -217,15 +248,15 @@
 
 db_multirow -extend { item_url } dependency dependency_query {
 } {
-    set item_url [export_vars -base "task-one" -override {{task_id $parent_task_id}} { task_id }]
+    set item_url [export_vars -base "task-one" -override {{task_id $parent_task_id}} { task_id $d_task_id }]
 }
 
 # Dependency info (dependency other task have on this task) ------
 
 template::list::create \
     -name dependency2 \
     -multirow dependency2 \
-    -key task_id \
+    -key d_task_id \
     -elements {
         dependency_type {
             label "Type"
@@ -244,10 +275,10 @@
                 </if>
             }
         }
-        task_id {
+        d_task_id {
             label "Task"
             display_col task_title
-            link_url_eval {task-one?task_id=$task_id}
+            link_url_eval {task-one?task_id=$d_task_id}
             link_html { title "View this task" }
         }
         percent_complete {
@@ -263,7 +294,7 @@
         end_date {orderby end_date}
     } \
     -orderby_name orderby_dependency2 \
-    -main_class {
+    -sub_class {
         narrow
     } \
     -filters {
@@ -303,7 +334,7 @@
             display_template "@people.one_line@"
         }
     } \
-    -main_class {
+    -sub_class {
         narrow
     } \
     -filters {
@@ -319,17 +350,77 @@
     } \
     -orderby_name orderby_people \
     -html {
+        width 100%
     }
 
 
-
 db_multirow -extend { item_url } subproject task_people_query {
 } {
 
 }
 
 
+# Xrefs ------------------------------------------------
 
+template::list::create \
+    -name xrefs \
+    -multirow xrefs \
+    -key x_task_id \
+    -elements {
+        x_task_id {
+            label "ID"
+        }
+        title {
+            label "Task"
+            link_url_col item_url
+            link_html { title "View this task" }
+        }
+        slack_time {
+            label "Slack"
+        }
+        earliest_start_pretty {
+            label "ES"
+        }
+        earliest_finish_pretty {
+            label "EF"
+        }
+        latest_start_pretty {
+            label "LS"
+        }
+        latest_finish_pretty {
+            label "ES"
+        }
+    } \
+    -sub_class {
+        narrow
+    } \
+    -filters {
+        task_revision_id {}
+        orderby_revision {}
+        orderby_dependency {}
+        orderby_dependency2 {}
+    } \
+    -html {
+        width 100%
+    }
+
+db_multirow -extend { item_url earliest_start_pretty earliest_finish_pretty latest_start_pretty latest_finish_pretty slack_time } xrefs xrefs_query {
+} {
+    set item_url [export_vars -base "task-one" -override {{task_id $x_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"]
+
+    set slack_time [pm::task::slack_time \
+                        -earliest_start_j $earliest_start_j \
+                        -today_j $today_j \
+                        -latest_start_j $latest_start_j]
+
+}
+
+
 ad_return_template
 
 # ------------------------- END OF FILE ------------------------- #