Index: openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-procs.tcl,v diff -u -r1.6.2.6 -r1.6.2.7 --- openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl 8 Sep 2004 22:36:59 -0000 1.6.2.6 +++ openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl 16 Sep 2004 19:35:51 -0000 1.6.2.7 @@ -640,9 +640,6 @@ For a project with subprojects, the statistics are based on the tasks of both of those projects. -

- Tasks which are closed are not updated - @author Jade Rubick (jader@bread.com) @creation-date 2004-02-19 @@ -671,8 +668,6 @@ # # I added in an optimization to only save when something has # changed -- JR - # I added in another optimization that only saves tasks that are - # open -- JR # ------------------------------------------------------------------------- # Add in resource limits. (it's not realistic that 300 tasks can be done in # one day) @@ -766,10 +761,10 @@ set old_EF_j($my_iid) $old_earliest_finish_j set old_LS_j($my_iid) $old_latest_start_j set old_LF_j($my_iid) $old_latest_finish_j - set old_task_status($my_iid) $status_type + # set old_task_status($my_iid) $status_type if {[string is true $debug]} { - ns_log Notice "old_task_status: $my_iid $status_type (o=open, c=closed)" + # ns_log Notice "old_task_status: $my_iid $status_type (o=open, c=closed)" } set activity_time($my_iid) [expr [expr $to_work * [expr 100 - $my_percent_complete] / 100]] @@ -1493,9 +1488,9 @@ # do nothing } else { # if the task is open... - if {[string equal "o" $old_task_status($task_item)]} { - db_dml update_task { } - } + #if {[string equal "o" $old_task_status($task_item)]} { + db_dml update_task { } + #} } @@ -1517,11 +1512,14 @@ When a project is updated, or a task updated within a project, we need to update all the projects higher in the hierarchy. + + This may need to be fixed to add back in subproject support. } { - # ns_log Notice "computing parents for $project_item_id" + set package_id [pm::util::package_id] - set package_id [ad_conn package_id] + # ns_log Notice "computing parents for $project_item_id and package_id: $package_id" + set my_item_id $project_item_id set parent_id [db_string get_parent_id {}] set last_item_id $my_item_id @@ -1538,7 +1536,7 @@ # ns_log Notice "root: $root_folder , last_item_id $last_item_id" - set return_code [compute_status $last_item_id] + set return_code [pm::project::compute_status $last_item_id] return $return_code } 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 -r1.16.2.3 -r1.16.2.4 --- openacs-4/contrib/packages/project-manager/www/add-edit.tcl 13 Aug 2004 18:57:34 -0000 1.16.2.3 +++ openacs-4/contrib/packages/project-manager/www/add-edit.tcl 16 Sep 2004 19:35:52 -0000 1.16.2.4 @@ -306,11 +306,15 @@ if {$use_project_customizations_p} { # warn of current bug so users can work around it ad_returnredirect -message "You must submit changes on this page or you will lose any data on this page" "add-edit-2?[export_url_vars project_id old_project_id]" - pm::project::compute_parent_status $project_item_id + # to add back in subproject support, should use + # compute_parent_status + pm::project::compute_status $project_item_id ad_script_abort } else { ad_returnredirect -message "Changes to project saved" "one?[export_url_vars project_id]" - pm::project::compute_parent_status $project_item_id + # to add back in subproject support, should use + # compute_parent_status + pm::project::compute_status $project_item_id ad_script_abort } } 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.31.2.3 -r1.31.2.4 --- openacs-4/contrib/packages/project-manager/www/one.adp 15 Jul 2004 22:13:10 -0000 1.31.2.3 +++ openacs-4/contrib/packages/project-manager/www/one.adp 16 Sep 2004 19:35:52 -0000 1.31.2.4 @@ -179,7 +179,7 @@

- +
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.30.2.6 -r1.30.2.7 --- openacs-4/contrib/packages/project-manager/www/one.tcl 10 Sep 2004 16:52:27 -0000 1.30.2.6 +++ openacs-4/contrib/packages/project-manager/www/one.tcl 16 Sep 2004 19:35:52 -0000 1.30.2.7 @@ -209,23 +209,28 @@ } slack_time { label "Slack" - display_template "@tasks.slack_time@" + display_template " + + + @tasks.slack_time@ + + " } earliest_start { label "Earliest Start" - display_template "@tasks.earliest_start_pretty@@tasks.earliest_start_pretty@" + display_template "@tasks.earliest_start_pretty@@tasks.earliest_start_pretty@" } earliest_finish { label "Earliest Finish" - display_template "@tasks.earliest_finish_pretty@@tasks.earliest_finish_pretty@" + display_template "@tasks.earliest_finish_pretty@@tasks.earliest_finish_pretty@" } latest_start { label "Latest Start" - display_template "@tasks.latest_start_pretty@@tasks.latest_start_pretty@" + display_template "@tasks.latest_start_pretty@@tasks.latest_start_pretty@" } latest_finish { label "Latest Finish" - display_template "@tasks.latest_finish_pretty@@tasks.latest_finish_pretty@" + display_template "@tasks.latest_finish_pretty@@tasks.latest_finish_pretty@" } last_name { label "Who" 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.27.2.9 -r1.27.2.10 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 9 Sep 2004 23:58:22 -0000 1.27.2.9 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 16 Sep 2004 19:35:52 -0000 1.27.2.10 @@ -1181,7 +1181,9 @@ foreach proj_item $project_item_id_list { - pm::project::compute_parent_status $proj_item + # to add back in subproject support, should use + # compute_parent_status + pm::project::compute_status $proj_item }
Subprojects