Index: openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one-postgresql.xql,v diff -u -r1.20 -r1.21 --- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 27 Apr 2004 00:49:29 -0000 1.20 +++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 30 Apr 2004 21:32:33 -0000 1.21 @@ -45,31 +45,6 @@ - - - SELECT - t.item_id, - t.revision_id, - i.live_revision, - t.title as task_title, - t.description || ' -- ' || p.first_names || ' ' || p.last_name - as description, - t.mime_type, - to_char(t.end_date,'MM/DD/YYYY') as end_date, - t.percent_complete, - t.estimated_hours_work_min, - t.estimated_hours_work_max, - t.actual_hours_worked - FROM - pm_tasks_revisionsx t, cr_items i, persons p - WHERE - t.item_id = :task_id and - t.item_id = i.item_id and - t.creation_user = p.person_id - [template::list::orderby_clause -name revisions -orderby] - - - SELECT Index: openacs-4/contrib/packages/project-manager/www/task-one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.adp,v diff -u -r1.26 -r1.27 --- openacs-4/contrib/packages/project-manager/www/task-one.adp 30 Apr 2004 01:42:58 -0000 1.26 +++ openacs-4/contrib/packages/project-manager/www/task-one.adp 30 Apr 2004 21:32:33 -0000 1.27 @@ -1,6 +1,6 @@ - @task_term@ #@item_id@: + @task_term@ #@task_id@: @task_info.task_title@ @closed_message@ @context@ @@ -23,7 +23,7 @@ - @task_term@ #@item_id@: @task_info.task_title@ + @task_term@ #@task_id@: @task_info.task_title@ @@ -88,7 +88,20 @@ @task_info.latest_start@ + + Actions + + + + + + + + +

@@ -216,12 +229,4 @@ -

-

Revisions

- -

