Index: openacs-4/contrib/packages/project-manager/tcl/task-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs-postgresql.xql,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/contrib/packages/project-manager/tcl/task-procs-postgresql.xql 5 Feb 2004 23:57:49 -0000 1.1.2.2 +++ openacs-4/contrib/packages/project-manager/tcl/task-procs-postgresql.xql 6 Feb 2004 17:20:43 -0000 1.1.2.3 @@ -41,7 +41,7 @@ :estimated_hours_work_min, :estimated_hours_work_max, :status_id, - :creation_date, + coalesce (:creation_date,current_timestamp), :creation_user, :creation_ip, :package_id) Index: openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs.tcl,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl 5 Feb 2004 23:57:49 -0000 1.1.2.3 +++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl 6 Feb 2004 17:20:43 -0000 1.1.2.4 @@ -12,17 +12,15 @@ namespace eval project_manager::task {} -ad_proc -public project_manager::task::default_status_open { -} { +ad_proc -public project_manager::task::default_status_open {} { Returns the default status value for open tasks } { set return_val [db_string get_default_status_open { }] return $return_val } -ad_proc -public project_manager::task::default_status_closed { -} { +ad_proc -public project_manager::task::default_status_closed {} { Returns the default status value for closed tasks } { set return_val [db_string get_default_status_closed { }] @@ -46,7 +44,7 @@ -package_id:required } { if {![exists_and_not_null status_id]} { - set status_id [project_manger::task::default_status_open] + set status_id [project_manager::task::default_status_open] } set return_val [db_exec_plsql new_task_item { *SQL }] Index: openacs-4/contrib/packages/project-manager/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.tcl,v diff -u -r1.9.2.7 -r1.9.2.8 --- openacs-4/contrib/packages/project-manager/www/index.tcl 5 Feb 2004 23:57:49 -0000 1.9.2.7 +++ openacs-4/contrib/packages/project-manager/www/index.tcl 6 Feb 2004 17:20:43 -0000 1.9.2.8 @@ -168,6 +168,7 @@ "Tasks" "tasks" "View list of tasks" "Processes" "processes" "View and use processes" "Add project" "add-edit" "Add project" + "Customers" "/organization" "View customers" "Admin" "admin/" "Administration pages" } \ -main_class { 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.26.2.6 -r1.26.2.7 --- openacs-4/contrib/packages/project-manager/www/one.tcl 5 Feb 2004 23:57:49 -0000 1.26.2.6 +++ openacs-4/contrib/packages/project-manager/www/one.tcl 6 Feb 2004 17:20:43 -0000 1.26.2.7 @@ -358,8 +358,8 @@ db_1row custom_query { } -column_array custom -set custom(pretty_target_rollout) [lc_time_fmt $custom(target_rollout) "%x"] + # end of customizations 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.11.2.3 -r1.11.2.4 --- openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 4 Feb 2004 20:17:19 -0000 1.11.2.3 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql 6 Feb 2004 17:20:43 -0000 1.11.2.4 @@ -19,25 +19,6 @@ - - - select pm_task__new_task_item ( - :project_item_id, - :p_task_title, - :p_description, - [project_manager::project::util::datenvl -value [set end_date_$i] -value_if_null "null," -value_if_not_null "to_timestamp('[set end_date_$i]','YYYY MM DD HH24 MI SS'),"] - '0', - :p_work, - :p_work_min, - :p_work_max, - current_timestamp, - :user_id, - :peeraddr, - :package_id - ); - - - select pm_task__new_task_revision ( 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.23.2.6 -r1.23.2.7 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 5 Feb 2004 23:57:49 -0000 1.23.2.6 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 6 Feb 2004 17:20:43 -0000 1.23.2.7 @@ -1,4 +1,4 @@ -set debug 1 +set debug 0 if {[string equal $debug 1]} { ns_log notice task add edit page @@ -519,7 +519,20 @@ ns_log Notice "adding task: pii: $project_item_id tt:$p_task_title d:$p_description ed: end_date($i) w:$p_work m:$p_work_min mx:$p_work_max dep_type:$p_dep_type dep_id:$p_dep_id" # add in the new task - set this_revision_id [db_exec_plsql new_task_item { *SQL* }] + set this_revision_id [project_manager::task::new \ + -project_id $project_item_id \ + -title $p_task_title \ + -description $p_description \ + -end_date [project_manager::project::util::datenvl -value [set end_date_$i] -value_if_null "" -value_if_not_null "to_timestamp('[set end_date_$i]','YYYY MM DD HH24 MI SS')"] \ + -percent_complete "0" \ + -estimated_hours_work $p_work \ + -estimated_hours_work_min $p_work_min \ + -estimated_hours_work_max $p_work_max \ + -creation_user $user_id \ + -creation_ip $peeraddr \ + -package_id $package_id + ] + set this_task_id [db_string get_task_item_id {}] set dep_task_id($i) $this_task_id Index: openacs-4/contrib/packages/project-manager/www/tasks.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.tcl,v diff -u -r1.1.2.6 -r1.1.2.7 --- openacs-4/contrib/packages/project-manager/www/tasks.tcl 5 Feb 2004 23:57:49 -0000 1.1.2.6 +++ openacs-4/contrib/packages/project-manager/www/tasks.tcl 6 Feb 2004 17:20:43 -0000 1.1.2.7 @@ -48,7 +48,7 @@ # status defaults to open if {![exists_and_not_null status_id]} { - set status_id [project_manager::task::status_default_open] + set status_id [project_manager::task::default_status_open] } # permissions