Index: openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit-postgresql.xql,v diff -u -N -r1.9.2.5 -r1.9.2.6 --- openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql 6 Mar 2004 00:29:24 -0000 1.9.2.5 +++ openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql 12 Mar 2004 00:20:24 -0000 1.9.2.6 @@ -12,6 +12,7 @@ p.description, p.customer_id, p.status_id, + p.logger_project, to_char(p.planned_start_date,'YYYY MM DD') as planned_start_date, to_char(p.planned_end_date,'YYYY MM DD') as planned_end_date, p.ongoing_p Index: openacs-4/contrib/packages/project-manager/www/add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit.tcl,v diff -u -N -r1.12.2.10 -r1.12.2.11 --- openacs-4/contrib/packages/project-manager/www/add-edit.tcl 11 Mar 2004 11:12:42 -0000 1.12.2.10 +++ openacs-4/contrib/packages/project-manager/www/add-edit.tcl 12 Mar 2004 00:20:24 -0000 1.12.2.11 @@ -24,6 +24,7 @@ {deadline_scheduling ""} {ongoing_p ""} {status_id ""} + {logger_project ""} } -properties { @@ -81,6 +82,10 @@ {value $project_item_id} } + {logger_project:text(hidden) + {value $logger_project} + } + {project_name:text {label "[set project_term] name"} {value $project_name} @@ -229,10 +234,7 @@ # the new revision will not have any of the custom values in # it until it is edited. So we need to pull in these values set old_project_id $project_id - - set logger_project [pm::project::get_logger_project \ - -project_item_id $project_item_id] - + set project_id [pm::project::edit \ -project_item_id $project_item_id \ -project_name $project_name \ @@ -252,11 +254,14 @@ -creation_ip $peeraddr \ -package_id $package_id] - set project_id [db_exec_plsql new_project_revision { *SQL* }] + set project_item_id [pm::project::get_project_item_id \ + -project_id $project_id] pm::project::compute_parent_status $project_item_id - category::map_object -remove_old -object_id $project_item_id $category_ids - + + if {[exists_and_not_null category_ids]} { + category::map_object -remove_old -object_id $project_item_id $category_ids + } } -after_submit { if {$use_project_customizations_p} { 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 -N -r1.9.2.11 -r1.9.2.12 --- openacs-4/contrib/packages/project-manager/www/index.tcl 11 Mar 2004 11:01:43 -0000 1.9.2.11 +++ openacs-4/contrib/packages/project-manager/www/index.tcl 12 Mar 2004 00:20:24 -0000 1.9.2.12 @@ -183,7 +183,7 @@ } } \ -orderby { - default_value customer_name,asc + default_value project_name,asc project_name { label "Project name" orderby_desc "upper(p.title) desc" 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 -N -r1.27.2.9 -r1.27.2.10 --- openacs-4/contrib/packages/project-manager/www/one.adp 11 Mar 2004 09:25:17 -0000 1.27.2.9 +++ openacs-4/contrib/packages/project-manager/www/one.adp 12 Mar 2004 00:20:24 -0000 1.27.2.10 @@ -186,8 +186,6 @@ -

- @@ -224,7 +222,7 @@

- +
@@ -258,5 +256,10 @@

+

+

Comments

+ @comments;noquote@ +

+ @comments_link;noquote@ 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 -N -r1.26.2.10 -r1.26.2.11 --- openacs-4/contrib/packages/project-manager/www/one.tcl 11 Mar 2004 09:25:17 -0000 1.26.2.10 +++ openacs-4/contrib/packages/project-manager/www/one.tcl 12 Mar 2004 00:20:24 -0000 1.26.2.11 @@ -49,6 +49,8 @@ task_term:onevalue then_ansi:onevalue edit_url:onevalue + comments:onevalue + comments_link:onevalue } -validate { project_item_id_exists { if {![exists_and_not_null project_item_id]} { @@ -72,7 +74,14 @@ set package_id [ad_conn package_id] set user_id [ad_maybe_redirect_for_registration] +# ---------------- +# general comments +# ---------------- +set comments [general_comments_get_comments -print_content_p 1 -print_attachments_p 1 $project_item_id "[ad_conn url]?project_item_id=$project_item_id"] +set comments_link [general_comments_create_link -object_name cr_items -link_text "Add a comment" -context_id $package_id $project_item_id "[ad_conn url]?project_item_id=$project_item_id"] + + # terminology set project_term [parameter::get -parameter "ProjectName" -default "Project"] set project_term_lower [parameter::get -parameter "projectname" -default "project"] @@ -185,9 +194,7 @@ } } \ - -actions { - "Use process" $process_link "Use a process" - } \ + -actions [list "Use process" $process_link "Use a process"] \ -bulk_actions { "Edit" "task-add-edit" "Edit tasks" } \ @@ -378,11 +385,6 @@ db_1row custom_query { } -column_array custom -if {[exists_and_not_null item_code_issued]} { - set custom(item_code_issued) [lc_time_fmt $custom(item_code_issued) "%x"] -} else { - set custom(item_code_issued) "" -} # end of customizations Index: openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-dependency-add-edit.tcl,v diff -u -N -r1.3.2.7 -r1.3.2.8 --- openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl 6 Mar 2004 00:29:24 -0000 1.3.2.7 +++ openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl 12 Mar 2004 00:20:24 -0000 1.3.2.8 @@ -1,3 +1,13 @@ +ns_log notice it's my page! +set mypage [ns_getform] +if {[string equal "" $mypage]} { + ns_log notice no form was submitted on my page +} else { + ns_log notice the following form was submitted on my page + ns_set print $mypage +} + + ad_page_contract { Form to add task dependencies @@ -96,14 +106,16 @@ } -new_data { - set process_task_id_pass $process_task_id - set process_task_id_pass [string map {"-" " "} $process_task_id_pass] - set process_task_id $process_task_id_pass + # convert from our hack back to a list + set process_task_id [string map {"-" " "} $process_task_id] foreach tsk_id $process_task_id { db_dml delete_dependency { } } + # convert from our hack back to a list + set use_dependency [string map {"-" " "} $use_dependency] + foreach tr $use_dependency { set type_id $dependency_type($tr) Index: openacs-4/contrib/packages/project-manager/www/process-task-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-task-delete.adp,v diff -u -N -r1.2 -r1.2.2.1 --- openacs-4/contrib/packages/project-manager/www/process-task-delete.adp 10 Nov 2003 19:34:54 -0000 1.2 +++ openacs-4/contrib/packages/project-manager/www/process-task-delete.adp 12 Mar 2004 00:20:24 -0000 1.2.2.1 @@ -10,7 +10,7 @@ Are you sure you'd like to delete these @task_term_lower@s? -@hidden_vars@ +@hidden_vars;noquote@ 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 -N -r1.23.2.9 -r1.23.2.10 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 6 Mar 2004 00:29:24 -0000 1.23.2.9 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 12 Mar 2004 00:20:24 -0000 1.23.2.10 @@ -661,26 +661,28 @@ set p_work $estimated_hours_work($i) set p_work_min $estimated_hours_work_min($i) set p_work_max $estimated_hours_work_max($i) + set p_end_date [set end_date_$i] set p_dep_type $dependency_type($i) set p_parent_task_id $dependency_task_id($i) set p_skip_p $skip_task_p($i) + ns_log Notice "end date: $p_end_date" + # add in the new task if {[string equal $p_skip_p "f"]} { set this_revision_id [pm::task::new \ -project_id $project_item_id \ -title $p_task_title \ -description $p_description \ - -end_date [pm::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')"] \ + -end_date $p_end_date \ -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 - ] + -package_id $package_id] set this_task_id [db_string get_task_item_id {}] 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 -N -r1.16.2.3 -r1.16.2.4 --- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 6 Mar 2004 00:29:24 -0000 1.16.2.3 +++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql 12 Mar 2004 00:20:24 -0000 1.16.2.4 @@ -125,4 +125,50 @@ + + + SELECT + x.task_id_1 as x_task_id, + r.title, + to_char(r.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, + r.earliest_start - current_date as days_to_earliest_start, + to_char(r.earliest_start,'J') as earliest_start_j, + to_char(r.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, + r.earliest_finish - current_date as days_to_earliest_finish, + to_char(r.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, + r.latest_start - current_date as days_to_latest_start, + to_char(r.latest_start,'J') as latest_start_j, + to_char(current_date,'J') as today_j, + to_char(r.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + r.latest_finish - current_date as days_to_latest_finish + FROM + pm_task_xref x, pm_tasks_revisionsx r, cr_items i + WHERE + x.task_id_2 = :task_id and + x.task_id_2 = r.item_id and + r.revision_id = i.live_revision + UNION + SELECT + x2.task_id_2 as x_task_id, + r2.title, + to_char(r2.earliest_start,'YYYY-MM-DD HH24:MI') as earliest_start, + r2.earliest_start - current_date as days_to_earliest_start, + to_char(r2.earliest_start,'J') as earliest_start_j, + to_char(r2.earliest_finish,'YYYY-MM-DD HH24:MI') as earliest_finish, + r2.earliest_finish - current_date as days_to_earliest_finish, + to_char(r2.latest_start,'YYYY-MM-DD HH24:MI') as latest_start, + r2.latest_start - current_date as days_to_latest_start, + to_char(r2.latest_start,'J') as latest_start_j, + to_char(current_date,'J') as today_j, + to_char(r2.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish, + r2.latest_finish - current_date as days_to_latest_finish + FROM + pm_task_xref x2, pm_tasks_revisionsx r2, cr_items i2 + WHERE + x2.task_id_1 = :task_id and + x2.task_id_1 = r2.item_id and + i2.live_revision = r2.revision_id + + + 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 -N -r1.19.2.4 -r1.19.2.5 --- openacs-4/contrib/packages/project-manager/www/task-one.adp 6 Mar 2004 00:29:24 -0000 1.19.2.4 +++ openacs-4/contrib/packages/project-manager/www/task-one.adp 12 Mar 2004 00:20:24 -0000 1.19.2.5 @@ -117,7 +117,7 @@

Logged hours
- +
@task_term@(s) this depends on.@task_term@s this depends on.
@@ -130,7 +130,7 @@ - +
@task_term@(s) depending on this @task_term@@task_term@s depending on this @task_term@
@@ -140,6 +140,19 @@

+ + + + + + + + +
Related @task_term@s
+ +
+ +

@@ -160,7 +173,12 @@ 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 -N -r1.22.2.8 -r1.22.2.9 --- openacs-4/contrib/packages/project-manager/www/task-one.tcl 6 Mar 2004 00:29:24 -0000 1.22.2.8 +++ openacs-4/contrib/packages/project-manager/www/task-one.tcl 12 Mar 2004 00:20:24 -0000 1.22.2.9 @@ -25,7 +25,6 @@ orderby_revisions:optional orderby_dependency:optional orderby_dependency2:optional - } -properties { notification_chunk:onevalue task_info:onerow @@ -50,14 +49,23 @@ if {![info exists task_id]} { set task_id [pm::task::get_item_id \ -task_id $task_revision_id] + if {[string equal $task_id -1]} { + ad_complain + } } } revision_id_exists { if {![info exists task_revision_id]} { set task_revision_id [pm::task::get_revision_id \ -task_item_id $task_id] + if {[string equal $task_revision_id -1]} { + ad_complain + } } } +} -errors { + task_id_exists {That task does not exist} + revision_id_exists {That task does not exist} } @@ -352,7 +360,67 @@ } +# Xrefs ------------------------------------------------ +template::list::create \ + -name xrefs \ + -multirow xrefs \ + -key x_task_id \ + -elements { + x_task_id { + label "ID" + } + title { + label "Task" + link_url_col item_url + link_html { title "View this task" } + } + slack_time { + label "Slack" + } + earliest_start_pretty { + label "ES" + } + earliest_finish_pretty { + label "EF" + } + latest_start_pretty { + label "LS" + } + latest_finish_pretty { + label "ES" + } + } \ + -sub_class { + narrow + } \ + -filters { + task_revision_id {} + orderby_revision {} + orderby_dependency {} + orderby_dependency2 {} + } \ + -html { + width 100% + } + +db_multirow -extend { item_url earliest_start_pretty earliest_finish_pretty latest_start_pretty latest_finish_pretty slack_time } xrefs xrefs_query { +} { + set item_url [export_vars -base "task-one" -override {{task_id $x_task_id}}] + + set earliest_start_pretty [lc_time_fmt $earliest_start "%x"] + set earliest_finish_pretty [lc_time_fmt $earliest_finish "%x"] + set latest_start_pretty [lc_time_fmt $latest_start "%x"] + set latest_finish_pretty [lc_time_fmt $latest_finish "%x"] + + set slack_time [pm::task::slack_time \ + -earliest_start_j $earliest_start_j \ + -today_j $today_j \ + -latest_start_j $latest_start_j] + +} + + ad_return_template # ------------------------- END OF FILE ------------------------- # Index: openacs-4/contrib/packages/project-manager/www/task-select-project-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-select-project-postgresql.xql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/contrib/packages/project-manager/www/task-select-project-postgresql.xql 6 Oct 2003 22:57:28 -0000 1.1 +++ openacs-4/contrib/packages/project-manager/www/task-select-project-postgresql.xql 12 Mar 2004 00:20:24 -0000 1.1.2.1 @@ -6,9 +6,11 @@ SELECT p.item_id as project_item_id, p.title as project_name - FROM pm_projectsx p, cr_items i + FROM pm_projectsx p, cr_items i, pm_project_status s WHERE p.project_id = i.live_revision and - p.parent_id = :root_folder + p.parent_id = :root_folder and + p.status_id = s.status_id and + s.status_type = 'o' ORDER BY p.title 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 -N -r1.1.2.9 -r1.1.2.10 --- openacs-4/contrib/packages/project-manager/www/tasks.tcl 6 Mar 2004 00:29:24 -0000 1.1.2.9 +++ openacs-4/contrib/packages/project-manager/www/tasks.tcl 12 Mar 2004 00:20:24 -0000 1.1.2.10 @@ -186,11 +186,10 @@ set latest_finish_pretty [lc_time_fmt $latest_finish "%x"] if {[exists_and_not_null earliest_start_j]} { - if {$earliest_start_j < $today_j} { - set slack_time "[expr $latest_start_j - $today_j] days" - } else { - set slack_time "[expr $latest_start_j - $earliest_start_j] days" - } + set slack_time [pm::task::slack_time \ + -earliest_start_j $earliest_start_j \ + -today_j $today_j \ + -latest_start_j $latest_start_j] } else { set slack_time "n/a" }
@task_info.percent_complete@% complete
- Slack: @task_info.slack_time@
+ + Slack: @task_info.slack_time@
+ + + Slack: n/a +