Commit fe5e9db7 by Braden MacDonald

Switch dashboard to use question titles, not question text.

parent 582d745e
...@@ -299,7 +299,7 @@ class DashboardBlock(StudioEditableXBlockMixin, XBlock): ...@@ -299,7 +299,7 @@ class DashboardBlock(StudioEditableXBlockMixin, XBlock):
except IndexError: except IndexError:
value = None value = None
block['mcqs'].append({ block['mcqs'].append({
"display_name": mcq_block.question, "display_name": mcq_block.display_name_with_default,
"value": value, "value": value,
"color": self.color_for_value(value) if value is not None else None, "color": self.color_for_value(value) if value is not None else None,
}) })
......
...@@ -60,19 +60,19 @@ class TestDashboardBlock(SeleniumXBlockTest): ...@@ -60,19 +60,19 @@ class TestDashboardBlock(SeleniumXBlockTest):
self.set_scenario_xml(""" self.set_scenario_xml("""
<vertical_demo> <vertical_demo>
<problem-builder display_name="Step 1"> <problem-builder display_name="Step 1">
<pb-mcq question="1.1 First question" correct_choices='1,2,3,4'> <pb-mcq display_name="1.1 First question" question="Which option?" correct_choices='1,2,3,4'>
<pb-choice value="1">Option 1</pb-choice> <pb-choice value="1">Option 1</pb-choice>
<pb-choice value="2">Option 2</pb-choice> <pb-choice value="2">Option 2</pb-choice>
<pb-choice value="3">Option 3</pb-choice> <pb-choice value="3">Option 3</pb-choice>
<pb-choice value="4">Option 4</pb-choice> <pb-choice value="4">Option 4</pb-choice>
</pb-mcq> </pb-mcq>
<pb-mcq question="1.2 Second question" correct_choices='1,2,3,4'> <pb-mcq display_name="1.2 Second question" question="Which option?" correct_choices='1,2,3,4'>
<pb-choice value="1">Option 1</pb-choice> <pb-choice value="1">Option 1</pb-choice>
<pb-choice value="2">Option 2</pb-choice> <pb-choice value="2">Option 2</pb-choice>
<pb-choice value="3">Option 3</pb-choice> <pb-choice value="3">Option 3</pb-choice>
<pb-choice value="4">Option 4</pb-choice> <pb-choice value="4">Option 4</pb-choice>
</pb-mcq> </pb-mcq>
<pb-mcq question="1.3 Third question" correct_choices='1,2,3,4'> <pb-mcq display_name="1.3 Third question" question="Which option?" correct_choices='1,2,3,4'>
<pb-choice value="1">Option 1</pb-choice> <pb-choice value="1">Option 1</pb-choice>
<pb-choice value="2">Option 2</pb-choice> <pb-choice value="2">Option 2</pb-choice>
<pb-choice value="3">Option 3</pb-choice> <pb-choice value="3">Option 3</pb-choice>
...@@ -81,18 +81,18 @@ class TestDashboardBlock(SeleniumXBlockTest): ...@@ -81,18 +81,18 @@ class TestDashboardBlock(SeleniumXBlockTest):
<html_demo> This message here should be ignored. </html_demo> <html_demo> This message here should be ignored. </html_demo>
</problem-builder> </problem-builder>
<problem-builder display_name="Step 2"> <problem-builder display_name="Step 2">
<pb-mcq question="2.1 First question" correct_choices='1,2,3,4'> <pb-mcq display_name="2.1 First question" question="Which option?" correct_choices='1,2,3,4'>
<pb-choice value="4">Option 4</pb-choice> <pb-choice value="4">Option 4</pb-choice>
<pb-choice value="5">Option 5</pb-choice> <pb-choice value="5">Option 5</pb-choice>
<pb-choice value="6">Option 6</pb-choice> <pb-choice value="6">Option 6</pb-choice>
</pb-mcq> </pb-mcq>
<pb-mcq question="2.2 Second question" correct_choices='1,2,3,4'> <pb-mcq display_name="2.2 Second question" question="Which option?" correct_choices='1,2,3,4'>
<pb-choice value="1">Option 1</pb-choice> <pb-choice value="1">Option 1</pb-choice>
<pb-choice value="2">Option 2</pb-choice> <pb-choice value="2">Option 2</pb-choice>
<pb-choice value="3">Option 3</pb-choice> <pb-choice value="3">Option 3</pb-choice>
<pb-choice value="4">Option 4</pb-choice> <pb-choice value="4">Option 4</pb-choice>
</pb-mcq> </pb-mcq>
<pb-mcq question="2.3 Third question" correct_choices='1,2,3,4'> <pb-mcq display_name="2.3 Third question" question="Which option?" correct_choices='1,2,3,4'>
<pb-choice value="1">Option 1</pb-choice> <pb-choice value="1">Option 1</pb-choice>
<pb-choice value="2">Option 2</pb-choice> <pb-choice value="2">Option 2</pb-choice>
<pb-choice value="3">Option 3</pb-choice> <pb-choice value="3">Option 3</pb-choice>
...@@ -100,13 +100,14 @@ class TestDashboardBlock(SeleniumXBlockTest): ...@@ -100,13 +100,14 @@ class TestDashboardBlock(SeleniumXBlockTest):
</pb-mcq> </pb-mcq>
</problem-builder> </problem-builder>
<problem-builder display_name="Step 3"> <problem-builder display_name="Step 3">
<pb-mcq question="3.1 First question" correct_choices='1,2,3,4'> <pb-mcq display_name="3.1 First question" question="Which option?" correct_choices='1,2,3,4'>
<pb-choice value="1">Option 1</pb-choice> <pb-choice value="1">Option 1</pb-choice>
<pb-choice value="2">Option 2</pb-choice> <pb-choice value="2">Option 2</pb-choice>
<pb-choice value="3">Option 3</pb-choice> <pb-choice value="3">Option 3</pb-choice>
<pb-choice value="4">Option 4</pb-choice> <pb-choice value="4">Option 4</pb-choice>
</pb-mcq> </pb-mcq>
<pb-mcq question="3.2 Question with non-numeric values" correct_choices='1,2,3,4'> <pb-mcq display_name="3.2 Question with non-numeric values"
question="Which option?" correct_choices='1,2,3,4'>
<pb-choice value="A">Option A</pb-choice> <pb-choice value="A">Option A</pb-choice>
<pb-choice value="B">Option B</pb-choice> <pb-choice value="B">Option B</pb-choice>
<pb-choice value="C">Option C</pb-choice> <pb-choice value="C">Option C</pb-choice>
......
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