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.9 -r1.10
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl	8 Aug 2003 19:13:53 -0000	1.9
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl	8 Aug 2003 22:24:14 -0000	1.10
@@ -10,12 +10,12 @@
     @return assignee_term Term to use for assignee
     @return watcher_term Term to use for watcher
     @return consts multirow that stores constraint information
+    @return consts multirow that stores constraint information for tasks that have constraints on this particular task
 
     @param task_id item_id for the task
     @param project_item_id the item_id for the project. Used for navigational links
     @param project_id the revision_id for the project. Used for navigational links
     @param context_bar value for context bar creation
-    @property task_title Name for Task
 } {
     task_id:integer,optional
     task_revision_id:integer,optional
@@ -30,6 +30,7 @@
     create_p:onevalue
     revisions:multirow
     consts:multirow
+    consts2:multirow
     task_term:onevalue
     task_term_lower:onevalue
     assignee_term:onevalue
@@ -72,10 +73,11 @@
 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
 
-# Trying to show the task revisions with list-builder
+# Task Revisions, using list-builder ---------------------------------
 
 template::list::create \
     -name revisions \
@@ -114,18 +116,132 @@
     }
 
 if {[exists_and_not_null orderby]} {
-    set orderby_clause "ORDER BY [template::list::orderby_clause -name revisions]"
+    set orderby_revisions_clause "ORDER BY [template::list::orderby_clause -name revisions]"
 } else {
-    set orderby_clause "ORDER BY revision_id desc"
+    set orderby_revisions_clause "ORDER BY revision_id desc"
 }
 
 db_multirow -extend { item_url } revisions task_revisions_query {
 } {
     set item_url [export_vars -base "task-one" -override {{task_revision_id $revision_id}} -exclude {revision_id} { revision_id task_id}]
 }
 
-db_multirow consts consts_query { }
+# Constraints info ------------------------------------------------
 
+template::list::create \
+    -name consts \
+    -multirow consts \
+    -key task_id \
+    -elements {
+        const_type {
+            label "Type"
+            display_template {
+                <if @consts.const_type@ eq start_before_start>
+                <img src="images/start_before_start.png">
+                </if>
+                <if @consts.const_type@ eq start_before_finish>
+                <img src="images/start_before_finish.png">
+                </if>
+                <if @consts.const_type@ eq finish_before_start>
+                <img src="images/finish_before_start.png">
+                </if>
+                <if @consts.const_type@ eq finish_before_finish>
+                <img src="images/finish_before_finish.png">
+                </if>
+            }
+        }
+        task_id {
+            label "Task"
+            display_col task_title
+            link_url_col item_url
+            link_html { title "View this task" }
+        }
+        percent_complete {
+            label "Status"
+            display_template "@consts.percent_complete@\%"
+        }
+        start_date {
+            label "Start date"
+        }
+        end_date {
+            label "End date"
+        }
+    } \
+    -orderby {
+        percent_complete {orderby percent_complete}
+        start_date {orderby start_date}
+        end_date {orderby end_date}
+    } \
+    -filters {
+        task_revision_id
+    }
+
+set orderby_consts_clause "ORDER BY task_title"
+
+db_multirow -extend { item_url } consts consts_query {
+} {
+    set item_url [export_vars -base "task-one" -override {{task_id $parent_task_id}} { task_id }]
+}
+
+# Constraints info (constraints other task have on this task) ------
+
+template::list::create \
+    -name consts2 \
+    -multirow consts2 \
+    -key task_id \
+    -elements {
+        const_type {
+            label "Type"
+            display_template {
+                <if @consts2.const_type@ eq start_before_start>
+                <img src="images/start_before_start.png">
+                </if>
+                <if @consts2.const_type@ eq start_before_finish>
+                <img src="images/start_before_finish.png">
+                </if>
+                <if @consts2.const_type@ eq finish_before_start>
+                <img src="images/finish_before_start.png">
+                </if>
+                <if @consts2.const_type@ eq finish_before_finish>
+                <img src="images/finish_before_finish.png">
+                </if>
+            }
+        }
+        task_id {
+            label "Task"
+            display_col task_title
+            link_url_eval {task-one?task_id=$task_id}
+            link_html { title "View this task" }
+        }
+        percent_complete {
+            label "Status"
+            display_template "@consts2.percent_complete@\%"
+        }
+        start_date {
+            label "Start date"
+        }
+        end_date {
+            label "End date"
+        }
+    } \
+    -orderby {
+        percent_complete {orderby percent_complete}
+        start_date {orderby start_date}
+        end_date {orderby end_date}
+    } \
+    -filters {
+        task_revision_id
+    }
+
+set orderby_consts2_clause "ORDER BY task_title"
+
+
+db_multirow -extend { item_url } consts2 consts2_query {
+} {
+
+}
+
+
 ad_return_template
 
 # ------------------------- END OF FILE ------------------------- #