Merge pull request #1500 from MITx/700x-sandbox

700x sandbox

common/lib/capa/capa/responsetypes.py

@@ -633,9 +633,11 @@ class MultipleChoiceResponse(LoncapaResponse):
         # define correct choices (after calling secondary setup)
         xml = self.xml
         cxml = xml.xpath('//*[@id=$id]//choice', id=xml.get('id'))
+
         # contextualize correct attribute and then select ones for which
         # correct = "true"
-        self.correct_choices = [contextualize_text(choice.get('name'), self.context)
+        self.correct_choices = [
+            contextualize_text(choice.get('name'), self.context)
             for choice in cxml
             if contextualize_text(choice.get('correct'), self.context) == "true"]
 

common/lib/capa/capa/templates/designprotein2dinput.html

@@ -1,5 +1,5 @@
 <section id="designprotein2dinput_${id}" class="designprotein2dinput">
-    <div class="script_placeholder" data-src="/static/js/capa/protex/protex.nocache.js"/>
+    <div class="script_placeholder" data-src="/static/js/capa/protex/protex.nocache.js?raw"/>
     <div class="script_placeholder" data-src="${applet_loader}"/>
 
     % if status == 'unsubmitted':

common/static/js/capa/design-protein-2d.js

@@ -22,6 +22,15 @@
     // It calls protexIsReady with a deferred command when it has finished 
     // initialization and has drawn itself
     
+    function updateProtexField() {
+            var problem = $('#protex_container').parents('.problem');
+            var input_field = problem.find('input[type=hidden]');
+            var protex_answer = protexCheckAnswer();
+            var value = {protex_answer: protex_answer};
+            //console.log(JSON.stringify(value));
+            input_field.val(JSON.stringify(value));
+        }
+        
     protexIsReady = function() {
         //Load target shape
         var target_shape = $('#target_shape').val();
@@ -29,15 +38,18 @@
             
         //Get answer from protex and store it into the hidden input field
         //when Check button is clicked
-        var problem = $('#protex_container').parents('.problem');
-        var check_button = problem.find('input.check');
-        var input_field = problem.find('input[type=hidden]');
-        check_button.on('click', function() {
+        var fold_button = $("#fold-button");
+        fold_button.on('click', function(){
+            var problem = $('#protex_container').parents('.problem');
+            var input_field = problem.find('input[type=hidden]');
             var protex_answer = protexCheckAnswer();
             var value = {protex_answer: protex_answer};
+            //console.log(JSON.stringify(value));
             input_field.val(JSON.stringify(value));
-        });              
+        });
+        updateProtexField();              
     };
+
     
     /*function initializeProtex() {
         //Check to see if the two exported GWT functions protexSetTargetShape