- - - -

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.26 -r1.27 --- openacs-4/contrib/packages/project-manager/www/task-one.tcl 30 Apr 2004 01:42:58 -0000 1.26 +++ openacs-4/contrib/packages/project-manager/www/task-one.tcl 30 Apr 2004 21:32:33 -0000 1.27 @@ -16,13 +16,11 @@ @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 - @param orderby_revisions specifies how the revisions table will be sorted @param orderby_dependency specifies how the dependencies will be sorted @param orderby_dependency2 specifies how the dependencies will be sorted (for tasks that have dependencies on this task) } { task_id:integer,optional task_revision_id:integer,optional - orderby_revisions:optional orderby_dependency:optional orderby_dependency2:optional } -properties { @@ -34,7 +32,6 @@ context:onevalue write_p:onevalue create_p:onevalue - revisions:multirow dependency:multirow dependency2:multirow people:multirow @@ -153,72 +150,6 @@ ] -# Task Revisions, using list-builder --------------------------------- - -template::list::create \ - -name revisions \ - -multirow revisions \ - -key revision_id \ - -elements { - revision_id { - label "Subject" - display_col task_title - link_url_col item_url - link_html { title "View this revision" } - display_template {@revisions.task_title@@revisions.task_title@} - } - description { - label "Description" - display_template { - @revisions.description_rich;noquote@ - } - } - percent_complete { - label "Status" - display_template "@revisions.percent_complete@\%" - } - actual_hours_worked { - label "Hour to date" - display_template "@revisions.actual_hours_worked@ hrs" - } - estimated_hours_work_min { - label "Work estimate" - display_template "@revisions.estimated_hours_work_min@ - @revisions.estimated_hours_work_max@ hrs" - } - end_date { - label "Deadline" - } - } \ - -orderby { - revision_id {orderby revision_id} - percent_complete {orderby percent_complete} - end_date {orderby end_date} - default_value revision_id,desc - } \ - -orderby_name orderby_revisions \ - -sub_class { - narrow - } \ - -filters { - task_revision_id {} - orderby_dependency {} - orderby_dependency2 {} - } \ - -html { - width 100% - } - - -db_multirow -extend { item_url description_rich } 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}] - - set richtext_list [list $description $mime_type] - - set description_rich [template::util::richtext::get_property html_value $richtext_list] - -} - # Dependency info ------------------------------------------------ template::list::create \ @@ -267,7 +198,6 @@ } \ -filters { task_revision_id {} - orderby_revisions {} orderby_dependency2 {} } \ -html { @@ -327,7 +257,6 @@ } \ -filters { task_revision_id {} - orderby_revisions {} orderby_dependency {} } \ -html { Index: openacs-4/contrib/packages/project-manager/www/task-revisions-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-revisions-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/contrib/packages/project-manager/www/task-revisions-postgresql.xql 30 Apr 2004 21:32:33 -0000 1.1 @@ -0,0 +1,41 @@ + + + + + + + + + + + postgresql + 7.3 + + + + + SELECT + t.item_id, + t.revision_id, + i.live_revision, + t.title as task_title, + t.description || ' -- ' || p.first_names || ' ' || p.last_name + as description, + t.mime_type, + to_char(t.end_date,'MM/DD/YYYY') as end_date, + t.percent_complete, + t.estimated_hours_work_min, + t.estimated_hours_work_max, + t.actual_hours_worked + FROM + pm_tasks_revisionsx t, cr_items i, persons p + WHERE + t.item_id = :task_id and + t.item_id = i.item_id and + t.creation_user = p.person_id + [template::list::orderby_clause -name revisions -orderby] + + + + + Index: openacs-4/contrib/packages/project-manager/www/task-revisions.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-revisions.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/contrib/packages/project-manager/www/task-revisions.adp 30 Apr 2004 21:32:33 -0000 1.1 @@ -0,0 +1,7 @@ + + @title@ + @context@ + + + + Index: openacs-4/contrib/packages/project-manager/www/task-revisions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-revisions.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/contrib/packages/project-manager/www/task-revisions.tcl 30 Apr 2004 21:32:33 -0000 1.1 @@ -0,0 +1,98 @@ +# + +ad_page_contract { + + Shows all the revisions of a task + + @author Jade Rubick (jader@bread.com) + @creation-date 2004-04-30 + @arch-tag: 339a6143-11a3-4f1b-902d-a3cd71f7d531 + @cvs-id $Id: task-revisions.tcl,v 1.1 2004/04/30 21:32:33 jader Exp $ + + @param orderby_revisions specifies how the revisions table will be sorted + +} { + task_id:integer + orderby_revisions:optional +} -properties { + revisions:multirow +} -validate { +} -errors { +} + + +set task_term [parameter::get -parameter "TaskName" -default "Task"] + +set title "$task_term Changes" + +set context [list "task-one?task_id=$task_id $task_term" "View"] + + +# Task Revisions, using list-builder --------------------------------- + +template::list::create \ + -name revisions \ + -multirow revisions \ + -key revision_id \ + -elements { + revision_id { + label "Subject" + display_col task_title + link_url_col item_url + link_html { title "View this revision" } + display_template {@revisions.task_title@@revisions.task_title@} + } + description { + label "Description" + display_template { + @revisions.description_rich;noquote@ + } + } + percent_complete { + label "Status" + display_template "@revisions.percent_complete@\%" + } + actual_hours_worked { + label "Hour to date" + display_template "@revisions.actual_hours_worked@ hrs" + } + estimated_hours_work_min { + label "Work estimate" + display_template "@revisions.estimated_hours_work_min@ - @revisions.estimated_hours_work_max@ hrs" + } + end_date { + label "Deadline" + } + } \ + -orderby { + revision_id {orderby revision_id} + percent_complete {orderby percent_complete} + end_date {orderby end_date} + default_value revision_id,desc + } \ + -orderby_name orderby_revisions \ + -sub_class { + narrow + } \ + -filters { + task_revision_id {} + orderby_dependency {} + orderby_dependency2 {} + } \ + -html { + width 100% + } + + +db_multirow -extend { item_url description_rich } 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}] + + set richtext_list [list $description $mime_type] + + set description_rich [template::util::richtext::get_property html_value $richtext_list] + +} + + +