Index: openacs-4/packages/xowf/xowf.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/xowf.info,v
diff -u -r1.12.2.28 -r1.12.2.29
--- openacs-4/packages/xowf/xowf.info	4 Feb 2021 13:22:16 -0000	1.12.2.28
+++ openacs-4/packages/xowf/xowf.info	9 Feb 2021 14:34:06 -0000	1.12.2.29
@@ -10,16 +10,16 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowf</auto-mount>
     
-    <version name="5.10.0d32" url="http://openacs.org/repository/download/apm/xowf-5.10.0d32.apm">
+    <version name="5.10.0d33" url="http://openacs.org/repository/download/apm/xowf-5.10.0d33.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>XoWiki Content Flow - an XoWiki based workflow system implementing state-based behavior of wiki pages and forms</summary>
         <release-date>2017-08-06</release-date>
         <vendor url="http://wu.ac.at">WU Vienna</vendor>
 	<license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowf" version="5.10.0d32"/>
-        <requires url="xowiki" version="5.10.0d72"/>
+        <provides url="xowf" version="5.10.0d33"/>
+        <requires url="xowiki" version="5.10.0d73"/>
         <requires url="xotcl-core" version="5.10.0d36"/>
 	<requires url="acs-tcl" version="5.10.0d40"/>
         <requires url="acs-automated-testing" version="5.10.0d9"/>
Index: openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml,v
diff -u -r1.2.2.44 -r1.2.2.45
--- openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml	18 Jan 2021 14:20:51 -0000	1.2.2.44
+++ openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml	9 Feb 2021 14:34:06 -0000	1.2.2.45
@@ -164,10 +164,18 @@
   <msg key="Allow_paste_help_text">Darf der Studierende in mehrzeiligen Textfeldern Ausschneiden und Einf�gen verwenden?</msg>
   <msg key="Cut_and_paste_allowed">Ausschneiden und Einf�gen in mehrzeiligen Textfeldern ist erlaubt</msg>
   <msg key="Cut_and_paste_not_allowed">Ausschneiden und Einf�gen in mehrzeiligen Textfeldern ist nicht erlaubt</msg>
+  <msg key="Show_points">Punkteanzeige</msg>
+  <msg key="Show_points_help_text">Zeige Studierenden w�hrend der Pr�fung die erreichbaren Punkte pro Beispiel</msg>
+  <msg key="Show_minutes">Minutenanzeige</msg>
+  <msg key="Show_minutes_help_text">Zeige Studierenden w�hrend der Pr�fung die vorgesehen Bearbeitsdauer pro Beispiel</msg>
+  <msg key="Time_budget">Zeitbudget</msg>
+  <msg key="Time_budget_help_text">Erh�he die Bearbeitungsdauer auf den angef�hren relativen Wert</msg>
 
   <msg key="Max_items">Beschr�nkte Fragenzahl</msg>
   <msg key="Max_items_help_text">Beschr�nke die Zahl der Fragen auf
-  diesen Wert. Sinnvoll in Kombination mit randomisierter Fragenfolge, jeder Student sieht potentiell andere X von Y Fragen. Einschr�nkung: Alle Fragen m�ssen gleiche Dauer haben,</msg>
+  diesen Wert. Sinnvoll in Kombination mit randomisierter Fragenfolge,
+  jeder Student sieht potentiell andere X von Y Fragen. Einschr�nkung:
+  Alle Fragen m�ssen gleiche Dauer/Punkte aufweisen.</msg>
   <msg key="Max_items_ok">Beschr�nkung auf %n% Fragen ok, zeige Studierenden %n% von </msg>
   <msg key="Max_items_not_ok_duration">Beschr�nkung auf %n% Fragen NICHT ok (unterschiedliche Dauer), </msg>
   <msg key="Max_items_not_ok_number">Beschr�nkung auf %n% Fragen NICHT ok (Fragenanzahl zu gering), </msg>
Index: openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml,v
diff -u -r1.2.2.42 -r1.2.2.43
--- openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml	18 Jan 2021 14:20:51 -0000	1.2.2.42
+++ openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml	9 Feb 2021 14:34:06 -0000	1.2.2.43
@@ -182,9 +182,15 @@
   <msg key="Allow_paste_help_text">Is the student allowed to use cut and paste in multiline text fields?</msg>
   <msg key="Cut_and_paste_allowed">Cut and Paste is allowed in multi-line text fields</msg>
   <msg key="Cut_and_paste_not_allowed">Cut and Paste is not allowed in multi-line text fields</msg>
+  <msg key="Show_points">Show points</msg>
+  <msg key="Show_points_help_text">Show student points during exam</msg>
+  <msg key="Show_minutes">Show minutes</msg>
+  <msg key="Show_minutes_help_text">Show student minutes during exam</msg>
+  <msg key="Time_budget">Time budget</msg>
+  <msg key="Time_budget_help_text">Increase time budget for handicapped students</msg>
 
   <msg key="Max_items">Restrict Items</msg>
