Skip to content

E
edx-platform
Commit 60f13379 by Muhammad Ammar Committed by GitHub
Options

Merge pull request #12912 from edx/ammar/capa-update-templates-and-move-solution-tag 

remove solution tag from inputtypes and update default templates
parents f3baf4cf ad0a9fe8
Showing with 252 additions and 252 deletions
cms/djangoapps/contentstore/tests/test_crud.py
...@@ -36,7 +36,7 @@ class TemplateTests(ModuleStoreTestCase): ...@@ -36,7 +36,7 @@ class TemplateTests(ModuleStoreTestCase):
self.assertIn('markdown', dropdown['metadata']) self.assertIn('markdown', dropdown['metadata'])
self.assertIn('data', dropdown) self.assertIn('data', dropdown)
self.assertRegexpMatches(dropdown['metadata']['markdown'], r'^Dropdown.*') self.assertRegexpMatches(dropdown['metadata']['markdown'], r'^Dropdown.*')
self.assertRegexpMatches(dropdown['data'], r'<problem>\s*<p>Dropdown.*') self.assertRegexpMatches(dropdown['data'], r'<problem>\s*<optionresponse>\s*<p>Dropdown.*')
def test_get_some_templates(self): def test_get_some_templates(self):
self.assertEqual(len(SequenceDescriptor.templates()), 0) self.assertEqual(len(SequenceDescriptor.templates()), 0)
......
common/lib/capa/capa/capa_problem.py
...@@ -846,7 +846,7 @@ class LoncapaProblem(object): ...@@ -846,7 +846,7 @@ class LoncapaProblem(object):
answer_id = 1 answer_id = 1
input_tags = inputtypes.registry.registered_tags() input_tags = inputtypes.registry.registered_tags()
inputfields = tree.xpath( inputfields = tree.xpath(
"|".join(['//' + response.tag + '[@id=$id]//' + x for x in input_tags + solution_tags]), "|".join(['//' + response.tag + '[@id=$id]//' + x for x in input_tags]),
id=response_id_str id=response_id_str
) )
......
common/lib/xmodule/xmodule/js/src/problem/edit.coffee
...@@ -582,10 +582,6 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor ...@@ -582,10 +582,6 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
// make selector to search responsetypes in xml // make selector to search responsetypes in xml
var responseTypesSelector = responseTypes.join(', '); var responseTypesSelector = responseTypes.join(', ');
// these will be placed at outside the end of responsetype
var independentTagNames = ['solution'];
var independentTagNodes = [];
// make temporary xml // make temporary xml
// safe-lint: disable=javascript-concat-html // safe-lint: disable=javascript-concat-html
var $xml = $($.parseXML('<prob>' + xml + '</prob>')); var $xml = $($.parseXML('<prob>' + xml + '</prob>'));
...@@ -609,11 +605,6 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor ...@@ -609,11 +605,6 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
child = $('<label>' + child.textContent + '</label>')[0]; child = $('<label>' + child.textContent + '</label>')[0];
} }
if (_.contains(independentTagNames, child.nodeName)) {
independentTagNodes.push(child)
return;
}
if (beforeInputtype) { if (beforeInputtype) {
// safe-lint: disable=javascript-jquery-insert-into-target // safe-lint: disable=javascript-jquery-insert-into-target
responseType[0].insertBefore(child, inputtype); responseType[0].insertBefore(child, inputtype);
...@@ -623,10 +614,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor ...@@ -623,10 +614,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
}) })
var serializer = new XMLSerializer(); var serializer = new XMLSerializer();
// combine responsetype and independent tags xml = serializer.serializeToString(responseType[0]);
xml = serializer.serializeToString(responseType[0]) + '\n\n' + _.map(independentTagNodes, function(node){
return serializer.serializeToString(node)
}).join('\n\n');
// remove xmlns attribute added by the serializer // remove xmlns attribute added by the serializer
xml = xml.replace(/\sxmlns=['"].*?['"]/gi, ''); xml = xml.replace(/\sxmlns=['"].*?['"]/gi, '');
......
common/lib/xmodule/xmodule/templates/problem/checkboxes_response.yaml
...@@ -23,25 +23,24 @@ metadata: ...@@ -23,25 +23,24 @@ metadata:
data: | data: |
<problem> <problem>
<choiceresponse>
<p>Checkbox problems allow learners to select multiple options. Learners can see all the options along with the problem text.</p> <p>Checkbox problems allow learners to select multiple options. Learners can see all the options along with the problem text.</p>
<p>When you add the component, be sure to select <strong>Settings</strong> <p>When you add the problem, be sure to select Settings to specify a Display Name and other values that apply.</p>
to specify a <strong>Display Name</strong> and other values that apply.</p>
<p>You can use the following example problem as a model.</p> <p>You can use the following example problem as a model.</p>
<p>The following languages are in the Indo-European family:</p> <label>The following languages are in the Indo-European family:</label>
<choiceresponse> <checkboxgroup label="The following languages are in the Indo-European family:">
<checkboxgroup> <choice correct="true">Urdu</choice>
<choice correct="true" name="urdu">Urdu</choice> <choice correct="false">Finnish</choice>
<choice correct="false" name="finnish">Finnish</choice> <choice correct="true">Marathi</choice>
<choice correct="true" name="marathi">Marathi</choice> <choice correct="true">French</choice>
<choice correct="true" name="french">French</choice> <choice correct="false">Hungarian</choice>
<choice correct="false" name="hungarian">Hungarian</choice>
</checkboxgroup> </checkboxgroup>
</choiceresponse> <p>Note: Make sure you select all of the correct options—there may be more than one!</p>
<p><strong>Note</strong>: Make sure you select all of the correct options—there may be more than one!</p>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
<p>Urdu, Marathi, and French are all Indo-European languages, while Finnish and Hungarian are in the Uralic family.</p> <p>Urdu, Marathi, and French are all Indo-European languages, while Finnish and Hungarian are in the Uralic family.</p>
</div> </div>
</solution> </solution>
</choiceresponse>
</problem> </problem>
common/lib/xmodule/xmodule/templates/problem/checkboxes_response_hint.yaml
...@@ -30,18 +30,14 @@ metadata: ...@@ -30,18 +30,14 @@ metadata:
hinted: true hinted: true
data: | data: |
<problem> <problem>
<choiceresponse>
<p>You can provide feedback for each option in a checkbox problem, with distinct feedback depending on whether or not the learner selects that option.</p> <p>You can provide feedback for each option in a checkbox problem, with distinct feedback depending on whether or not the learner selects that option.</p>
<p>You can also provide compound feedback for a specific combination of answers. For example, if you have three possible answers in the problem, you can configure specific feedback for when a learner selects each combination of possible answers.</p> <p>You can also provide compound feedback for a specific combination of answers. For example, if you have three possible answers in the problem, you can configure specific feedback for when a learner selects each combination of possible answers.</p>
<p>You can also add hints for learners.</p> <p>You can also add hints for learners.</p>
<p>Be sure to select Settings to specify a Display Name and other values that apply.</p>
<p>Use the following example problem as a model.</p> <p>Use the following example problem as a model.</p>
<label>Which of the following is a fruit? Check all that apply.</label>
<p>Which of the following is a fruit? Check all that apply.</p> <checkboxgroup label="Which of the following is a fruit? Check all that apply.">
<choiceresponse>
<checkboxgroup>
<choice correct="true">apple <choice correct="true">apple
<choicehint selected="true">You are correct that an apple is a fruit because it is the fertilized ovary that comes from an apple tree and contains seeds.</choicehint> <choicehint selected="true">You are correct that an apple is a fruit because it is the fertilized ovary that comes from an apple tree and contains seeds.</choicehint>
<choicehint selected="false">Remember that an apple is also a fruit.</choicehint> <choicehint selected="false">Remember that an apple is also a fruit.</choicehint>
...@@ -56,12 +52,13 @@ data: | ...@@ -56,12 +52,13 @@ data: |
</choice> </choice>
<choice correct="true">tomato <choice correct="true">tomato
<choicehint selected="true">You are correct that a tomato is a fruit because it is the fertilized ovary of a tomato plant and contains seeds.</choicehint> <choicehint selected="true">You are correct that a tomato is a fruit because it is the fertilized ovary of a tomato plant and contains seeds.</choicehint>
<choicehint selected="false">Many people mistakenly think a tomato is a vegetable. However, because a tomato is the fertilized ovary of a tomato plant and contains seeds, it a fruit.</choicehint> <choicehint selected="false">Many people mistakenly think a tomato is a vegetable. However, because a tomato is the fertilized ovary of a tomato plant and contains seeds, it is a fruit.</choicehint>
</choice> </choice>
<compoundhint value="A B D">An apple, pumpkin, and tomato are all fruits as they all are fertilized ovaries of a plant and contain seeds.</compoundhint> <compoundhint value="A B D">An apple, pumpkin, and tomato are all fruits as they all are fertilized ovaries of a plant and contain seeds.</compoundhint>
<compoundhint value="A B C D">You are correct that an apple, pumpkin, and tomato are all fruits as they all are fertilized ovaries of a plant and contain seeds. However, a potato is not a fruit as it is an edible part of a plant in tuber form and is classified as a vegetable.</compoundhint> <compoundhint value="A B C D">You are correct that an apple, pumpkin, and tomato are all fruits as they all are fertilized ovaries of a plant and contain seeds. However, a potato is not a fruit as it is an edible part of a plant in tuber form and is a vegetable.</compoundhint>
</checkboxgroup> </checkboxgroup>
</choiceresponse> </choiceresponse>
<demandhint> <demandhint>
<hint>A fruit is the fertilized ovary from a flower.</hint> <hint>A fruit is the fertilized ovary from a flower.</hint>
<hint>A fruit contains seeds of the plant.</hint> <hint>A fruit contains seeds of the plant.</hint>
......
common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml
...@@ -20,8 +20,9 @@ data: | ...@@ -20,8 +20,9 @@ data: |
to specify a <strong>Display Name</strong> and other values that apply. to specify a <strong>Display Name</strong> and other values that apply.
</p> </p>
<p>You can use the following example problems as models.</p> <p>You can use the following example problems as models.</p>
<p>Make a voltage divider that splits the provided voltage evenly.</p>
<schematicresponse> <schematicresponse>
<label>Make a voltage divider that splits the provided voltage evenly.</label>
<center> <center>
<schematic height="500" width="600" parts="g,r" analyses="dc" <schematic height="500" width="600" parts="g,r" analyses="dc"
initial_value="[[&quot;v&quot;,[168,144,0],{&quot;value&quot;:&quot;dc(1)&quot;,&quot;_json_&quot;:0},[&quot;1&quot;,&quot;0&quot;]],[&quot;r&quot;,[296,120,0],{&quot;r&quot;:&quot;1&quot;,&quot;_json_&quot;:1},[&quot;1&quot;,&quot;output&quot;]],[&quot;L&quot;,[296,168,3],{&quot;label&quot;:&quot;output&quot;,&quot;_json_&quot;:2},[&quot;output&quot;]],[&quot;w&quot;,[296,216,168,216]],[&quot;w&quot;,[168,216,168,192]],[&quot;w&quot;,[168,144,168,120]],[&quot;w&quot;,[168,120,296,120]],[&quot;g&quot;,[168,216,0],{&quot;_json_&quot;:7},[&quot;0&quot;]],[&quot;view&quot;,-67.49999999999994,-78.49999999999994,1.6000000000000003,&quot;50&quot;,&quot;10&quot;,&quot;1G&quot;,null,&quot;100&quot;,&quot;1&quot;,&quot;1000&quot;]]"/> initial_value="[[&quot;v&quot;,[168,144,0],{&quot;value&quot;:&quot;dc(1)&quot;,&quot;_json_&quot;:0},[&quot;1&quot;,&quot;0&quot;]],[&quot;r&quot;,[296,120,0],{&quot;r&quot;:&quot;1&quot;,&quot;_json_&quot;:1},[&quot;1&quot;,&quot;output&quot;]],[&quot;L&quot;,[296,168,3],{&quot;label&quot;:&quot;output&quot;,&quot;_json_&quot;:2},[&quot;output&quot;]],[&quot;w&quot;,[296,216,168,216]],[&quot;w&quot;,[168,216,168,192]],[&quot;w&quot;,[168,144,168,120]],[&quot;w&quot;,[168,120,296,120]],[&quot;g&quot;,[168,216,0],{&quot;_json_&quot;:7},[&quot;0&quot;]],[&quot;view&quot;,-67.49999999999994,-78.49999999999994,1.6000000000000003,&quot;50&quot;,&quot;10&quot;,&quot;1G&quot;,null,&quot;100&quot;,&quot;1&quot;,&quot;1000&quot;]]"/>
...@@ -38,9 +39,21 @@ data: | ...@@ -38,9 +39,21 @@ data: |
else: else:
correct = ['incorrect'] correct = ['incorrect']
</answer> </answer>
<solution>
<div class="detailed-solution">
<p>Explanation</p>
<p>
You can form a voltage divider that evenly divides the input
voltage with two identically valued resistors, with the sampled
voltage taken in between the two.
</p>
<p><img src="/static/images/voltage_divider.png" alt=""/></p>
</div>
</solution>
</schematicresponse> </schematicresponse>
<p>Make a high-pass filter.</p>
<schematicresponse> <schematicresponse>
<label>Make a high-pass filter.</label>
<center> <center>
<schematic height="500" width="600" parts="g,r,s,c" analyses="ac" <schematic height="500" width="600" parts="g,r,s,c" analyses="ac"
submit_analyses="{&quot;ac&quot;:[[&quot;NodeA&quot;,1,9]]}" submit_analyses="{&quot;ac&quot;:[[&quot;NodeA&quot;,1,9]]}"
...@@ -60,18 +73,10 @@ data: | ...@@ -60,18 +73,10 @@ data: |
else: else:
correct = ['incorrect'] correct = ['incorrect']
</answer> </answer>
</schematicresponse>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
<p> <p>
You can form a voltage divider that evenly divides the input
voltage with two identically valued resistors, with the sampled
voltage taken in between the two.
</p>
<p><img src="/static/images/voltage_divider.png" alt=""/></p>
<p>
You can form a simple high-pass filter without any further You can form a simple high-pass filter without any further
constraints by simply putting a resistor in series with a constraints by simply putting a resistor in series with a
capacitor. The actual values of the components do not really capacitor. The actual values of the components do not really
...@@ -80,4 +85,5 @@ data: | ...@@ -80,4 +85,5 @@ data: |
<p><img src="/static/images/high_pass_filter.png" alt=""/></p> <p><img src="/static/images/high_pass_filter.png" alt=""/></p>
</div> </div>
</solution> </solution>
</schematicresponse>
</problem> </problem>
common/lib/xmodule/xmodule/templates/problem/customgrader.yaml
...@@ -22,15 +22,36 @@ data: | ...@@ -22,15 +22,36 @@ data: |
"solution" tags, and that learners do not see these images until they "solution" tags, and that learners do not see these images until they
click the "Show Answer" button. click the "Show Answer" button.
</p> </p>
<p> For more information, see <a <p>
href="http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/exercises_tools/custom_python.html" target="_blank"> For more information, see <a href="http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/exercises_tools/custom_python.html" target="_blank">
Write-Your-Own-Grader Problem</a> in <i>Building and Running an edX Course</i>. Write-Your-Own-Grader Problem</a> in <i>Building and Running an edX Course</i>.
</p> </p>
<p>When you add the problem, be sure to select <strong>Settings</strong> <p>
to specify a <strong>Display Name</strong> and other values that apply.</p> When you add the problem, be sure to select <strong>Settings</strong>
to specify a <strong>Display Name</strong> and other values that apply.
</p>
<p>You can use the following example problem as a model.</p> <p>You can use the following example problem as a model.</p>
<hr /> <hr/>
<customresponse cfn="test_add_to_ten">
<script type="loncapa/python">
def test_add_to_ten(expect, ans):
return test_add(10, ans)
</script>
<label>Enter two integers that sum to 10.</label>
<textline size="40" correct_answer="3" label="Integer #1"/><br/>
<textline size="40" correct_answer="7" label="Integer #2"/>
<solution>
<div class="detailed-solution">
<p>Explanation</p>
<p>Any set of integers on the line \(y = 10 - x\) satisfy these constraints.</p>
</div>
</solution>
</customresponse>
<customresponse cfn="test_add" expect="20">
<script type="loncapa/python"> <script type="loncapa/python">
def test_add(expect, ans): def test_add(expect, ans):
...@@ -41,24 +62,14 @@ data: | ...@@ -41,24 +62,14 @@ data: |
except ValueError: except ValueError:
return False return False
def test_add_to_ten(expect, ans):
return test_add(10, ans)
</script> </script>
<p>Enter two integers that sum to 10.</p> <label>Enter two integers that sum to 20.</label>
<customresponse cfn="test_add_to_ten">
<textline size="40" correct_answer="3" label="Integer #1"/><br/>
<textline size="40" correct_answer="7" label="Integer #2"/>
</customresponse>
<p>Enter two integers that sum to 20.</p>
<customresponse cfn="test_add" expect="20">
<textline size="40" correct_answer="11" label="Integer #1"/><br/> <textline size="40" correct_answer="11" label="Integer #1"/><br/>
<textline size="40" correct_answer="9" label="Integer #2"/> <textline size="40" correct_answer="9" label="Integer #2"/>
</customresponse>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
<p>Any set of integers on the line \(y = 10 - x\) and \(y = 20 - x\) satisfy these constraints.</p> <p>Any set of integers on the line \(y = 20 - x\) satisfy these constraints.</p>
<p>To add an image to the solution, use an HTML "img" tag. Make sure to include alt text.</p> <p>To add an image to the solution, use an HTML "img" tag. Make sure to include alt text.</p>
<img src="/static/images/placeholder-image.png" width="400" <img src="/static/images/placeholder-image.png" width="400"
alt="Description of image, with a primary goal of explaining its alt="Description of image, with a primary goal of explaining its
...@@ -66,4 +77,5 @@ data: | ...@@ -66,4 +77,5 @@ data: |
who is unable to see the image."/> who is unable to see the image."/>
</div> </div>
</solution> </solution>
</customresponse>
</problem> </problem>
common/lib/xmodule/xmodule/templates/problem/drag_and_drop.yaml
...@@ -5,17 +5,18 @@ metadata: ...@@ -5,17 +5,18 @@ metadata:
showanswer: never showanswer: never
data: | data: |
<problem> <problem>
<p> <p>In drag and drop problems, students respond to a question by dragging text or objects to a specific location on an image.</p>
In drag and drop problems, students respond to a question by dragging text or objects to a specific location on an image.
</p>
<p> <p>
For more information, see For more information, see
<a href="http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/exercises_tools/drag_and_drop_deprecated.html" target="_blank"> <a href="http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/exercises_tools/drag_and_drop_deprecated.html" target="_blank">
Drag and Drop Problem (Deprecated)</a> in <i>Building and Running an edX Course</i>.</p> Drag and Drop Problem (Deprecated)</a> in <i>Building and Running an edX Course</i>.
<p>When you add the problem, be sure to select <strong>Settings</strong> </p>
to specify a <strong>Display Name</strong> and other values that apply.</p> <p>
When you add the problem, be sure to select <strong>Settings</strong>
to specify a <strong>Display Name</strong> and other values that apply.
</p>
<p>You can use the following example problems as models.</p> <p>You can use the following example problems as models.</p>
<hr /> <hr/>
<customresponse> <customresponse>
<h3>Simple Drag and Drop</h3> <h3>Simple Drag and Drop</h3>
<p>Drag each word in the scrollbar to the bucket that matches the number of letters in the word.</p> <p>Drag each word in the scrollbar to the bucket that matches the number of letters in the word.</p>
...@@ -51,13 +52,13 @@ data: | ...@@ -51,13 +52,13 @@ data: |
correct = ['incorrect'] correct = ['incorrect']
</answer> </answer>
</customresponse> </customresponse>
<customresponse> <customresponse>
<h3>Drag and Drop with Outline</h3> <h3>Drag and Drop with Outline</h3>
<p>Label the hydrogen atoms connected with the left carbon atom.</p> <p>Label the hydrogen atoms connected with the left carbon atom.</p>
<drag_and_drop_input img="https://studio.edx.org/c4x/edX/DemoX/asset/ethglycol.jpg" target_outline="true" one_per_target="true" no_labels="true" label_bg_color="rgb(222, 139, 238)"> <drag_and_drop_input img="https://studio.edx.org/c4x/edX/DemoX/asset/ethglycol.jpg" target_outline="true" one_per_target="true" no_labels="true" label_bg_color="rgb(222, 139, 238)">
<draggable id="1" label="Hydrogen" /> <draggable id="1" label="Hydrogen" />
<draggable id="2" label="Hydrogen" /> <draggable id="2" label="Hydrogen" />
<target id="t1_o" x="10" y="67" w="100" h="100"/> <target id="t1_o" x="10" y="67" w="100" h="100"/>
<target id="t2" x="133" y="3" w="70" h="70"/> <target id="t2" x="133" y="3" w="70" h="70"/>
<target id="t3" x="2" y="384" w="70" h="70"/> <target id="t3" x="2" y="384" w="70" h="70"/>
......
common/lib/xmodule/xmodule/templates/problem/formularesponse.yaml
...@@ -26,13 +26,14 @@ data: | ...@@ -26,13 +26,14 @@ data: |
A Brief Introduction to MathJax in Studio</a> in <i>Building and Running an edx A Brief Introduction to MathJax in Studio</a> in <i>Building and Running an edx
Course</i>. Course</i>.
</p> </p>
<p>When you add the problem, be sure to select <strong>Settings</strong> <p>
to specify a <strong>Display Name</strong> and other values that apply.</p> When you add the problem, be sure to select <strong>Settings</strong>
to specify a <strong>Display Name</strong> and other values that apply.
</p>
<p>You can use the following example problems as models.</p> <p>You can use the following example problems as models.</p>
<p>Write an expression for the product of \( R_1\), \( R_2\), and
the inverse of \( R_3\) .</p>
<formularesponse type="ci" samples="R_1,R_2,R_3@1,2,3:3,4,5#10" answer="$VoVi"> <formularesponse type="ci" samples="R_1,R_2,R_3@1,2,3:3,4,5#10" answer="$VoVi">
<label>Write an expression for the product of \( R_1\), \( R_2\), and the inverse of \( R_3\).</label>
<responseparam type="tolerance" default="0.00001"/> <responseparam type="tolerance" default="0.00001"/>
<formulaequationinput size="40" label="Enter the equation"/> <formulaequationinput size="40" label="Enter the equation"/>
</formularesponse> </formularesponse>
...@@ -41,16 +42,13 @@ data: | ...@@ -41,16 +42,13 @@ data: |
VoVi = "(R_1*R_2)/R_3" VoVi = "(R_1*R_2)/R_3"
</script> </script>
<p>Let \( x\) be a variable, and let \( n\) be an arbitrary constant.
What is the derivative of \( x^n\)?</p>
<script type="loncapa/python"> <script type="loncapa/python">
derivative = "n*x^(n-1)" derivative = "n*x^(n-1)"
</script> </script>
<formularesponse type="ci" samples="x,n@1,2:3,4#10" answer="$derivative"> <formularesponse type="ci" samples="x,n@1,2:3,4#10" answer="$derivative">
<label>Let \( x\) be a variable, and let \( n\) be an arbitrary constant. What is the derivative of \( x^n\)?</label>
<responseparam type="tolerance" default="0.00001"/> <responseparam type="tolerance" default="0.00001"/>
<formulaequationinput size="40" label="Enter the equation"/> <formulaequationinput size="40" label="Enter the equation"/>
</formularesponse> </formularesponse>
</problem> </problem>
common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml
...@@ -5,31 +5,26 @@ metadata: ...@@ -5,31 +5,26 @@ metadata:
data: | data: |
<problem> <problem>
<p> <p>
In an image mapped input problem, also known as a "pointing on a picture" In an image mapped input problem, also known as a "pointing on a picture" problem, students click inside a defined region in an image. You define this region by including coordinates in the body of the problem. You can define one rectangular region,
problem, students click inside a defined region in an image. You define this multiple rectangular regions, or one non-rectangular region. For more information, see
region by including coordinates in the body of the problem. You can define <a href="http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/exercises_tools/image_mapped_input.html" target="_blank">Image Mapped Input Problem</a>
one rectangular region, multiple rectangular regions, or one non-rectangular in
region. For more information, see <i>Building and Running an edx Course</i>.
<a href="http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/exercises_tools/image_mapped_input.html" target="_blank">Image Mapped Input
Problem</a> in <i>Building and Running an edx Course</i>.
</p> </p>
<p>When you add the problem, be sure to select <strong>Settings</strong> <p>When you add the problem, be sure to select
to specify a <strong>Display Name</strong> and other values that apply.</p> <strong>Settings</strong>
to specify a
<strong>Display Name</strong>
and other values that apply.</p>
<p>You can use the following example problem as a model.</p> <p>You can use the following example problem as a model.</p>
<p>What country is home to the Great Pyramid of Giza as well as the cities
of Cairo and Memphis? Click the country on the map below.</p>
<imageresponse> <imageresponse>
<imageinput src="https://studio.edx.org/c4x/edX/DemoX/asset/Africa.png" <label>What country is home to the Great Pyramid of Giza as well as the cities of Cairo and Memphis? Click the country on the map below.</label>
width="600" height="638" rectangle="(338,98)-(412,168)" alt="Map of <imageinput src="https://studio.edx.org/c4x/edX/DemoX/asset/Africa.png" width="600" height="638" rectangle="(338,98)-(412,168)" alt="Map of Africa"/>
Africa"/>
</imageresponse>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
<p>Egypt is home to not only the Pyramids, Cairo, and Memphis, but also <p>Egypt is home to not only the Pyramids, Cairo, and Memphis, but also the Sphinx and the ancient Royal Library of Alexandria.</p>
the Sphinx and the ancient Royal Library of Alexandria.</p>
</div> </div>
</solution> </solution>
</imageresponse>
</problem> </problem>
common/lib/xmodule/xmodule/templates/problem/jsinput_response.yaml
...@@ -23,13 +23,18 @@ data: | ...@@ -23,13 +23,18 @@ data: |
<a href="http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/exercises_tools/custom_javascript.html" target="_blank"> <a href="http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/exercises_tools/custom_javascript.html" target="_blank">
Custom JavaScript Problem</a> in <i>Building and Running an edX Course</i>. Custom JavaScript Problem</a> in <i>Building and Running an edX Course</i>.
</p> </p>
<p>JavaScript developers can also see <p>
JavaScript developers can also see
<a href="http://edx.readthedocs.io/projects/edx-developer-guide/en/latest/extending_platform/javascript.html" target="_blank"> <a href="http://edx.readthedocs.io/projects/edx-developer-guide/en/latest/extending_platform/javascript.html" target="_blank">
Custom JavaScript Applications</a> in the <i>EdX Developer's Guide</i>.</p> Custom JavaScript Applications</a> in the <i>EdX Developer's Guide</i>.
<p>When you add the problem, be sure to select <strong>Settings</strong> </p>
to specify a <strong>Display Name</strong> and other values that apply.</p> <p>
When you add the problem, be sure to select <strong>Settings</strong>
to specify a <strong>Display Name</strong> and other values that apply.
</p>
<p>You can use the following example problem as a model.</p> <p>You can use the following example problem as a model.</p>
<customresponse cfn="vglcfn">
<script type="loncapa/python"> <script type="loncapa/python">
<![CDATA[ <![CDATA[
import json import json
...@@ -53,9 +58,7 @@ data: | ...@@ -53,9 +58,7 @@ data: |
''' '''
]]> ]]>
</script> </script>
<p>In the following image, click the objects until the cone is yellow <label>In the following image, click the objects until the cone is yellow and the cube is blue.</label>
and the cube is blue.</p>
<customresponse cfn="vglcfn">
<jsinput gradefn="WebGLDemo.getGrade" <jsinput gradefn="WebGLDemo.getGrade"
get_statefn="WebGLDemo.getState" get_statefn="WebGLDemo.getState"
set_statefn="WebGLDemo.setState" set_statefn="WebGLDemo.setState"
......
common/lib/xmodule/xmodule/templates/problem/latex_problem.yaml
...@@ -88,37 +88,41 @@ metadata: ...@@ -88,37 +88,41 @@ metadata:
data: | data: |
<?xml version="1.0"?> <?xml version="1.0"?>
<problem showanswer="closed" rerandomize="never" weight="10" display_name="lec1_Q2"> <problem>
<p>If you have a problem that is already written in LaTeX, you can use this problem type to <p>
If you have a problem that is already written in LaTeX, you can use this problem type to
easily convert your code into XML. After you paste your code into the LaTeX editor, easily convert your code into XML. After you paste your code into the LaTeX editor,
you only need to make a few minor adjustments.</p> you only need to make a few minor adjustments.
<p>For more information, see </p>
<p>
For more information, see
<a href="http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/exercises_tools/problem_in_latex.html" target="_blank"> <a href="http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/exercises_tools/problem_in_latex.html" target="_blank">
Problem Written in LaTeX</a> in <i>Building and Running an edX Course</i>.</p> Problem Written in LaTeX</a> in <i>Building and Running an edX Course</i>.
</p>
<p>You can use the following example problems as models.</p> <p>You can use the following example problems as models.</p>
<p><strong>Example Option Problem</strong></p> <p><strong>Example Option Problem</strong></p>
<p>Which of the following countries celebrates its independence on August 15?</p>
<br/> <br/>
<optionresponse> <optionresponse>
<label>Which of the following countries celebrates its independence on August 15?</label>
<optioninput options="('India','Spain','China','Bermuda')" correct="India"></optioninput> <optioninput options="('India','Spain','China','Bermuda')" correct="India"></optioninput>
</optionresponse>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
<p>India became an independent nation on August 15, 1947.</p> <p>India became an independent nation on August 15, 1947.</p>
</div> </div>
</solution> </solution>
</optionresponse>
<br/> <br/>
<p><strong>Example Multiple Choice Problem</strong></p> <p><strong>Example Multiple Choice Problem</strong></p>
<p>Which of the following countries has the largest population?</p>
<multiplechoiceresponse> <multiplechoiceresponse>
<label>Which of the following countries has the largest population?</label>
<choicegroup type="MultipleChoice"> <choicegroup type="MultipleChoice">
<choice correct="false" name="brazil">Brazil</choice> <choice correct="false" name="brazil">Brazil</choice>
<choice correct="false" name="germany">Germany</choice> <choice correct="false" name="germany">Germany</choice>
<choice correct="true" name="indonesia">Indonesia</choice> <choice correct="true" name="indonesia">Indonesia</choice>
<choice correct="false" name="russia">Russia</choice> <choice correct="false" name="russia">Russia</choice>
</choicegroup> </choicegroup>
</multiplechoiceresponse>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
...@@ -129,38 +133,61 @@ data: | ...@@ -129,38 +133,61 @@ data: |
<p>The population of Germany is approximately 81 million.</p> <p>The population of Germany is approximately 81 million.</p>
</div> </div>
</solution> </solution>
</multiplechoiceresponse>
<br/> <br/>
<p><strong>Example Math Expression Problem</strong></p> <p><strong>Example Math Expression Problem</strong></p>
<p>What is Einstein's equation for the energy equivalent of a mass [mathjaxinline]m[/mathjaxinline]?</p>
<symbolicresponse expect="m*c^2"> <symbolicresponse expect="m*c^2">
<label>What is Einstein's equation for the energy equivalent of a mass [mathjaxinline]m[/mathjaxinline]?</label>
<textline size="90" correct_answer="m*c^2" math="1"/> <textline size="90" correct_answer="m*c^2" math="1"/>
</symbolicresponse> </symbolicresponse>
<br/> <br/>
<p><strong>Example Numerical Problem</strong></p> <p><strong>Example Numerical Problem</strong></p>
<p>Estimate the energy savings (in J/y) if all the people ([mathjaxinline]3\times 10^8[/mathjaxinline]) in the U.&#xA0;S. switched from U.&#xA0;S. code to low-flow shower heads.</p>
<p style="display:inline">Energy saved = </p>
<numericalresponse inline="1" answer="0.52"> <numericalresponse inline="1" answer="0.52">
<label>Estimate the energy savings (in J/y) if all the people ([mathjaxinline]3\times 10^8[/mathjaxinline]) in the U.&#xA0;S. switched from U.&#xA0;S. code to low-flow shower heads.</label>
<p style="display:inline">Energy saved = </p>
<textline inline="1"> <textline inline="1">
<responseparam type="tolerance" default="0.02"/> <responseparam type="tolerance" default="0.02"/>
</textline> </textline>
<p style="display:inline">&#xA0;EJ/year</p> <p style="display:inline">&#xA0;EJ/year</p>
</numericalresponse> </numericalresponse>
<br/> <br/>
<p><strong>Example Fill-in-the-Blank Problem</strong></p> <p><strong>Example Fill-in-the-Blank Problem</strong></p>
<p>What was the first post-secondary school in China to allow both male and female students?</p>
<stringresponse answer="Nanjing Higher Normal Institute" type="ci" > <stringresponse answer="Nanjing Higher Normal Institute" type="ci" >
<label>What was the first post-secondary school in China to allow both male and female students?</label>
<additional_answer>National Central University</additional_answer> <additional_answer>National Central University</additional_answer>
<additional_answer>Nanjing University</additional_answer> <additional_answer>Nanjing University</additional_answer>
<textline label="What was the first post-secondary school in China to allow both male and female students?" size="40"/> <textline label="What was the first post-secondary school in China to allow both male and female students?" size="40"/>
</stringresponse>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
<p>Nanjing Higher Normal Institute first admitted female students in 1920.</p> <p>Nanjing Higher Normal Institute first admitted female students in 1920.</p>
</div> </div>
</solution> </solution>
</stringresponse>
<br/> <br/>
<p><strong>Example Custom Python-Evaluated Input Problem</strong></p> <p><strong>Example Custom Python-Evaluated Input Problem</strong></p>
<customresponse cfn="test_add_to_ten">
<script type="loncapa/python">
def test_add_to_ten(expect, ans):
return test_add(10, ans)
</script>
<label>Enter two integers that sum to 10.</label>
<textline size="40" correct_answer="3" label="Integer #1"/><br/>
<textline size="40" correct_answer="7" label="Integer #2"/>
<solution>
<div class="detailed-solution">
<p>Explanation</p>
<p>Any set of integers on the line \(y = 10 - x\) satisfy these constraints.</p>
</div>
</solution>
</customresponse>
<customresponse cfn="test_add" expect="20">
<script type="loncapa/python"> <script type="loncapa/python">
def test_add(expect, ans): def test_add(expect, ans):
try: try:
...@@ -169,37 +196,30 @@ data: | ...@@ -169,37 +196,30 @@ data: |
return (a1+a2) == int(expect) return (a1+a2) == int(expect)
except ValueError: except ValueError:
return False return False
def test_add_to_ten(expect, ans):
return test_add(10, ans)
</script> </script>
<p>Enter two integers that sum to 10.</p> <label>Enter two integers that sum to 20.</label>
<customresponse cfn="test_add_to_ten">
<textline size="40" correct_answer="3" label="Integer #1"/><br/>
<textline size="40" correct_answer="7" label="Integer #2"/>
</customresponse>
<p>Enter two integers that sum to 20.</p>
<customresponse cfn="test_add" expect="20">
<textline size="40" correct_answer="11" label="Integer #1"/><br/> <textline size="40" correct_answer="11" label="Integer #1"/><br/>
<textline size="40" correct_answer="9" label="Integer #2"/> <textline size="40" correct_answer="9" label="Integer #2"/>
</customresponse>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
<p>Any set of integers on the line \(y = 10 - x\) and \(y = 20 - x\) satisfy these constraints.</p> <p>Any set of integers on the line \(y = 20 - x\) satisfy these constraints.</p>
<p>To add an image to the solution, use an HTML "img" tag. Make sure to include alt text.</p> <p>To add an image to the solution, use an HTML "img" tag. Make sure to include alt text.</p>
<img src="/static/images/placeholder-image.png" width="400" alt="Description of image"/> <img src="/static/images/placeholder-image.png" width="400" alt="Description of image"/>
</div> </div>
</solution> </solution>
</customresponse>
<br/> <br/>
<p><strong>Example Image Mapped Input Problem</strong></p> <p><strong>Example Image Mapped Input Problem</strong></p>
<p>What country is home to the Great Pyramid of Giza as well as the cities
of Cairo and Memphis? Click the country on the map below.</p>
<imageresponse> <imageresponse>
<label>
What country is home to the Great Pyramid of Giza as well as the cities
of Cairo and Memphis? Click the country on the map below.
</label>
<imageinput src="https://studio.edx.org/c4x/edX/DemoX/asset/Africa.png" <imageinput src="https://studio.edx.org/c4x/edX/DemoX/asset/Africa.png"
width="600" height="638" rectangle="(338,98)-(412,168)" alt="Map of width="600" height="638" rectangle="(338,98)-(412,168)" alt="Map of
Africa"/> Africa"/>
</imageresponse>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
...@@ -207,7 +227,9 @@ data: | ...@@ -207,7 +227,9 @@ data: |
the Sphinx and the ancient Royal Library of Alexandria.</p> the Sphinx and the ancient Royal Library of Alexandria.</p>
</div> </div>
</solution> </solution>
</imageresponse>
<br/> <br/>
<p><strong>Example Hidden Explanation</strong></p> <p><strong>Example Hidden Explanation</strong></p>
<p>You can provide additional information that only appears at certain times by including a "showhide" flag. </p> <p>You can provide additional information that only appears at certain times by including a "showhide" flag. </p>
<p> <p>
......
common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
...@@ -24,22 +24,19 @@ metadata: ...@@ -24,22 +24,19 @@ metadata:
data: | data: |
<problem> <problem>
<p>Multiple choice problems allow learners to select only one option.
Learners can see all the options along with the problem text.</p>
<p>When you add the problem, be sure to select <strong>Settings</strong>
to specify a <strong>Display Name</strong> and other values that apply.</p>
<p>You can use the following example problem as a model.</p>
<p>Which of the following countries has the largest population?</p>
<multiplechoiceresponse> <multiplechoiceresponse>
<choicegroup type="MultipleChoice"> <p>Multiple choice problems allow learners to select only one option. Learners can see all the options along with the problem text.</p>
<choice correct="false" name="brazil">Brazil <p>When you add the problem, be sure to select Settings to specify a Display Name and other values that apply.</p>
<p>You can use the following example problem as a model.</p>
<label>Which of the following countries has the largest population?</label>
<choicegroup label="Which of the following countries has the largest population?" type="MultipleChoice">
<choice correct="false">Brazil
<choicehint>timely feedback -- explain why an almost correct answer is wrong</choicehint> <choicehint>timely feedback -- explain why an almost correct answer is wrong</choicehint>
</choice> </choice>
<choice correct="false" name="germany">Germany</choice> <choice correct="false">Germany</choice>
<choice correct="true" name="indonesia">Indonesia</choice> <choice correct="true">Indonesia</choice>
<choice correct="false" name="russia">Russia</choice> <choice correct="false">Russia</choice>
</choicegroup> </choicegroup>
</multiplechoiceresponse>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
...@@ -50,4 +47,5 @@ data: | ...@@ -50,4 +47,5 @@ data: |
<p>The population of Germany is approximately 81 million.</p> <p>The population of Germany is approximately 81 million.</p>
</div> </div>
</solution> </solution>
</multiplechoiceresponse>
</problem> </problem>
common/lib/xmodule/xmodule/templates/problem/multiplechoice_hint.yaml
...@@ -23,22 +23,28 @@ metadata: ...@@ -23,22 +23,28 @@ metadata:
hinted: true hinted: true
data: | data: |
<problem> <problem>
<multiplechoiceresponse>
<p>You can provide feedback for each option in a multiple choice problem.</p> <p>You can provide feedback for each option in a multiple choice problem.</p>
<p>You can also add hints for learners.</p> <p>You can also add hints for learners.</p>
<p>Be sure to select Settings to specify a Display Name and other values that apply.</p>
<p>Use the following example problem as a model.</p> <p>Use the following example problem as a model.</p>
<label>Which of the following is a vegetable?</label>
<p>Which of the following is a vegetable?</p> <choicegroup label="Which of the following is a vegetable?" type="MultipleChoice">
<multiplechoiceresponse> <choice correct="false">apple
<choicegroup type="MultipleChoice"> <choicehint>An apple is the fertilized ovary that comes from an apple tree and contains seeds, meaning it is a fruit.</choicehint>
<choice correct="false">apple <choicehint>An apple is the fertilized ovary that comes from an apple tree and contains seeds, meaning it is a fruit.</choicehint></choice> </choice>
<choice correct="false">pumpkin <choicehint>A pumpkin is the fertilized ovary of a squash plant and contains seeds, meaning it is a fruit.</choicehint></choice> <choice correct="false">pumpkin
<choice correct="true">potato <choicehint>A potato is an edible part of a plant in tuber form and is a vegetable.</choicehint></choice> <choicehint>A pumpkin is the fertilized ovary of a squash plant and contains seeds, meaning it is a fruit.</choicehint>
<choice correct="false">tomato <choicehint>Many people mistakenly think a tomato is a vegetable. However, because a tomato is the fertilized ovary of a tomato plant and contains seeds, it is a fruit.</choicehint></choice> </choice>
<choice correct="true">potato
<choicehint>A potato is an edible part of a plant in tuber form and is a vegetable.</choicehint>
</choice>
<choice correct="false">tomato
<choicehint>Many people mistakenly think a tomato is a vegetable. However, because a tomato is the fertilized ovary of a tomato plant and contains seeds, it is a fruit.</choicehint>
</choice>
</choicegroup> </choicegroup>
</multiplechoiceresponse> </multiplechoiceresponse>
<demandhint> <demandhint>
<hint>A fruit is the fertilized ovary from a flower.</hint> <hint>A fruit is the fertilized ovary from a flower.</hint>
<hint>A fruit contains seeds of the plant.</hint> <hint>A fruit contains seeds of the plant.</hint>
......
common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
...@@ -15,44 +15,46 @@ metadata: ...@@ -15,44 +15,46 @@ metadata:
= 9.3*10^7 = 9.3*10^7
or= 9.296*10^7 or= 9.296*10^7
[explanation]
The sun is 93,000,000, or 9.3*10^7, miles away from Earth.
[explanation]
---
>>The square of what number is -100?<< >>The square of what number is -100?<<
= 10*i = 10*i
[explanation] [explanation]
The sun is 93,000,000, or 9.3*10^7, miles away from Earth.
-100 is the square of 10 times the imaginary number, i. -100 is the square of 10 times the imaginary number, i.
[explanation] [explanation]
data: | data: |
<problem> <problem>
<p>In a numerical input problem, learners enter numbers or a specific and
relatively simple mathematical expression. Learners enter the response in
plain text, and the system then converts the text to a symbolic expression
that learners can see below the response field.</p>
<p>The system can handle several types of characters, including basic
operators, fractions, exponents, and common constants such as i. You can
refer learners to
<a href="http://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/completing_assignments/SFD_mathformatting.html#math-formatting" target="_blank">Entering Mathematical and Scientific Expressions</a> in the <i>EdX Learner's Guide</i> for information about how to enter text into the field.</p>
<p>When you add the problem, be sure to select <strong>Settings</strong>
to specify a <strong>Display Name</strong> and other values that apply.</p>
<p>You can use the following example problems as models.</p>
<p>How many miles away from Earth is the sun? Use scientific notation to answer.</p>
<numericalresponse answer="9.3*10^7"> <numericalresponse answer="9.3*10^7">
<formulaequationinput label="How many million miles are between Earth and the sun? Use scientific notation to answer." /> <p>In a numerical input problem, learners enter numbers or a specific and relatively simple mathematical expression. Learners enter the response in plain text, and the system then converts the text to a symbolic expression that learners can see below the response field.</p>
<p>The system can handle several types of characters, including basic operators, fractions, exponents, and common constants such as i. You can refer learners to
<a href="http://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/completing_assignments/SFD_mathformatting.html#math-formatting" target="_blank">Entering Mathematical and Scientific Expressions</a>in the<i> EdX Learner's Guide</i>
for information about how to enter text into the field.</p>
<p>When you add the problem, be sure to select <strong>Settings</strong> to specify a <strong>Display Name</strong> and other values that apply.</p>
<p>You can use the following example problems as models.</p>
<label>How many miles away from Earth is the sun? Use scientific notation to answer.</label>
<formulaequationinput label="How many million miles are between Earth and the sun? Use scientific notation to answer."/>
<solution>
<div class="detailed-solution">
<p>Explanation</p>
<p>The sun is 93,000,000, or 9.3*10^7, miles away from Earth.</p>
</div>
</solution>
</numericalresponse> </numericalresponse>
<p>The square of what number is -100?</p>
<numericalresponse answer="10*i"> <numericalresponse answer="10*i">
<formulaequationinput label="The square of what number is -100?" /> <label>The square of what number is -100?</label>
</numericalresponse> <formulaequationinput label="The square of what number is -100?"/>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
<p>The sun is 93,000,000, or 9.3*10^7, miles away from Earth.</p>
<p>-100 is the square of 10 times the imaginary number, i.</p> <p>-100 is the square of 10 times the imaginary number, i.</p>
</div> </div>
</solution> </solution>
</numericalresponse>
</problem> </problem>
common/lib/xmodule/xmodule/templates/problem/numericalresponse_hint.yaml
...@@ -27,25 +27,22 @@ metadata: ...@@ -27,25 +27,22 @@ metadata:
hinted: true hinted: true
data: | data: |
<problem> <problem>
<numericalresponse answer="4">
<p>You can provide feedback for correct answers in numerical input problems. You cannot provide feedback for incorrect answers.</p> <p>You can provide feedback for correct answers in numerical input problems. You cannot provide feedback for incorrect answers.</p>
<p>Use feedback for the correct answer to reinforce the process for arriving at the numerical value.</p> <p>Use feedback for the correct answer to reinforce the process for arriving at the numerical value.</p>
<p>You can also add hints for learners.</p>
<p>Be sure to select Settings to specify a Display Name and other values that apply.</p>
<p>Use the following example problem as a model.</p> <p>Use the following example problem as a model.</p>
<label>What is the arithmetic mean for the following set of numbers? (1, 5, 6, 3, 5)</label>
<p>What is the arithmetic mean for the following set of numbers? (1, 5, 6, 3, 5)</p> <formulaequationinput label="What is the arithmetic mean for the following set of numbers? (1, 5, 6, 3, 5)"/>
<numericalresponse answer="4">
<formulaequationinput label="What is the arithmetic mean for the following set of numbers? (1, 5, 6, 3, 5)" />
<correcthint>The mean for this set of numbers is 20 / 5, which equals 4.</correcthint> <correcthint>The mean for this set of numbers is 20 / 5, which equals 4.</correcthint>
</numericalresponse>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
<p>The mean is calculated by summing the set of numbers and dividing by n. In this case: (1 + 5 + 6 + 3 + 5) / 5 = 20 / 5 = 4.</p> <p>The mean is calculated by summing the set of numbers and dividing by n. In this case: (1 + 5 + 6 + 3 + 5) / 5 = 20 / 5 = 4.</p>
</div> </div>
</solution> </solution>
</numericalresponse>
<demandhint> <demandhint>
<hint>The mean is calculated by summing the set of numbers and dividing by n.</hint> <hint>The mean is calculated by summing the set of numbers and dividing by n.</hint>
......
common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
...@@ -17,20 +17,17 @@ metadata: ...@@ -17,20 +17,17 @@ metadata:
[explanation] [explanation]
data: | data: |
<problem> <problem>
<optionresponse>
<p>Dropdown problems allow learners to select only one option from a list of options.</p> <p>Dropdown problems allow learners to select only one option from a list of options.</p>
<p>When you add the problem, be sure to select <strong>Settings</strong> <p>When you add the problem, be sure to select Settings to specify a Display Name and other values that apply.</p>
to specify a <strong>Display Name</strong> and other values that apply.</p>
<p>You can use the following example problem as a model.</p> <p>You can use the following example problem as a model.</p>
<p>Which of the following countries celebrates its independence on August 15?</p> <label>Which of the following countries celebrates its independence on August 15?</label>
<br/> <optioninput label="Which of the following countries celebrates its independence on August 15?" options="('India','Spain','China','Bermuda')" correct="India"/>
<optionresponse>
<optioninput options="('India','Spain','China','Bermuda')" correct="India"></optioninput>
</optionresponse>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
<p>India became an independent nation on August 15, 1947.</p> <p>India became an independent nation on August 15, 1947.</p>
</div> </div>
</solution> </solution>
</optionresponse>
</problem> </problem>
common/lib/xmodule/xmodule/templates/problem/optionresponse_hint.yaml
...@@ -26,21 +26,25 @@ metadata: ...@@ -26,21 +26,25 @@ metadata:
hinted: true hinted: true
data: | data: |
<problem> <problem>
<optionresponse>
<p>You can provide feedback for each available option in a dropdown problem.</p> <p>You can provide feedback for each available option in a dropdown problem.</p>
<p>You can also add hints for learners.</p> <p>You can also add hints for learners.</p>
<p>Be sure to select Settings to specify a Display Name and other values that apply.</p>
<p>Use the following example problem as a model.</p> <p>Use the following example problem as a model.</p>
<label>A/an ________ is a vegetable.</label>
<p> A/an ________ is a vegetable.</p> <optioninput label=" A/an ________ is a vegetable.">
<br/> <option correct="False">apple
<optionresponse> <optionhint>An apple is the fertilized ovary that comes from an apple tree and contains seeds, meaning it is a fruit.</optionhint>
<optioninput> </option>
<option correct="False">apple <optionhint>An apple is the fertilized ovary that comes from an apple tree and contains seeds, meaning it is a fruit.</optionhint></option> <option correct="False">pumpkin
<option correct="False">pumpkin <optionhint>A pumpkin is the fertilized ovary of a squash plant and contains seeds, meaning it is a fruit.</optionhint></option> <optionhint>A pumpkin is the fertilized ovary of a squash plant and contains seeds, meaning it is a fruit.</optionhint>
<option correct="True">potato <optionhint>A potato is an edible part of a plant in tuber form and is a vegetable.</optionhint></option> </option>
<option correct="False">tomato <optionhint>Many people mistakenly think a tomato is a vegetable. However, because a tomato is the fertilized ovary of a tomato plant and contains seeds, it is a fruit.</optionhint></option> <option correct="True">potato
<optionhint>A potato is an edible part of a plant in tuber form and is a vegetable.</optionhint>
</option>
<option correct="False">tomato
<optionhint>Many people mistakenly think a tomato is a vegetable. However, because a tomato is the fertilized ovary of a tomato plant and contains seeds, it is a fruit.</optionhint>
</option>
</optioninput> </optioninput>
</optionresponse> </optionresponse>
......
common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml
...@@ -5,11 +5,10 @@ metadata: ...@@ -5,11 +5,10 @@ metadata:
data: | data: |
<problem> <problem>
<text> <text>
<p> <p><h4>Problem With Adaptive Hint</h4></p>
<h4>Problem With Adaptive Hint</h4> <p>This problem demonstrates a question with hints, based on using the <tt class="tt">hintfn</tt> method. </p>
</p>
<p> <customresponse cfn="test_str" expect="python">
This problem demonstrates a question with hints, based on using the <tt class="tt">hintfn</tt> method. </p>
<script type="text/python" system_path="python_lib"> <script type="text/python" system_path="python_lib">
def test_str(expect, ans): def test_str(expect, ans):
print expect, ans print expect, ans
...@@ -36,12 +35,9 @@ data: | ...@@ -36,12 +35,9 @@ data: |
hint = "&lt;font color='blue'&gt;Hint: {0}&lt;/font&gt;".format(hint) hint = "&lt;font color='blue'&gt;Hint: {0}&lt;/font&gt;".format(hint)
new_cmap.set_hint_and_mode(aid,hint,'always') new_cmap.set_hint_and_mode(aid,hint,'always')
</script> </script>
<label> <label>What is the best programming language that exists today? You may enter your answer in upper or lower case, with or without quotes.</label>
What is the best programming language that exists today? You may enter your answer in upper or lower case, with or without quotes.
<customresponse cfn="test_str" expect="python">
<textline correct_answer="python"/> <textline correct_answer="python"/>
<hintgroup hintfn="hint_fn"/> <hintgroup hintfn="hint_fn"/>
</customresponse> </customresponse>
</label>
</text> </text>
</problem> </problem>
common/lib/xmodule/xmodule/templates/problem/problem_with_hint_in_latex.yaml
...@@ -50,11 +50,10 @@ metadata: ...@@ -50,11 +50,10 @@ metadata:
data: | data: |
<problem> <problem>
<text> <text>
<p> <p><h4>Problem With Adaptive Hint</h4></p>
<h4>Problem With Adaptive Hint</h4> <p>This problem demonstrates a question with hints, based on using the <tt class="tt">hintfn</tt> method.</p>
</p>
<p> <customresponse cfn="test_str" expect="python">
This problem demonstrates a question with hints, based on using the <tt class="tt">hintfn</tt> method. </p>
<script type="text/python" system_path="python_lib"> <script type="text/python" system_path="python_lib">
def test_str(expect, ans): def test_str(expect, ans):
print expect, ans print expect, ans
...@@ -81,12 +80,9 @@ data: | ...@@ -81,12 +80,9 @@ data: |
hint = "&lt;font color='blue'&gt;Hint: {0}&lt;/font&gt;".format(hint) hint = "&lt;font color='blue'&gt;Hint: {0}&lt;/font&gt;".format(hint)
new_cmap.set_hint_and_mode(aid,hint,'always') new_cmap.set_hint_and_mode(aid,hint,'always')
</script> </script>
<label> <label>What is the best programming language that exists today? You may enter your answer in upper or lower case, with or without quotes.</label>
What is the best programming language that exists today? You may enter your answer in upper or lower case, with or without quotes.
<customresponse cfn="test_str" expect="python">
<textline correct_answer="python"/> <textline correct_answer="python"/>
<hintgroup hintfn="hint_fn"/> <hintgroup hintfn="hint_fn"/>
</customresponse> </customresponse>
</label>
</text> </text>
</problem> </problem>
common/lib/xmodule/xmodule/templates/problem/string_response.yaml
...@@ -20,24 +20,19 @@ metadata: ...@@ -20,24 +20,19 @@ metadata:
data: | data: |
<problem> <problem>
<p>In text input problems, also known as "fill-in-the-blank" problems, <stringresponse answer="Nanjing Higher Normal Institute" type="ci">
learners enter text into a response field. The text that the learner enters <p>In text input problems, also known as "fill-in-the-blank" problems, learners enter text into a response field. The text that the learner enters must match your specified answer text exactly. You can specify more than one correct answer. Learners must enter a response that matches one of the correct answers exactly.</p>
must match your specified answer text exactly. You can specify more than <p>When you add the problem, be sure to select <strong>Settings</strong> to specify a <strong>Display Name</strong> and other values that apply.</p>
one correct answer. Learners must enter a response that matches one of the <p>You can use the following example problem as a model.</p>
correct answers exactly.</p> <label>What was the first post-secondary school in China to allow both male and female students?</label>
<p>When you add the problem, be sure to select <strong>Settings</strong>
to specify a <strong>Display Name</strong> and other values that apply.</p>
<p> You can use the following example problem as a model.</p>
<p>What was the first post-secondary school in China to allow both male and female students?</p>
<stringresponse answer="Nanjing Higher Normal Institute" type="ci" >
<additional_answer>National Central University</additional_answer> <additional_answer>National Central University</additional_answer>
<additional_answer>Nanjing University</additional_answer> <additional_answer>Nanjing University</additional_answer>
<textline label="What was the first post-secondary school in China to allow both male and female students?" size="40"/> <textline label="What was the first post-secondary school in China to allow both male and female students?" size="40"/>
</stringresponse>
<solution> <solution>
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
<p>Nanjing Higher Normal Institute first admitted female students in 1920.</p> <p>Nanjing Higher Normal Institute first admitted female students in 1920.</p>
</div> </div>
</solution> </solution>
</stringresponse>
</problem> </problem>
common/lib/xmodule/xmodule/templates/problem/string_response_hint.yaml
...@@ -26,29 +26,19 @@ metadata: ...@@ -26,29 +26,19 @@ metadata:
hinted: true hinted: true
data: | data: |
<problem> <problem>
<stringresponse answer="Alaska" type="ci">
<p>You can provide feedback for the correct answer in text input problems, as well as for specific incorrect answers.</p> <p>You can provide feedback for the correct answer in text input problems, as well as for specific incorrect answers.</p>
<p>Use feedback on expected incorrect answers to address common misconceptions and to provide guidance on how to arrive at the correct answer.</p> <p>Use feedback on expected incorrect answers to address common misconceptions and to provide guidance on how to arrive at the correct answer.</p>
<p>Be sure to select Settings to specify a Display Name and other values that apply.</p>
<p>Use the following example problem as a model.</p> <p>Use the following example problem as a model.</p>
<label>Which U.S. state has the largest land area?</label>
<p>Which U.S. state has the largest land area?</p>
<stringresponse answer="Alaska" type="ci" >
<correcthint>Alaska is 576,400 square miles, more than double the land area of the second largest state, Texas.</correcthint> <correcthint>Alaska is 576,400 square miles, more than double the land area of the second largest state, Texas.</correcthint>
<stringequalhint answer="Texas">While many people think Texas is the largest state, it is actually the second largest, with 261,797 square miles.</stringequalhint> <stringequalhint answer="Texas">While many people think Texas is the largest state, it is actually the second largest, with 261,797 square miles.</stringequalhint>
<stringequalhint answer="California">California is the third largest state, with 155,959 square miles.</stringequalhint> <stringequalhint answer="California">California is the third largest state, with 155,959 square miles.</stringequalhint>
<textline label="Which U.S. state has the largest land area?" size="20"/> <textline label="Which U.S. state has the largest land area?" size="20"/>
</stringresponse> </stringresponse>
<demandhint> <demandhint>
<hint>Consider the square miles, not population.</hint> <hint>Consider the square miles, not population.</hint>
<hint>Consider all 50 states, not just the continental United States.</hint> <hint>Consider all 50 states, not just the continental United States.</hint>
</demandhint> </demandhint>
</problem> </problem>
lms/templates/problem.html
...@@ -12,9 +12,7 @@ from openedx.core.djangolib.markup import HTML ...@@ -12,9 +12,7 @@ from openedx.core.djangolib.markup import HTML
<div class="problem-progress"></div> <div class="problem-progress"></div>
<div class="problem"> <div class="problem">
<div aria-live="polite">
${ HTML(problem['html']) } ${ HTML(problem['html']) }
</div>
<div class="action"> <div class="action">
<input type="hidden" name="problem_id" value="${ problem['name'] }" /> <input type="hidden" name="problem_id" value="${ problem['name'] }" />
% if demand_hint_possible: % if demand_hint_possible:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment