From 5dab18fe4456ca9a89a7455cf3782da0e0495ff2 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Mon, 26 Dec 2011 19:34:45 -0500
Subject: [PATCH] About to fix correct_map. Working save point

---
 courseware/capa_module.py      | 9 ++++++---
 courseware/html_module.py      | 9 ---------
 courseware/module_render.py    | 1 -
 courseware/schematic_module.py | 2 --
 courseware/video_module.py     | 2 --
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/courseware/capa_module.py b/courseware/capa_module.py
index eeb2c52d7e..eb3e651e45 100644
--- a/courseware/capa_module.py
+++ b/courseware/capa_module.py
@@ -7,7 +7,6 @@ from django.http import Http404
 import dateutil
 import datetime
 
-#from xml.dom.minidom import parse, parseString
 import content_parser
 
 import libxml2
@@ -68,7 +67,7 @@ class LoncapaModule(XModule):
 
         # User submitted a problem, and hasn't reset. We don't want
         # more submissions. 
-        if self.lcp.done and not self.rerandomize:
+        if self.lcp.done and self.rerandomize:
             #print "!"
             check_button = False
             save_button = False
@@ -235,7 +234,11 @@ class LoncapaModule(XModule):
         for key in get:
             answers['_'.join(key.split('_')[1:])]=get[key]
 
-        js=json.dumps(self.lcp.grade_answers(answers))
+        correct_map = self.lcp.grade_answers(answers)
+        success = False # TODO
+
+        js=json.dumps({'correct_map' : correct_map,
+                       'success' : success})
 
         return js
 
diff --git a/courseware/html_module.py b/courseware/html_module.py
index cdb3df3cd7..2f1134eff2 100644
--- a/courseware/html_module.py
+++ b/courseware/html_module.py
@@ -1,7 +1,5 @@
 from x_module import XModule
 
-from xml.dom.minidom import parse, parseString
-
 import json
 
 ## TODO: Abstract out from Django
@@ -23,10 +21,3 @@ class HtmlModule(XModule):
     def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None):
         print "item id" , item_id
         XModule.__init__(self, xml, item_id, ajax_url, track_url, state)
-
-#        template_source=module.getAttribute('filename')
-#    	return {'content':render_to_string(template_source, {})}
-
- #       print state
- #       if state!=None and "time" not in json.loads(state):
- #           self.video_time = 0
diff --git a/courseware/module_render.py b/courseware/module_render.py
index a8f506209a..d11effbf03 100644
--- a/courseware/module_render.py
+++ b/courseware/module_render.py
@@ -1,7 +1,6 @@
 from django.http import HttpResponse
 from django.template import Context, loader
 from djangomako.shortcuts import render_to_response, render_to_string
-from xml.dom.minidom import parse, parseString
 import json, os, sys
 from django.core.context_processors import csrf
 
diff --git a/courseware/schematic_module.py b/courseware/schematic_module.py
index 5921dd4e88..5a7fa390a0 100644
--- a/courseware/schematic_module.py
+++ b/courseware/schematic_module.py
@@ -1,7 +1,5 @@
 from x_module import XModule
 
-from xml.dom.minidom import parse, parseString
-
 import json
 
 ## TODO: Abstract out from Django
diff --git a/courseware/video_module.py b/courseware/video_module.py
index 0ec9f5c086..e94edb428b 100644
--- a/courseware/video_module.py
+++ b/courseware/video_module.py
@@ -1,7 +1,5 @@
 from x_module import XModule
 
-from xml.dom.minidom import parse, parseString
-
 import json
 
 ## TODO: Abstract out from Django