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 -N -r1.41 -r1.42 --- openacs-4/packages/project-manager/tcl/project-procs.tcl 24 Nov 2006 10:00:11 -0000 1.41 +++ openacs-4/packages/project-manager/tcl/project-procs.tcl 28 Jan 2007 15:59:05 -0000 1.42 @@ -2347,15 +2347,8 @@ set hours_to_complete 0 } - set date [lindex [split $task_deadline " "] 0] - set hours [lindex [split [lindex [split $task_deadline " "] 1] :] 0] - if {[string length $hours] > 1} { - set hours [string trimleft $hours] - } - set mins [lindex [split [lindex [split $task_deadline " "] 1] :] 1] - if {[string length $mins] > 1} { - set mins [string trimleft $mins] - } + + scan $task_deadline "%s %d:%d" date hours mins set mins [expr ($hours*60) + $mins] set date_j [dt_ansi_to_julian_single_arg $date] @@ -2456,16 +2449,7 @@ if {![info exists depends($task_item)]} { set earliest_start($task_item) $start_date - - set date [lindex [split $earliest_start($task_item) " "] 0] - set hours [lindex [split [lindex [split $earliest_start($task_item) " "] 1] :] 0] - if {[string length $hours] > 1} { - set hours [string trimleft $hours] - } - set mins [lindex [split [lindex [split $earliest_start($task_item) " "] 1] :] 1] - if {[string length $mins] > 1} { - set mins [string trimleft $mins] - } + scan $start_date "%s %d:%d" date hours mins set mins [expr ($hours*60) + $mins] set date_j [dt_ansi_to_julian_single_arg $date] @@ -2742,16 +2726,8 @@ 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} { - set hours [string trimleft $hours] - } - set mins [lindex [split [lindex [split $latest_finish($task_item) " "] 1] :] 1] - if {[string length $mins] > 1} { - set mins [string trimleft $mins] - } + + scan $latest_finish($task_item) "%s %d:%d" date hours mins set mins [expr ($hours*60) + $mins] set date_j [dt_ansi_to_julian_single_arg $date] @@ -2805,16 +2781,7 @@ ns_log Notice "setting activity_time($task_item) 0 (location 2)" } - 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} { - set hours [string trimleft $hours] - } - set hours [lc_parse_number $hours en_US] - set mins [lindex [split [lindex [split $latest_finish($task_item) " "] 1] :] 1] - if {[string length $mins] > 1} { - set mins [string trimleft $mins] - } + scan $latest_finish($task_item) "%s %d:%d" date hours mins set mins [expr ($hours*60) + $mins] set date_j [dt_ansi_to_julian_single_arg $date] set today_j $date_j