Merge pull request #4 from aboudreault/incomplete-mark

Added an incomplete mark indicator

mentoring/mentoring.py

@@ -139,6 +139,7 @@ class MentoringBlock(XBlockWithLightChildren):
         return {
             'submitResults': submit_results,
             'completed': self.completed,
+            'attempted': self.attempted,
             'message': message,
         }
 

mentoring/public/css/mentoring.css

@@ -49,6 +49,15 @@
     margin-top: 20px;
 }
 
-.mentoring .progress .indicator .checkmark {
+.mentoring .progress .indicator {
+    display: inline-block;
+    margin-top: 5px;
+}
+
+.mentoring .progress .indicator .checkmark-correct {
     color: #006600;
 }
+
+.mentoring .progress .indicator .checkmark-incorrect {
+    color: #ff0000;
+}

mentoring/public/js/mentoring.js

@@ -34,7 +34,8 @@ function MentoringBlock(runtime, element) {
             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();
 
         // Messages should only be displayed upon hitting 'submit', not on page reload

mentoring/templates/html/mentoring.html

@@ -9,7 +9,7 @@
   {% if self.display_submit %}
   <div class="submit">
     <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>
   </div>

mentoring/templates/html/mentoring_progress.html

 <script type="text/template" id="xblock-progress-template">
     <% if (completed === "True") {{ %>
-    <i class="icon-ok icon-2x checkmark"></i>
+      <i class="icon-ok icon-2x checkmark-correct"></i>
+    <% }} else if (attempted === "True") {{ %>
+       <i class="icon-exclamation icon-2x checkmark-incorrect"></i>
     <% }} %>
 </script>