Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.284.2.71 -r1.284.2.72
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	26 Jan 2020 18:05:12 -0000	1.284.2.71
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	26 Jan 2020 19:55:23 -0000	1.284.2.72
@@ -34,6 +34,7 @@
     {inline false}
     {mode edit}
     {disabled}
+    {disabled_as_div}
     {show_raw_value}
 
     {style}
@@ -73,7 +74,7 @@
     correct_when
     feedback_answer_correct
     feedback_answer_incorrect
-    disabled_as_div
+    grading
   }
   FormField set abstract 1
 
@@ -785,6 +786,13 @@
         append feedback " ${:correction}"
         if {[info exists :correction_data]} {
           append feedback " ${:correction_data}"
+          if {[info exists :grading]
+              && [dict exists ${:correction_data} scores ${:grading}]
+            } {
+            set grading_score [dict get ${:correction_data} scores ${:grading}]
+            #:log "=== grading ${:grading} => $grading_score"
+            append feedback " selected_grading_score $grading_score"
+          }
         }
       }
       #
@@ -3506,13 +3514,13 @@
               set wi2 $wi1
             }
           }
-          set s1  [expr {100.0 * $R / ($R + $W) }]
-          set s2  [expr {100.0 * ($R - $W/2.0) / ($R + $W) }]
-          set etk [expr {100.0 * (($r*1.0+$f) /$r) * ($rk - $fk) / ($R + $W) }]
-          set et1 [expr {100.0 * ($R - $W) / ($R + $W) }]
-          set et2 [expr {100.0 * ($R - $W*0.5) / ($R + $W) }]
+          set s1   [expr {100.0 * $R / ($R + $W) }]
+          set s2   [expr {100.0 * ($R - $W/2.0) / ($R + $W) }]
+          set etk  [expr {100.0 * (($r*1.0+$f) /$r) * ($rk - $fk) / ($R + $W) }]
+          set ggw0 [expr {100.0 * ($R - $W) / ($R + $W) }]
+          set ggw  [expr {100.0 * ($R - $W*0.5) / ($R + $W) }]
 
-          set scores [list wi1 $wi1 wi2 $wi2 s1 $s1 s2 $s2 etk $etk et1 $et1 et2 $et2]
+          set scores [list wi1 $wi1 wi2 $wi2 s1 $s1 s2 $s2 etk $etk ggw0 $ggw0 ggw $ggw]
         } else {
           set scores {}
         }