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.16.2.20 -r1.16.2.21 --- openacs-4/contrib/packages/project-manager/project-manager.info 26 Oct 2004 16:12:11 -0000 1.16.2.20 +++ openacs-4/contrib/packages/project-manager/project-manager.info 3 Nov 2004 20:37:10 -0000 1.16.2.21 @@ -10,7 +10,7 @@ Jade Rubick Project management tool for OpenACS - 2004-10-26 + 2004-11-03 Integrated Bakery Resources Track tasks, estimates and actual progress for a project. See the <a href="http://openacs.org/projects/dotwrk/project_management/">project page</a> for more information. @@ -25,8 +25,8 @@ - +

${detail_begin}$task_id
$title${detail_end}" + set day_details "

${detail_begin}$task_id
$title${detail_end}

$project_name
" # only add to the list if we want to see closed tasks append day_details "
  • ${font_begin}${full_name}${font_end}
    • " 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.9 -r1.6.2.10 --- openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl 26 Oct 2004 01:22:27 -0000 1.6.2.9 +++ openacs-4/contrib/packages/project-manager/tcl/project-procs.tcl 3 Nov 2004 20:37:12 -0000 1.6.2.10 @@ -1593,7 +1593,10 @@ ad_proc -public pm::project::get_list_of_open { } { - Returns a list of lists, of all open project ids and their names + Returns a list of lists, of all open project ids and their names. + + We should util_memoize this. It will dramatically improve the + speed of the task edits. @author Jade Rubick (jader@bread.com) @creation-date 2004-05-13 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.12.2.6 -r1.12.2.7 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.adp 26 Oct 2004 01:21:11 -0000 1.12.2.6 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.adp 3 Nov 2004 20:37:12 -0000 1.12.2.7 @@ -149,17 +149,8 @@

    - - @project_term@: - - - - - - - + @tasks.project_html;noquote@ +

    Dependency:
    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.14 -r1.27.2.15 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 26 Oct 2004 01:21:11 -0000 1.27.2.14 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 3 Nov 2004 20:37:12 -0000 1.27.2.15 @@ -24,7 +24,7 @@ @param new_tasks if we are creating new tasks, how many to create } { {task_item_id:integer,multiple ""} - {project_item_id:integer,notnull} + {project_item_id:integer ""} {process_id:integer ""} {process_task_id:integer,multiple ""} {return_url ""} @@ -65,6 +65,36 @@ set using_process_p f } +# -------------------------------------------------------------------- +# if we are editing tasks, each task has its own project. We also want +# to look up all the old information to store it for later. We use +# this for comparison, to see what has changed. +# -------------------------------------------------------------------- + +if {[string is true $edit_p]} { + + # get old values + pm::task::get \ + -tasks_item_id $task_item_id \ + -one_line_array task_one_line \ + -description_array task_description \ + -description_mime_type_array task_description_mime_type \ + -estimated_hours_work_array task_estimated_hours_work \ + -estimated_hours_work_min_array task_estimated_hours_work_min \ + -estimated_hours_work_max_array task_estimated_hours_work_max \ + -dependency_array task_dependency \ + -percent_complete_array task_percent_complete \ + -end_date_day_array task_end_date_day \ + -end_date_month_array task_end_date_month \ + -end_date_year_array task_end_date_year \ + -project_item_id_array task_project_item_id + +} elseif {[empty_string_p $project_item_id]} { + + ad_return_error "Project missing" "For new tasks, a project must be passed in" + ad_script_abort +} + # --------------------------------------------------------------- # permissions and title setup, etc # --------------------------------------------------------------- @@ -110,7 +140,8 @@ depends \ assignee_html \ dependency_html \ - logger_variable_html + logger_variable_html \ + project_html if {[string is true $edit_p]} { @@ -119,31 +150,6 @@ # EDITING # ------- - set project_options [pm::project::select_list_of_open \ - -selected $project_item_id] - - # find out the default logger variable for this project - set logger_project [pm::project::get_logger_project \ - -project_item_id $project_item_id] - set logger_variable_id [logger::project::get_primary_variable \ - -project_id $logger_project] - - # get old values - pm::task::get \ - -tasks_item_id $task_item_id \ - -one_line_array task_one_line \ - -description_array task_description \ - -description_mime_type_array task_description_mime_type \ - -estimated_hours_work_array task_estimated_hours_work \ - -estimated_hours_work_min_array task_estimated_hours_work_min \ - -estimated_hours_work_max_array task_estimated_hours_work_max \ - -dependency_array task_dependency \ - -percent_complete_array task_percent_complete \ - -end_date_day_array task_end_date_day \ - -end_date_month_array task_end_date_month \ - -end_date_year_array task_end_date_year \ - -project_item_id_array task_project_item_id - set number 1 set total_number [llength $task_item_id] @@ -157,6 +163,17 @@ foreach task $task_item_id { + set this_project $task_project_item_id($task) + + set project_options [pm::project::select_list_of_open \ + -selected $this_project] + + # find out the default logger variable for this project + set logger_project [pm::project::get_logger_project \ + -project_item_id $this_project] + set logger_variable_id [logger::project::get_primary_variable \ + -project_id $logger_project] + set end_date_html [pm::task::date_html \ -selected_day $task_end_date_day($task) \ -selected_month $task_end_date_month($task) \ @@ -169,7 +186,7 @@ set dependency_options_full [pm::task::options_list_html \ -edit_p $edit_p \ -task_item_id $task \ - -project_item_id $project_item_id \ + -project_item_id $this_project \ -dependency_task_id $task_dependency($task) \ -dependency_task_ids "$deps" \ -number $total_number \ @@ -180,6 +197,11 @@ -current_variable_id $logger_variable_id \ -select_name logger_variable.$number] + set project_html "$project_term: + " + template::multirow append tasks \ $task \ "" \ @@ -194,10 +216,9 @@ $task_dependency($task) \ $assignee_html \ $dependency_options_full \ - $variable_widget + $variable_widget \ + $project_html - - incr number } @@ -266,6 +287,8 @@ -number $new_tasks \ -current_number $number] + set project_html "" + # make sure deps are working. template::multirow append tasks \ @@ -282,7 +305,8 @@ $process_dependency($pt) \ $assignee_html \ $dependency_options_full \ - "" + "" \ + $project_html incr number } @@ -306,6 +330,8 @@ -number $new_tasks \ -current_number $i] + set project_html "" + # sorry this isn't internationalized. The choice is to cludge # around dates, or to cludge around ad_forms poor support for # multiple dates. @@ -324,7 +350,8 @@ "" \ $assignee_html \ $dependency_options_full \ - "" + "" \ + $project_html } } Index: openacs-4/contrib/packages/project-manager/www/task-calendar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-calendar.tcl,v diff -u -r1.1.2.6 -r1.1.2.7 --- openacs-4/contrib/packages/project-manager/www/task-calendar.tcl 26 Oct 2004 01:21:11 -0000 1.1.2.6 +++ openacs-4/contrib/packages/project-manager/www/task-calendar.tcl 3 Nov 2004 20:37:13 -0000 1.1.2.7 @@ -44,6 +44,13 @@ font-size: 80%; } +.calendar-item blockquote { + color: \#999; + display: block; + margin: 0em 0em 0.5em 0em; + font-size: 75%; +} + .calendar-item p { border-top: thin dotted grey; }