Index: openacs-4/packages/xowf/xowf.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/xowf.info,v
diff -u -N -r1.12.2.37 -r1.12.2.38
--- openacs-4/packages/xowf/xowf.info	22 Jun 2021 07:15:00 -0000	1.12.2.37
+++ openacs-4/packages/xowf/xowf.info	22 Jun 2021 10:03:37 -0000	1.12.2.38
@@ -10,15 +10,15 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowf</auto-mount>
 
-    <version name="5.10.0d41" url="http://openacs.org/repository/download/apm/xowf-5.10.0d41.apm">
+    <version name="5.10.0d42" url="http://openacs.org/repository/download/apm/xowf-5.10.0d42.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.0d41"/>
+        <provides url="xowf" version="5.10.0d42"/>
         <requires url="xowiki" version="5.10.0d79"/>
         <requires url="xotcl-core" version="5.10.0d40"/>
         <requires url="acs-tcl" version="5.10.0d40"/>
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 -N -r1.2.2.51 -r1.2.2.52
--- openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml	25 Apr 2021 20:46:09 -0000	1.2.2.51
+++ openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml	22 Jun 2021 10:03:37 -0000	1.2.2.52
@@ -197,9 +197,9 @@
   <msg key="exam_review_not_possible">automatische Einsicht nicht m�glich</msg>
   <msg key="randomization_for_exam_ok">Randomisierung f�r Pr�fung geeignet</msg>
   <msg key="randomization_for_exam_not_ok">Randomisierung f�r Pr�fung nicht geeignet (keine Zufallsauswahl "immer" verwenden)</msg>
-  <msg key="panel_achievied_points_wi1">%achievedPoints% (gerundet %achievedPointsRounded%) von m�glichen %achievablePoints% Punkten, %percentage%%, Note: %grade%</msg>
-  <msg key="panel_achievied_points_wi1p">%achievedPoints% von m�glichen %achievablePoints% Punkten, %percentage%% (gerundet %percentageRounded%%), Note: %grade%</msg>
-  <msg key="panel_achievied_points_wi1_noround">%achievedPoints% von m�glichen %achievablePoints% Punkten, %percentage%%, Note: %grade%</msg>
+  <msg key="panel_achieved_points_wi1">%achievedPoints% (gerundet %achievedPointsRounded%) von m�glichen %totalPoints% Punkten, %percentage%%, Note: %grade%</msg>
+  <msg key="panel_achieved_points_wi1p">%achievedPoints% von m�glichen %totalPoints% Punkten, %percentage%% (gerundet %percentageRounded%%), Note: %grade%</msg>
+  <msg key="panel_achieved_points_wi1_noround">%achievedPoints% von m�glichen %totalPoints% Punkten, %percentage%%, Note: %grade%</msg>
 
   <msg key="test_item_name-validate_name">Name enth�lt zumindest ein ung�ltiges Zeichen</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 -N -r1.2.2.52 -r1.2.2.53
--- openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml	22 Jun 2021 07:15:00 -0000	1.2.2.52
+++ openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml	22 Jun 2021 10:03:37 -0000	1.2.2.53
@@ -217,9 +217,9 @@
   <msg key="randomization_for_exam_ok">randomization for exam ok</msg>
   <msg key="randomization_for_exam_not_ok">randomization for exam NOT ok ("always" should not be used)</msg>
 
-  <msg key="panel_achievied_points_wi1">%achievedPoints% (rounded %achievedPointsRounded%) of possible %achievablePoints% points, %percentage%%, grade: %grade%</msg>
-  <msg key="panel_achievied_points_wi1p">%achievedPoints% of possible %achievablePoints% points, %percentage%% (rounded %percentageRounded%%), grade: %grade%</msg>
-  <msg key="panel_achievied_points_wi1_noround">%achievedPoints% of possible %achievablePoints% points, %percentage%%, grade: %grade%</msg>
+  <msg key="panel_achieved_points_wi1">%achievedPoints% (rounded %achievedPointsRounded%) of possible %totalPoints% points, %percentage%%, grade: %grade%</msg>
+  <msg key="panel_achieved_points_wi1p">%achievedPoints% of possible %totalPoints% points, %percentage%% (rounded %percentageRounded%%), grade: %grade%</msg>
+  <msg key="panel_achieved_points_wi1_noround">%achievedPoints% of possible %totalPoints% points, %percentage%%, grade: %grade%</msg>
   <msg key="test_item_name-validate_name">Name contains at least one invalid character</msg>
 
   <msg key="Detail_configuration">Detailed Configuration</msg>
Index: openacs-4/packages/xowf/catalog/xowf.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.2.2.6 -r1.2.2.7
--- openacs-4/packages/xowf/catalog/xowf.es_ES.ISO-8859-1.xml	6 Apr 2021 13:20:18 -0000	1.2.2.6
+++ openacs-4/packages/xowf/catalog/xowf.es_ES.ISO-8859-1.xml	22 Jun 2021 10:03:37 -0000	1.2.2.7
@@ -216,8 +216,8 @@
   <msg key="randomization_for_exam_ok">aleatorizaci�n para el examen correcta</msg>
   <msg key="randomization_for_exam_not_ok">aleatorizaci�n para el examen incorrecta ("siempre" no deber�a usarse)</msg>
 
-  <msg key="panel_achievied_points_wi1">%achievedPoints% (redondeado%rounded%) de %totalPoints% puntos posibles, %percentage%%, nota: %grade%</msg>
-  <msg key="panel_achievied_points_wi1_noround">%achievedPoints% de %totalPoints% puntos posibles, %percentage%%, nota: %grade%</msg>
+  <msg key="panel_achieved_points_wi1">%achievedPoints% (redondeado%rounded%) de %totalPoints% puntos posibles, %percentage%%, nota: %grade%</msg>
+  <msg key="panel_achieved_points_wi1_noround">%achievedPoints% de %totalPoints% puntos posibles, %percentage%%, nota: %grade%</msg>
   <msg key="test_item_name-validate_name">Nombre contiene al menos un car�cter inv�lido</msg>
 
   <msg key="Detail_configuration">Configuraci�n detallada</msg>
Index: openacs-4/packages/xowf/catalog/xowf.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.it_IT.ISO-8859-1.xml,v
diff -u -N -r1.2.2.5 -r1.2.2.6
--- openacs-4/packages/xowf/catalog/xowf.it_IT.ISO-8859-1.xml	19 Mar 2021 10:43:59 -0000	1.2.2.5
+++ openacs-4/packages/xowf/catalog/xowf.it_IT.ISO-8859-1.xml	22 Jun 2021 10:03:37 -0000	1.2.2.6
@@ -134,8 +134,8 @@
   <msg key="online-exam-unpublish">Chiudi esame</msg>
   <msg key="open_submission_review">Apri correzione consegna studente</msg>
   <msg key="open_submission_review_title">Apri la correzione consegna degli studenti</msg>
-  <msg key="panel_achievied_points_wi1">%achievedPoints% (arrotondato %rounded%) di %totalPoints% punti totali, %percentage%%, voto: %grade%</msg>
-  <msg key="panel_achievied_points_wi1_noround">%achievedPoints% di %totalPoints% punti totali, %percentage%%, voto: %grade%</msg>
+  <msg key="panel_achieved_points_wi1">%achievedPoints% (arrotondato %rounded%) di %totalPoints% punti totali, %percentage%%, voto: %grade%</msg>
+  <msg key="panel_achieved_points_wi1_noround">%achievedPoints% di %totalPoints% punti totali, %percentage%%, voto: %grade%</msg>
   <msg key="participant">Partecipante</msg>
   <msg key="Participants">Partecipanti</msg>
   <msg key="participants_answered_question">i partecipanti hanno risposto a questa domanda</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 -N -r1.7.2.143 -r1.7.2.144
--- openacs-4/packages/xowf/tcl/test-item-procs.tcl	22 Jun 2021 07:15:01 -0000	1.7.2.143
+++ openacs-4/packages/xowf/tcl/test-item-procs.tcl	22 Jun 2021 10:03:37 -0000	1.7.2.144
@@ -4690,19 +4690,24 @@
       # Return a numeric grade based on achieved_points dict and
       # percentage_mapping. On invalid data, return 0.
       #
