Index: openacs-4/contrib/packages/project-manager/www/task-add-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit-2.tcl,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/contrib/packages/project-manager/www/task-add-edit-2.tcl 11 Nov 2004 00:24:26 -0000 1.1.2.3 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit-2.tcl 19 Nov 2004 22:43:22 -0000 1.1.2.4 @@ -29,13 +29,15 @@ {use_dependency:array ""} {edit_p "f"} {using_process_p "f"} - {end_date_format:multiple ""} {end_date_month:multiple ""} {end_date_day:multiple ""} {end_date_year:multiple ""} return_url:optional {send_email_p "t"} {hours:array ""} + {log_month:multiple ""} + {log_day:multiple ""} + {log_year:multiple ""} {log:array ""} {logger_variable:array ""} } -properties { @@ -58,12 +60,18 @@ set end_date_${i}(day) [lindex $end_date_day [expr $i -1]] set end_date_${i}(month) [lindex $end_date_month [expr $i -1]] set end_date_${i}(year) [lindex $end_date_year [expr $i - 1]] - set end_date_${i}(format) [lindex $end_date_format [expr $i -1]] + set end_date_${i}(format) "" ad_page_contract_filter_proc_date end_date_$i end_date_$i -} + set log_date_${i}(day) [lindex $log_day [expr $i -1]] + set log_date_${i}(month) [lindex $log_month [expr $i -1]] + set log_date_${i}(year) [lindex $log_year [expr $i - 1]] + set log_date_${i}(format) "" + ad_page_contract_filter_proc_date log_date_$i log_date_$i +} + if {[string is true $edit_p]} { # ------- @@ -130,6 +138,7 @@ -project_item_id $project_item_id($num)] if {[exists_and_not_null hours($num)]} { + pm::project::log_hours \ -logger_project_id $logger_project \ -variable_id $logger_variable($num) \ @@ -138,7 +147,8 @@ -task_item_id $task_item_id($num) \ -project_item_id $project_item_id($num) \ -update_status_p f \ - -party_id $user_id + -party_id $user_id \ + -timestamp_ansi [set log_date_${num}(date)] } # --------- @@ -196,11 +206,13 @@ # add in the dependencies # ----------------------- foreach num $number { - pm::task::dependency_add \ - -task_item_id $task_item_id($num) \ - -parent_id $dependency($num) \ - -dependency_type finish_before_start \ - -project_item_id $project_item_id($num) + if {[exists_and_not_null dependency($num)]} { + pm::task::dependency_add \ + -task_item_id $task_item_id($num) \ + -parent_id $dependency($num) \ + -dependency_type finish_before_start \ + -project_item_id $project_item_id($num) + } } } else {