Commit 76c5b89f by Waheed Ahmed

Merge pull request #631 from edx/waheed/tnl768-fix-criterion-name

Fixed criterion name with label which is displayed to the user.
parents 0a083443 db2bbbc7
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
{% for part in assessment.parts %} {% for part in assessment.parts %}
{% if part.option.criterion.name == criterion.name %} {% if part.option.criterion.name == criterion.name %}
<tr> <tr>
<td class="label">{{ criterion.name }}</td> <td class="label">{{ criterion.label }}</td>
<td class="value">{{ part.option.name }}</td> <td class="value">{{ part.option.name }}</td>
<td class="value">{{ part.feedback }}</td> <td class="value">{{ part.feedback }}</td>
<td class="value">{{ part.option.points }}</td> <td class="value">{{ part.option.points }}</td>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
{% for part in assessment.parts %} {% for part in assessment.parts %}
{% if part.option.criterion.name == criterion.name %} {% if part.option.criterion.name == criterion.name %}
<tr> <tr>
<td class="label">{{ criterion.name }}</td> <td class="label">{{ criterion.label }}</td>
<td class="value">{{ part.option.name }}</td> <td class="value">{{ part.option.name }}</td>
<td class="value">{{ part.feedback }}</td> <td class="value">{{ part.feedback }}</td>
<td class="value">{{ part.option.points }}</td> <td class="value">{{ part.option.points }}</td>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
{% for part in self_assessment.parts %} {% for part in self_assessment.parts %}
{% if part.option.criterion.name == criterion.name %} {% if part.option.criterion.name == criterion.name %}
<tr> <tr>
<td class="label">{{ criterion.name }}</td> <td class="label">{{ criterion.label }}</td>
<td class="value">{{ part.option.name }}</td> <td class="value">{{ part.option.name }}</td>
<td class="value">{{ part.option.points }}</td> <td class="value">{{ part.option.points }}</td>
<td class="value">{{ criterion.total_value }}</td> <td class="value">{{ criterion.total_value }}</td>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
{% for part in example_based_assessment.parts %} {% for part in example_based_assessment.parts %}
{% if part.option.criterion.name == criterion.name %} {% if part.option.criterion.name == criterion.name %}
<tr> <tr>
<td class="label">{{ criterion.name }}</td> <td class="label">{{ criterion.label }}</td>
<td class="value">{{ part.option.name }}</td> <td class="value">{{ part.option.name }}</td>
<td class="value">{{ part.option.points }}</td> <td class="value">{{ part.option.points }}</td>
<td class="value">{{ criterion.total_value }}</td> <td class="value">{{ criterion.total_value }}</td>
......
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