Commit fcb41c42 by Alan Boudreault

use attempted attribute for the mark

parent 607a17e1
...@@ -139,6 +139,7 @@ class MentoringBlock(XBlockWithLightChildren): ...@@ -139,6 +139,7 @@ class MentoringBlock(XBlockWithLightChildren):
return { return {
'submitResults': submit_results, 'submitResults': submit_results,
'completed': self.completed, 'completed': self.completed,
'attempted': self.attempted,
'message': message, 'message': message,
} }
......
...@@ -34,7 +34,8 @@ function MentoringBlock(runtime, element) { ...@@ -34,7 +34,8 @@ function MentoringBlock(runtime, element) {
callIfExists(child, 'handleSubmit', result); callIfExists(child, 'handleSubmit', result);
}); });
$('.progress', element).data('completed', results.completed ? 'True' : 'False') $('.progress', element).data('completed', results.completed ? 'True' : 'False');
$('.progress', element).data('attempted', results.attempted ? 'True' : 'False');
renderProgress(); renderProgress();
// Messages should only be displayed upon hitting 'submit', not on page reload // Messages should only be displayed upon hitting 'submit', not on page reload
...@@ -89,10 +90,6 @@ function MentoringBlock(runtime, element) { ...@@ -89,10 +90,6 @@ function MentoringBlock(runtime, element) {
}); });
if (submit_dom.length) { if (submit_dom.length) {
/* On page load, remove the incomplete mark */
if ($('.progress', element).data('completed') === "False")
$('.progress', element).data('completed', null)
renderProgress(); renderProgress();
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
{% if self.display_submit %} {% if self.display_submit %}
<div class="submit"> <div class="submit">
<input type="button" value="Submit"></input> <input type="button" value="Submit"></input>
<span class="progress" data-completed="{{ self.completed }}"> <span class="progress" data-completed="{{ self.completed }}" data-attempted="{{ self.attempted }}">
<span class='indicator'></span> <span class='indicator'></span>
</span> </span>
</div> </div>
......
<script type="text/template" id="xblock-progress-template"> <script type="text/template" id="xblock-progress-template">
<% if (completed === "True") {{ %> <% if (completed === "True") {{ %>
<i class="icon-ok icon-2x checkmark-correct"></i> <i class="icon-ok icon-2x checkmark-correct"></i>
<% }} else if (completed === "False") {{ %> <% }} else if (attempted === "True") {{ %>
<i class="icon-exclamation icon-2x checkmark-incorrect"></i> <i class="icon-exclamation icon-2x checkmark-incorrect"></i>
<% }} %> <% }} %>
</script> </script>
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