Index: openacs-4/packages/xowf/tcl/test-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test-item-procs.tcl,v diff -u -r1.7.2.12 -r1.7.2.13 --- openacs-4/packages/xowf/tcl/test-item-procs.tcl 29 Nov 2019 07:24:47 -0000 1.7.2.12 +++ openacs-4/packages/xowf/tcl/test-item-procs.tcl 13 Dec 2019 17:56:28 -0000 1.7.2.13 @@ -1315,6 +1315,7 @@ :object method question_info { {-numbers ""} {-with_title:switch false} + {-with_minutes:switch false} form_objs } { set full_form {} @@ -1324,18 +1325,24 @@ foreach form_obj $form_objs number $numbers { set form_obj [::xowf::test_item::renaming_form_loader rename_attributes $form_obj] set form_title [$form_obj title] + set minutes [:question_property $form_obj minutes] set title "" if {$number ne ""} { append title "#xowf.question# $number:" } if {$with_title} { append title " $form_title" } + if {$with_minutes} { + append title " - [:minutes_string $form_obj]" + } + append full_form "

$title

\n" append full_form [$form_obj property form] \n lappend title_infos \ + full_title $title \ title $form_title \ - minutes [:question_property $form_obj minutes] \ + minutes $minutes \ number $number lappend full_fc [$form_obj property form_constraints] lappend full_disabled_fc [$form_obj property disabled_form_constraints] @@ -1376,6 +1383,7 @@ :public object method combined_question_form { {-with_numbers:switch false} {-with_title:switch false} + {-with_minutes:switch false} obj:object } { set form_objs [:question_objs $obj] @@ -1384,10 +1392,15 @@ for {set i 1} {$i <= [llength $form_objs]} {incr i} { lappend numbers $i } - return [:question_info -with_title=$with_title -numbers $numbers $form_objs] + set extra_flags [list -numbers $numbers] } else { - return [:question_info -with_title=$with_title $form_objs] + set extra_flags "" } + return [:question_info \ + -with_title=$with_title \ + -with_minutes=$with_minutes \ + {*}$extra_flags \ + $form_objs] } :public object method current_question_form { @@ -1402,6 +1415,7 @@ {-position:integer} {-with_numbers:switch false} {-with_title:switch false} + {-with_minutes:switch false} obj:object } { if {![info exists position]} { @@ -1410,10 +1424,15 @@ set form_objs [:nth_question_obj $obj $position] if {$with_numbers} { set number [expr {$position + 1}] - return [:question_info -with_title=$with_title -numbers $number $form_objs] + set extra_flags [list -numbers $number] } else { - return [:question_info -with_title=$with_title $form_objs] + set extra_flags "" } + return [:question_info \ + -with_title=$with_title \ + -with_minutes=$with_minutes \ + {*}$extra_flags \ + $form_objs] } :public object method current_question_number {obj:object} {