+      # Important dict members of "achieved_points":
+      #  - achievedPoints: points that the student has achieved in her exam
+      #  - achievablePoints: points that the student could have achieved so far
+      #  - totalPoints: points that the student can achieve when finishing the exam
+      #
       #     achieved_points:    {achievedPoints 4.0 achievablePoints 4 totalPoints 4}
       #     percentage_mapping: {50.0 60.0 70.0 80.0}
       #
-      if {![dict exists $achieved_points achievablePoints] && [dict exists $achieved_points totalPoints]} {
-        ns_log warning "test_item::grading legacy call, use 'achievablePoints' instead of 'totalPoints'"
-        dict set achieved_points achievablePoints [dict get $achieved_points totalPoints]
-      }
+      #if {![dict exists $achieved_points achievablePoints] && [dict exists $achieved_points totalPoints]} {
+      #  ns_log warning "test_item::grading legacy call, use 'achievablePoints' instead of 'totalPoints'"
+      #  dict set achieved_points achievablePoints [dict get $achieved_points totalPoints]
+      #}
       if {![info exists percentage]} {
-        if {[dict exists $achieved_points achievablePoints] && [dict get $achieved_points achievablePoints] > 0} {
+        if {[dict exists $achieved_points totalPoints] && [dict get $achieved_points totalPoints] > 0} {
           set percentage \
               [format %.2f [expr {
                                   ($points*100/
-                                   [dict get $achieved_points achievablePoints]) + 0.00001
+                                   [dict get $achieved_points totalPoints]) + 0.00001
                                 }]]
         }
       } else {
@@ -4746,6 +4751,7 @@
       foreach key {
         achievedPoints
         achievablePoints
+        totalPoints
       } {
         if {![dict exists $achieved_points $key]} {
           ns_log warning "test_item::grading dict without $key: $achieved_points"
@@ -4757,7 +4763,7 @@
         dict set achieved_points achievedPointsRounded [format %.0f $achievedPoints]
         set achievablePoints [format %.2f $achievablePoints]
         set achievedPoints   [format %.2f $achievedPoints]
-        set percentage  [format %.2f [expr {$achievablePoints > 0 ? ($achievedPoints*100.0/$achievablePoints) : 0}]]
+        set percentage  [format %.2f [expr {$totalPoints > 0 ? ($achievedPoints*100.0/$totalPoints) : 0}]]
         dict set achieved_points percentage $percentage
         dict set achieved_points percentageRounded [format %.0f $percentage]
       }
@@ -4773,7 +4779,7 @@
       set achieved_points  [:complete_dict $achieved_points]
       set grade            [:grade -achieved_points $achieved_points]
       dict with achieved_points {
-        set panelHTML [_ xowf.panel_achievied_points_wi1]
+        set panelHTML [_ xowf.panel_achieved_points_wi1]
         return [list panel $panelHTML csv [subst {$achievedPoints\t$achievedPointsRounded\t$percentage%\t$grade}]]
       }
     }
@@ -4793,7 +4799,7 @@
       set achieved_points  [:complete_dict $achieved_points]
       set grade            [:grade -achieved_points $achieved_points]
       dict with achieved_points {
-        set panelHTML [_ xowf.panel_achievied_points_wi1p]
+        set panelHTML [_ xowf.panel_achieved_points_wi1p]
         return [list panel $panelHTML csv [subst {$achievedPoints\t$percentage%\t$percentageRounded%\t$grade}]]
       }
     }
@@ -4815,7 +4821,7 @@
         set achieved_points  [:complete_dict $achieved_points]
         set grade            [:grade -achieved_points $achieved_points]
         dict with achieved_points {
-          set panelHTML [_ xowf.panel_achievied_points_wi1_noround]
+          set panelHTML [_ xowf.panel_achieved_points_wi1_noround]
           return [list panel $panelHTML csv [subst {$achievedPoints\t$percentage%\t$grade}]]
         }
       }