Index: openacs-4/contrib/packages/project-manager/project-manager.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/Attic/project-manager.info,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/packages/project-manager/project-manager.info 30 Jul 2003 20:42:05 -0000 1.3 +++ openacs-4/contrib/packages/project-manager/project-manager.info 30 Jul 2003 23:36:07 -0000 1.4 @@ -9,8 +9,8 @@ /project-manager - Jade Rubick Nick Carroll + Jade Rubick Project management for OpenACS 2003-07-18 http://openacs.org/projects/dotwrk/project_management/ Index: openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/sql/postgresql/Attic/project-manager-functions-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql 30 Jul 2003 20:42:05 -0000 1.3 +++ openacs-4/contrib/packages/project-manager/sql/postgresql/project-manager-functions-create.sql 30 Jul 2003 23:36:07 -0000 1.4 @@ -516,7 +516,7 @@ select define_function_args('pm_task__new_task_revision', 'task_id, project_id, title, description, start_date, end_date, percent_complete, creation_date, creation_user, creation_ip, package_id'); create function pm_task__new_task_revision ( - integer, -- task_id + integer, -- task_id (the item_id) integer, -- project_id varchar, -- title varchar, -- description @@ -542,7 +542,6 @@ p_creation_ip alias for $10; p_package_id alias for $11; - v_item_id cr_items.item_id%TYPE; v_revision_id cr_revisions.revision_id%TYPE; v_id cr_items.item_id%TYPE; begin @@ -557,7 +556,7 @@ ''text/plain'', -- mime_type NULL, -- nls_language NULL, -- data - v_item_id, -- item_id + p_task_id, -- item_id NULL, -- revision_id now(), -- creation_date p_creation_user, -- creation_user Index: openacs-4/contrib/packages/project-manager/www/one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.adp,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/packages/project-manager/www/one.adp 30 Jul 2003 20:42:05 -0000 1.3 +++ openacs-4/contrib/packages/project-manager/www/one.adp 30 Jul 2003 23:36:08 -0000 1.4 @@ -32,7 +32,7 @@ Index: openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 30 Jul 2003 20:42:05 -0000 1.1 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 30 Jul 2003 23:36:08 -0000 1.2 @@ -3,13 +3,13 @@ select pm_task__new_task_item ( - :task_revision_id, + null, :project_item_id, - :title, + :task_title, :description, to_timestamp(:start_date,'YYYY MM DD HH24 MI SS'), to_timestamp(:end_date,'YYYY MM DD HH24 MI SS'), - :percent_complete, + '0', now(), :user_id, :peeraddr, @@ -20,10 +20,10 @@ - select pm_project__new_task_revision ( - :task_revision_id, + select pm_task__new_task_revision ( + :task_id, :project_item_id, - :title, + :task_title, :description, to_timestamp(:start_date,'YYYY MM DD HH24 MI SS'), to_timestamp(:end_date,'YYYY MM DD HH24 MI SS'), @@ -40,7 +40,7 @@ select task_revision_id, - title, + title as task_title, item_id, description, name, @@ -51,7 +51,7 @@ FROM pm_tasks_revisionsx WHERE - task_revision_id = :task_revision_id + item_id = :task_id Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.adp,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.adp 30 Jul 2003 20:42:05 -0000 1.1 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.adp 30 Jul 2003 23:36:08 -0000 1.2 @@ -5,3 +5,4 @@
+ Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 30 Jul 2003 20:42:05 -0000 1.1 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 30 Jul 2003 23:36:08 -0000 1.2 @@ -5,15 +5,22 @@ @author jader@bread.com @creation-date 2003-07-28 @cvs-id $Id$ + @return context_bar Context bar. @return title Page title. + @param project_item_id Specifies which project this task is associated with + @param project_id Specifies which project revision this task is associated with + @param task_revision_id Specifies the revision this task represents (each revision of a task has a separate id) + @param task_id Specifies the item for the task (every revision of a task shares the same task_id) } { project_item_id:integer,optional + project_id:integer,optional task_revision_id:integer,optional - {title ""} + task_id:integer,optional + {task_title ""} {description ""} {name ""} {parent_id ""} @@ -32,30 +39,37 @@ set package_id [ad_conn package_id] -if {[exists_and_not_null project_id]} { +if {[exists_and_not_null task_id]} { set title "Edit a task" set context_bar [ad_context_bar "Edit Task"] } else { set title "Add a task" set context_bar [ad_context_bar "New Task"] } +ns_log Notice "before add_edit" ad_form -name add_edit -form { - task_revision_id:key + task_id:key {project_item_id:text(hidden) {value $project_item_id} } - {title:text + {project_id:text(hidden) + {value $project_id} + } + + {task_title:text {label "Title"} - {value $title} + {value $task_title} + {html {size 59}} } - {description:text + {description:text(textarea) {label "Description"} {value $description} + {html {rows 10 cols 60}} } {parent_id:text(hidden) @@ -74,28 +88,38 @@ {help} } - {percent_complete:integer - {label "Percent complete"} - {value $percent_complete} - } - } -select_query_name task_query -on_submit { + ns_log Notice "in select_query_name" + set user_id [ad_conn user_id] set peeraddr [ad_conn peeraddr] } -new_data { + db_exec_plsql new_task_item { *SQL* } - ad_returnredirect "." - ad_script_abort - } -edit_data { db_exec_plsql new_task_revision { *SQL* } } -after_submit { - ad_returnredirect "one?item_id=$project_item_id" + ad_returnredirect "one?item_id=$project_item_id&project_id=$project_id" ad_script_abort } + +# we are editing? + +if {[exists_and_not_null task_id]} { + + ad_form -extend -name add_edit -form { + {percent_complete:integer + {label "Percent complete"} + {value $percent_complete} + {html {size 4}} + } + } -select_query_name task_query -on_submit { + + } +} 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.1 -r1.2 --- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 30 Jul 2003 20:42:05 -0000 1.1 +++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 30 Jul 2003 23:36:08 -0000 1.2 @@ -3,15 +3,17 @@ SELECT - p.item_id, - p.title as task_title, - p.description, - to_char(p.start_date,'MM/DD/YYYY') as start_date, - to_char(p.end_date,'MM/DD/YYYY') as end_date + t.item_id, + t.title as task_title, + t.description, + to_char(t.start_date,'MM/DD/YYYY') as start_date, + to_char(t.end_date,'MM/DD/YYYY') as end_date, + t.percent_complete FROM - pm_tasks_revisionsx p + pm_tasks_revisionsx t, cr_items i WHERE - p.item_id = :task_id + t.item_id = :task_id and + t.revision_id = i.live_revision 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.1 -r1.2 --- openacs-4/contrib/packages/project-manager/www/task-one.adp 30 Jul 2003 20:42:05 -0000 1.1 +++ openacs-4/contrib/packages/project-manager/www/task-one.adp 30 Jul 2003 23:36:08 -0000 1.2 @@ -33,11 +33,18 @@ +Status +@percent_complete@% complete + + + Priority +

+ How this ticket relates to others:

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.1 -r1.2 --- openacs-4/contrib/packages/project-manager/www/task-one.tcl 30 Jul 2003 20:42:05 -0000 1.1 +++ openacs-4/contrib/packages/project-manager/www/task-one.tcl 30 Jul 2003 23:36:08 -0000 1.2 @@ -20,6 +20,7 @@ description:onevalue start_date:onevalue end_date:onevalue + percent_complete:onevalue } # --------------------------------------------------------------- #