Index: openacs-4/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/project-manager.info,v
diff -u -r1.51 -r1.52
--- openacs-4/packages/project-manager/project-manager.info 5 Jun 2006 14:04:43 -0000 1.51
+++ openacs-4/packages/project-manager/project-manager.info 8 Jun 2006 14:48:13 -0000 1.52
@@ -67,7 +67,7 @@
-
+
Index: openacs-4/packages/project-manager/tcl/project-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-procs.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/project-manager/tcl/project-procs.tcl 5 Jun 2006 11:57:30 -0000 1.34
+++ openacs-4/packages/project-manager/tcl/project-procs.tcl 8 Jun 2006 14:48:14 -0000 1.35
@@ -2694,6 +2694,10 @@
set hours_to_complete $activity_time($task_item)
+ if {[string eq $hours_to_complete ""]} {
+ set hours_to_complete 0
+ }
+
set date [lindex [split $latest_finish($task_item) " "] 0]
set hours [lindex [split [lindex [split $latest_finish($task_item) " "] 1] :] 0]
if {[string length $hours] > 1} {
@@ -2769,6 +2773,11 @@
set mins [expr ($hours*60) + $mins]
set date_j [dt_ansi_to_julian_single_arg $date]
set today_j $date_j
+
+ if {[string eq $hours_to_complete ""]} {
+ set hours_to_complete 0
+ }
+
set mins_to_complete [expr $hours_to_complete * 60]
set t_total_mins $mins_to_complete
Index: openacs-4/packages/project-manager/templates/task-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-ae.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/project-manager/templates/task-ae.tcl 22 May 2006 06:16:44 -0000 1.9
+++ openacs-4/packages/project-manager/templates/task-ae.tcl 8 Jun 2006 14:48:14 -0000 1.10
@@ -457,10 +457,14 @@
set task_end_date_list [split $end_date(date) "-"]
append task_end_date_list " [lrange $task_end_time 3 5]"
+
+ if {$task_end_date_list eq ""} {
+ set end_date_sql "NULL"
+ } else {
+ set end_date(date) $task_end_date_list
+ set end_date_sql [pm::util::datenvl -value $end_date(date) -value_if_null "null" -value_if_not_null "to_timestamp('$end_date(date)','YYYY MM DD HH24 MI SS')"]
+ }
- set end_date(date) $task_end_date_list
- set end_date_sql [pm::util::datenvl -value $end_date(date) -value_if_null "null" -value_if_not_null "to_timestamp('$end_date(date)','YYYY MM DD HH24 MI SS')"]
-
if {[info exists log_date]} {
set log_date_split [split $log_date "-"]
set log_date_array(day) [lindex [set log_date_split] 2]