From ce7444780bf5e9528fa3244957ed80b9cbfe7b00 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 7 Nov 2012 11:53:01 -0500
Subject: [PATCH] Add in feedback, work on css to display open ended feedback

---
 common/lib/capa/capa/responsetypes.py            | 10 +++++++---
 common/lib/xmodule/xmodule/css/capa/display.scss | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index d12e451b7a..4eaaa1607f 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -1937,6 +1937,7 @@ class OpenEndedResponse(LoncapaResponse):
         return cmap
 
     def update_score(self, score_msg, oldcmap, queuekey):
+        log.debug(score_msg)
         (valid_score_msg, correct, points, msg) = self._parse_score_msg(score_msg)
         if not valid_score_msg:
             oldcmap.set(self.answer_id,
@@ -1996,17 +1997,20 @@ class OpenEndedResponse(LoncapaResponse):
             log.error("External grader message should be a JSON-serialized dict."
                       " Received score_result = %s" % score_result)
             return fail
-        for tag in ['correct', 'score', 'msg']:
+        for tag in ['correct', 'score', 'msg', 'feedback']:
             if tag not in score_result:
                 log.error("External grader message is missing one or more required"
-                          " tags: 'correct', 'score', 'msg'")
+                          " tags: 'correct', 'score', 'msg', 'feedback")
                 return fail
+        #Extract feedback from score_result
+        feedback = score_result['feedback']
 
         # Next, we need to check that the contents of the external grader message
         #   is safe for the LMS.
         # 1) Make sure that the message is valid XML (proper opening/closing tags)
         # 2) TODO: Is the message actually HTML?
         msg = score_result['msg']
+
         try:
             etree.fromstring(msg)
         except etree.XMLSyntaxError as err:
@@ -2014,7 +2018,7 @@ class OpenEndedResponse(LoncapaResponse):
                       " XML: score_msg['msg']=%s" % msg)
             return fail
 
-        return (True, score_result['correct'], score_result['score'], msg)
+        return (True, score_result['correct'], score_result['score'], feedback)
 
 #-----------------------------------------------------------------------------
 # TEMPORARY: List of all response subclasses
diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index fd67a3804e..098100f297 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -685,6 +685,21 @@ section.problem {
             color: #B00;
           }
         }
+
+        .markup-text{
+          margin: 5px;
+          padding: 20px 0px 15px 50px;
+          border-top: 1px solid #DDD;
+          border-left: 20px solid #FAFAFA;
+
+          .badspelling {
+            color: #BB0000;
+          }
+
+          .badgrammar {
+            color: #BDA046;
+          }
+        }
       }
     }
   }