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.12 -r1.13
--- openacs-4/contrib/packages/project-manager/www/one.tcl	27 Aug 2003 20:57:53 -0000	1.12
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	29 Aug 2003 00:35:35 -0000	1.13
@@ -14,16 +14,19 @@
     @param project_folder_id
     @param goal
     @param description
-    @param deadline_scheduling
     @param planned_start_date
     @param planned_end_date
     @param ongoing_p
-
+    @param use_goal_p Specifies whether or not to include the goal field 1 = yes
+    @param use_project_code_p Specifies whether or not to show the user-specified project code 1 = yes
+    @param use_uncertain_completion_times_p Specifies whether or not to use PERT style uncertainty times 1 = yes
 } {
 
     project_item_id:integer,optional
     project_id:integer,optional
     {orderby_subproject ""}
+    {orderby_tasks ""}
+    {orderby_versions ""}
 
 } -properties {
     context_bar:onevalue
@@ -35,6 +38,9 @@
     parent_task_id:onevalue
     task_type:onevalue
     project_id:onevalue
+    use_goal_p:onevalue
+    use_project_code_p:onevalue
+    use_uncertain_completion_times_P:onevalue
 } -validate {
     project_item_id_exists {
         if {![exists_and_not_null project_item_id]} {
@@ -57,6 +63,9 @@
 # terminology
 set project_term       [parameter::get -parameter "ProjectName" -default "Project"]
 set project_term_lower [parameter::get -parameter "projectname" -default "project"]
+set use_goal_p  [parameter::get -parameter "UseGoalP" -default "1"]
+set use_project_code_p  [parameter::get -parameter "UseUserProjectCodesP" -default "1"]
+set use_uncertain_completion_times_p [parameter::get -parameter "UseUncertainCompletionTimesP" -default "1"]
 
 # permissions
 permission::require_permission -party_id $user_id -object_id $package_id -privilege read
@@ -67,8 +76,6 @@
 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]} {
@@ -81,6 +88,12 @@
 
 db_multirow tasks project_tasks_query { }
 
+if {$use_uncertain_completion_times_p} {
+    set work_display_template "@tasks.estimated_hours_work_min@ - @tasks.estimated_hours_work_max@ hrs"
+} else {
+    set work_display_template "@tasks.estimated_hours_work@ hrs"
+}
+
 template::list::create \
     -name tasks \
     -multirow tasks \
@@ -101,32 +114,36 @@
             display_template "@tasks.actual_hours_worked@ hrs"
             aggregate "sum"
         }
-        estimated_hours_work_min {
+        estimated_hours_work {
             label "Work estimate"
-            display_template "@tasks.estimated_hours_work_min@ - @tasks.estimated_hours_work_max@ hrs"
-            aggregate "sum"
+            display_template "[set work_display_template]"
         }
         end_date {
             label "Deadline"
             display_template {
                 @tasks.end_date@
                 <a href="task-one?task_id=@tasks.parent_task_id@">
-                <if @tasks.const_type@ eq start_before_start>
+                <if @tasks.dependency_type@ eq start_before_start>
                   <img src="images/start_before_start.png">
                 </if>
-                <if @tasks.const_type@ eq start_before_finish>
+                <if @tasks.dependency_type@ eq start_before_finish>
                   <img src="images/start_before_finish.png">
                 </if>
-                <if @tasks.const_type@ eq finish_before_start>
+                <if @tasks.dependency_type@ eq finish_before_start>
                   <img src="images/finish_before_start.png">
                 </if>
-                <if @tasks.const_type@ eq finish_before_finish>
+                <if @tasks.dependency_type@ eq finish_before_finish>
                   <img src="images/finish_before_finish.png">
                 </if>
                 </a>
             }
         }
     } \
+    -filters {
+        project_item_id {}
+        orderby_subproject {}
+        orderby_versions {}
+    } \
     -orderby {
         percent_complete {orderby percent_complete}
         end_date {orderby end_date}
@@ -163,6 +180,11 @@
             label "Hours completed"
         }
     } \
+    -filters {
+        project_item_id {}
+        orderby_versions {}
+        orderby_tasks {}
+    } \
     -orderby {
         project_name {orderby project_name}
         default_value project_name,desc
@@ -181,6 +203,46 @@
 
 
 
+# Project versions, using list-builder ---------------------------------
+
+db_multirow versions project_versions { }
+
+template::list::create \
+    -name versions \
+    -multirow versions \
+    -key item_id \
+    -elements {
+        project_name {
+            label "Subject"
+            link_url_col item_url
+            link_html { title "View this project version" }
+        }
+        planned_end_date {
+            label "Deadline"
+        }
+    } \
+    -filters {
+        project_item_id {}
+        orderby_subproject {}
+        orderby_tasks {}
+    } \
+    -orderby {
+        project_name {orderby project_name}
+        default_value project_name,desc
+    } \
+    -orderby_name orderby_versions \
+    -html {
+        width 100%
+    }
+
+
+db_multirow -extend { item_url } versions project_versions {
+} {
+    set item_url [export_vars -base "one" -override {{project_item_id $item_id}} {project_item_id}]
+}
+
+
+
 ad_return_template
 
 # ------------------------- END OF FILE ------------------------- #