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.38 -r1.39
--- openacs-4/contrib/packages/project-manager/www/one.tcl 30 Jun 2004 21:29:30 -0000 1.38
+++ openacs-4/contrib/packages/project-manager/www/one.tcl 24 Jul 2004 08:33:55 -0000 1.39
@@ -28,7 +28,6 @@
project_id:integer,optional
{orderby_subproject ""}
{orderby_tasks ""}
- {status_type "o"}
{logger_variable_id:integer ""}
{logger_days:integer "30"}
@@ -76,11 +75,6 @@
-project_item_id $project_item_id]
}
}
- status_type_exists {
- if {![string equal $status_type "o"] && ![string equal $status_type "c"]} {
- set status_type "o"
- }
- }
logger_days_positive {
if {$logger_days < 1} {
set logger_days 1
@@ -195,12 +189,6 @@
# Tasks, using list-builder ---------------------------------
-if {$use_uncertain_completion_times_p} {
- set work_display_template "@tasks.estimated_hours_work_min@ - @tasks.estimated_hours_work_max@ h"
-} else {
- set work_display_template "@tasks.estimated_hours_work@ h"
-}
-
set process_link "process-use?project_item_id=$project_item_id"
template::list::create \
@@ -213,10 +201,7 @@
}
title {
label "Subject"
- display_col title
- display_template {
- @tasks.title@
- }
+ display_template "@tasks.title@@tasks.title@ -- closed"
}
parent_task_id {
label "Dep"
@@ -266,11 +251,6 @@
narrow
} \
-filters {
- status_type {
- label "Status"
- values {{"Open" "o"} {"Closed" "c"}}
- where_clause {s.status_type = :status_type}
- }
project_item_id {
hide_p 1
}
@@ -284,34 +264,32 @@
-orderby {
default_value latest_start,asc
title {
- orderby_asc "title asc, task_id asc"
- orderby_desc "title desc, task_id desc"
+ orderby_asc "status_type desc, title asc, task_id asc"
+ orderby_desc "status_type asc, title desc, task_id desc"
default_direction asc
}
earliest_start {
- orderby_asc "earliest_start, task_id asc, u.first_names, u.last_name"
- orderby_desc "earliest_start desc, task_id desc, u.first_names, u.last_name"
+ orderby_asc "status_type desc, earliest_start, task_id asc, u.first_names, u.last_name"
+ orderby_desc "status_type asc, earliest_start desc, task_id desc, u.first_names, u.last_name"
default_direction asc
}
earliest_finish {
- orderby_asc "earliest_finish, task_id asc, u.first_names, u.last_name"
- orderby_desc "earliest_finish desc, task_id desc, u.first_names, u.last_name"
+ orderby_asc "status_type desc, earliest_finish, task_id asc, u.first_names, u.last_name"
+ orderby_desc "status_type asc, earliest_finish desc, task_id desc, u.first_names, u.last_name"
default_direction asc
}
latest_start {
- orderby_asc "latest_start, task_id asc, u.first_names, u.last_name"
- orderby_desc "latest_start desc, task_id desc, u.first_names, u.last_name"
+ orderby_asc "status_type desc, latest_start, task_id asc, u.first_names, u.last_name"
+ orderby_desc "status_type asc, latest_start desc, task_id desc, u.first_names, u.last_name"
default_direction asc
}
latest_finish {
- orderby_asc "latest_finish, task_id asc, u.first_names, u.last_name"
- orderby_desc "latest_finish desc, task_id desc, u.first_names, u.last_name"
+ orderby_asc "status_type desc, latest_finish, task_id asc, u.first_names, u.last_name"
+ orderby_desc "status_type asc, latest_finish desc, task_id desc, u.first_names, u.last_name"
default_direction asc
}
} \
- -orderby_name orderby_tasks \
- -html {
- }
+ -orderby_name orderby_tasks
db_multirow -extend { item_url earliest_start_pretty earliest_finish_pretty latest_start_pretty latest_finish_pretty slack_time} tasks project_tasks_query {