Index: openacs-4/contrib/packages/simulation/www/simbuild/task-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/task-edit.tcl,v diff -u -r1.34 -r1.35 --- openacs-4/contrib/packages/simulation/www/simbuild/task-edit.tcl 30 Jan 2004 11:17:16 -0000 1.34 +++ openacs-4/contrib/packages/simulation/www/simbuild/task-edit.tcl 11 Mar 2004 16:54:11 -0000 1.35 @@ -183,23 +183,23 @@ switch $trigger_type { user - message - workflow - parallel - dynamic { ad_form -extend -name task -form { - {timeout_seconds:integer(text),optional + {timeout_hours:integer(text),optional {label "Timeout"} - {after_html "seconds"} + {after_html "hours"} } } } time { ad_form -extend -name task -form { - {timeout_seconds:integer(text) + {timeout_hours:integer(text) {label "Timeout"} - {after_html "seconds"} + {after_html "hours"} } } } default { ad_form -extend -name task -form { - {timeout_seconds:integer(hidden),optional} + {timeout_hours:integer(hidden),optional} } } } @@ -266,11 +266,16 @@ foreach elm { pretty_name new_state_id assigned_role recipient_roles - attachment_num trigger_type timeout_seconds parent_action_id + attachment_num trigger_type parent_action_id } { set $elm $task_array($elm) } + set timeout_hours "" + if { ![empty_string_p $task_array(timeout_seconds)] } { + set timeout_hours [expr $task_array(timeout_seconds) / 3600] + } + } -new_request { permission::require_write_permission -object_id $workflow_id @@ -311,13 +316,17 @@ foreach elm { pretty_name pretty_past_tense assigned_role description description_mime_type - new_state_id timeout_seconds + new_state_id recipient_roles attachment_num trigger_type parent_action_id } { if { [info exists $elm] } { set row($elm) [set $elm] } } + set row(timeout_seconds) "" + if { ![empty_string_p $timeout_hours] } { + set row(timeout_seconds) [expr $timeout_hours * 3600] + } set row(short_name) {} } -new_data { Index: openacs-4/packages/simulation/www/simbuild/task-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/task-edit.tcl,v diff -u -r1.34 -r1.35 --- openacs-4/packages/simulation/www/simbuild/task-edit.tcl 30 Jan 2004 11:17:16 -0000 1.34 +++ openacs-4/packages/simulation/www/simbuild/task-edit.tcl 11 Mar 2004 16:54:11 -0000 1.35 @@ -183,23 +183,23 @@ switch $trigger_type { user - message - workflow - parallel - dynamic { ad_form -extend -name task -form { - {timeout_seconds:integer(text),optional + {timeout_hours:integer(text),optional {label "Timeout"} - {after_html "seconds"} + {after_html "hours"} } } } time { ad_form -extend -name task -form { - {timeout_seconds:integer(text) + {timeout_hours:integer(text) {label "Timeout"} - {after_html "seconds"} + {after_html "hours"} } } } default { ad_form -extend -name task -form { - {timeout_seconds:integer(hidden),optional} + {timeout_hours:integer(hidden),optional} } } } @@ -266,11 +266,16 @@ foreach elm { pretty_name new_state_id assigned_role recipient_roles - attachment_num trigger_type timeout_seconds parent_action_id + attachment_num trigger_type parent_action_id } { set $elm $task_array($elm) } + set timeout_hours "" + if { ![empty_string_p $task_array(timeout_seconds)] } { + set timeout_hours [expr $task_array(timeout_seconds) / 3600] + } + } -new_request { permission::require_write_permission -object_id $workflow_id @@ -311,13 +316,17 @@ foreach elm { pretty_name pretty_past_tense assigned_role description description_mime_type - new_state_id timeout_seconds + new_state_id recipient_roles attachment_num trigger_type parent_action_id } { if { [info exists $elm] } { set row($elm) [set $elm] } } + set row(timeout_seconds) "" + if { ![empty_string_p $timeout_hours] } { + set row(timeout_seconds) [expr $timeout_hours * 3600] + } set row(short_name) {} } -new_data {