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.10 -r1.11
--- openacs-4/contrib/packages/project-manager/www/one.tcl	23 Aug 2003 00:24:34 -0000	1.10
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	26 Aug 2003 00:05:58 -0000	1.11
@@ -23,6 +23,7 @@
 
     project_item_id:integer,optional
     project_id:integer,optional
+    {orderby_subproject ""}
 
 } -properties {
     context_bar:onevalue
@@ -36,22 +37,19 @@
     project_id:onevalue
 } -validate {
     project_item_id_exists {
-        if {![info exists project_item_id]} {
+        if {![exists_and_not_null project_item_id]} {
             set project_item_id [db_string get_item_id { }]
         }
     }
     project_id_exists {
-        if {![info exists project_id]} {
+        if {![exists_and_not_null project_id]} {
             set project_id [db_string get_project_id { }]
         }
     }
 }
 
 # --------------------------------------------------------------- #
 
-# set up context bar
-set context_bar [ad_context_bar "View"]
-
 # the unique identifier for this package
 set package_id [ad_conn package_id]
 set user_id    [ad_maybe_redirect_for_registration]
@@ -66,12 +64,18 @@
 set write_p  [permission::permission_p -object_id $package_id -privilege write] 
 set create_p [permission::permission_p -object_id $package_id -privilege create]
 
-
 db_1row project_query { } -column_array project
+set project_root [db_exec_plsql get_root_folder { }]
 
 db_multirow versions project_versions { }
 
+# set up context bar, needs parent_id
 
+if {[string equal $project(parent_id) $project_root]} {
+    set context_bar [ad_context_bar "View"]
+} else {
+    set context_bar [ad_context_bar [list "one?project_item_id=$project(parent_id)" "Parent"] "View"]
+}
 
 # Tasks, using list-builder ---------------------------------
 
@@ -82,30 +86,27 @@
     -multirow tasks \
     -key item_id \
     -elements {
-        item_id {
-            label "ID"
+        title {
+            label "Subject"
+            display_col title
+            link_url_col item_url
+            link_html { title "View this task" }
             display_template {
                 <if @tasks.const_type@ eq start_before_start>
-                <img src="images/start_before_start.png">
+                  <img src="images/start_before_start.png">
                 </if>
                 <if @tasks.const_type@ eq start_before_finish>
-                <img src="images/start_before_finish.png">
+                  <img src="images/start_before_finish.png">
                 </if>
                 <if @tasks.const_type@ eq finish_before_start>
-                <img src="images/finish_before_start.png">
+                  <img src="images/finish_before_start.png">
                 </if>
                 <if @tasks.const_type@ eq finish_before_finish>
-                <img src="images/finish_before_finish.png">
+                  <img src="images/finish_before_finish.png">
                 </if>
-                \#@tasks.item_id@
+                @tasks.title@ 
             }
         }
-        title {
-            label "Subject"
-            display_col title
-            link_url_col item_url
-            link_html { title "View this task" }
-        }
         percent_complete {
             label "Status"
             display_template "@tasks.percent_complete@\%"
@@ -125,10 +126,9 @@
         }
     } \
     -orderby {
-        item_id {orderby item_id}
         percent_complete {orderby percent_complete}
         end_date {orderby end_date}
-        default_value item_id,desc
+        default_value end_date,desc
     } \
     -orderby_name orderby_tasks \
     -html {
@@ -143,8 +143,42 @@
 
 
 
+# Subprojects, using list-builder ---------------------------------
 
+db_multirow subproject project_subproject_query { }
 
+template::list::create \
+    -name subproject \
+    -multirow subproject \
+    -key item_id \
+    -elements {
+        project_name {
+            label "Subject"
+            link_url_col item_url
+            link_html { title "View this subproject" }
+        }
+        actual_hours_completed {
+            label "Hours completed"
+        }
+    } \
+    -orderby {
+        project_name {orderby project_name}
+        default_value project_name,desc
+    } \
+    -orderby_name orderby_subproject \
+    -html {
+        width 100%
+    }
+
+
+
+db_multirow -extend { item_url } subproject project_subproject_query {
+} {
+    set item_url [export_vars -base "one" -override {{project_item_id $item_id}} {project_item_id}]
+}
+
+
+
 ad_return_template
 
 # ------------------------- END OF FILE ------------------------- #