-  <msg key="Max_items_help_text">Restrict item selection to this number of Items (requires same number weight of every item)</msg>
+  <msg key="Max_items_help_text">Restrict item selection to this number of items (requires same weight of every item)</msg>
   <msg key="Max_items_ok">Restriction to %n% items ok, %n% of </msg>
   <msg key="Max_items_not_ok_duration">Item Restriction to %n% items NOT ok (duration varies), </msg>
   <msg key="Max_items_not_ok_number">Item Restriction to %n% items NOT ok (not enough test items), </msg>
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.109 -r1.7.2.110
--- openacs-4/packages/xowf/tcl/test-item-procs.tcl	9 Feb 2021 05:25:47 -0000	1.7.2.109
+++ openacs-4/packages/xowf/tcl/test-item-procs.tcl	9 Feb 2021 14:34:06 -0000	1.7.2.110
@@ -2935,6 +2935,20 @@
           ns_log notice "[$form_obj name]: NO POINTS, default to minutes $minutes"
           set points $minutes
         }
+        set time_budget [$obj property time_budget]
+        ns_log notice "[$form_obj name]: TIME BUDGET '$time_budget'"
+        if {$time_budget ni {"" 100}} {
+          set minutes [expr {$time_budget*$minutes/100.0}]
+          ns_log notice "[$form_obj name]: TIME BUDGET '$time_budget' -> minutes set to $minutes"
+          ns_log notice "[$form_obj name]: [$obj instance_attributes]"
+        }
+        set mapping {show_points with_points show_minutes with_minutes}
+        foreach property {show_points show_minutes} {
+          if {[$obj property $property] ne ""} {
+            set [dict get $mapping $property] [$obj property $property]
+            ns_log notice "[$form_obj name]: override flag via exam setting: '$property' -> [$obj property $property]"
+          }
+        }
         set title ""
         if {$number ne ""} {
           append title "#xowf.question# $number:"
@@ -3237,7 +3251,7 @@
         set base_clock [clock scan [::xo::db::tcl_date $base_time tz]]
         set secfrac 0
       }
-      set target_time [clock format [expr {$base_clock + $total_minutes * 60}] \
+      set target_time [clock format [expr {int($base_clock + $total_minutes * 60)}] \
                            -format %Y-%m-%dT%H:%M:%S]
       ns_log notice "exam_target_time $base_time base clock $base_clock + total_minutes $total_minutes = ${target_time}.$secfrac"
       return ${target_time}.$secfrac
@@ -3294,15 +3308,15 @@
     :public method current_question_number {obj:object} {
       #
       # Translate the position of an object into its question number
-      # (as e.g. used by current_question_title)
+      # (as e.g. used by current_question_title).
       #
       return [expr {[$obj property position] + 1}]
     }
 
     :public method current_question_title {{-with_numbers:switch false} obj:object} {
       #
       # In case, with_numbers is provided, return a internationalized
-      # title for the question, such as "Question 1"
+      # title for the question, such as "Question 1".
       #
       if {$with_numbers} {
         return "#xowf.question# [:current_question_number $obj]"
Index: openacs-4/packages/xowf/www/prototypes/select_question.form.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/prototypes/Attic/select_question.form.page,v
diff -u -r1.1.2.11 -r1.1.2.12
--- openacs-4/packages/xowf/www/prototypes/select_question.form.page	23 Nov 2020 11:50:42 -0000	1.1.2.11
+++ openacs-4/packages/xowf/www/prototypes/select_question.form.page	9 Feb 2021 14:34:06 -0000	1.1.2.12
@@ -8,7 +8,7 @@
         @question@
         <h4>#xowf.Detail_configuration#</h4>
         <p><button type="button" class="btn btn-small" data-toggle="collapse" data-target="#question_management"><span class="glyphicon glyphicon-chevron-down">&nbsp;</span>#xowf.Question_management#</button><div id="question_management" class="collapse">        
-        @shuffle_items@ @max_items@ @allow_paste@
+        @shuffle_items@ @max_items@ @allow_paste@ @show_minutes@ @show_points@ @time_budget@
         </div>
         <p><button type="button" class="btn btn-small" data-toggle="collapse" data-target="#time_management"><span class="glyphicon glyphicon-chevron-down">&nbsp;</span>#xowf.Time_management#</button><div id="time_management" class="collapse">
         @synchronized@ @time_window@
@@ -27,6 +27,9 @@
 	{shuffle_items:boolean,horizontal=true,label=#xowf.randomized_items#,help_text=#xowf.randomized_items_help_text#}
 	{max_items:number,min=1,label=#xowf.Max_items#,help_text=#xowf.Max_items_help_text#}
 	{allow_paste:boolean,horizontal=true,default=t,label=#xowf.Allow_paste#,help_text=#xowf.Allow_paste_help_text#}
+        {show_minutes:boolean,horizontal=true,default=t,label=#xowf.Show_minutes#,help_text=#xowf.Show_minutes_help_text#}
+        {show_points:boolean,horizontal=true,default=t,label=#xowf.Show_points#,help_text=#xowf.Show_points_help_text#}
+        {time_budget:range,default=100,min=100,max=300,step=10,with_output=t,form_item_wrapper_CSSclass=form-inline,output_suffix=%,label=#xowf.Time_budget#,help_text=#xowf.Time_budget_help_text#}
 	{synchronized:boolean,horizontal=true,default=f,label=#xowf.Synchronized#,help_text=#xowf.Synchronized_help_text#}
 	{time_window:time_span,label=#xowf.Exam_time_window#,help_text=#xowf.Exam_time_window_help_text#}
 	{signature:boolean,horizontal=true,default=f,label=#xowf.Signature#,help_text=#xowf.Signature_help_text#}