Show appropriate assessment message when reaching review step.

problem_builder/mentoring.py

@@ -870,6 +870,35 @@ class MentoringWithExplicitStepsBlock(BaseMentoringBlock, StudioContainerWithNes
         from .step import ReviewStepBlock
         return any(child_isinstance(self, child_id, ReviewStepBlock) for child_id in self.children)
 
+    @property
+    def max_attempts_reached(self):
+        return False
+
+    @property
+    def assessment_message(self):
+        """
+        Get the message to display to a student following a submission in assessment mode.
+        """
+        if not self.max_attempts_reached:
+            return self.get_message_content('on-assessment-review', or_default=True)
+        else:
+            assessment_message = _("Note: you have used all attempts. Continue to the next unit")
+            return '<p>{}</p>'.format(assessment_message)
+
+    def get_message_content(self, message_type, or_default=False):
+        for child_id in self.children:
+            if child_isinstance(self, child_id, MentoringMessageBlock):
+                child = self.runtime.get_block(child_id)
+                if child.type == message_type:
+                    content = child.content
+                    if hasattr(self.runtime, 'replace_jump_to_id_urls'):
+                        content = self.runtime.replace_jump_to_id_urls(content)
+                    return content
+        if or_default:
+            # Return the default value since no custom message is set.
+            # Note the WYSIWYG editor usually wraps the .content HTML in a <p> tag so we do the same here.
+            return '<p>{}</p>'.format(MentoringMessageBlock.MESSAGE_TYPES[message_type]['default'])
+
     def student_view(self, context):
         fragment = Fragment()
         children_contents = []

problem_builder/public/js/mentoring_with_steps.js

@@ -4,7 +4,7 @@ function MentoringWithStepsBlock(runtime, element) {
         function(c) { return c.element.className.indexOf('sb-step') > -1; }
     );
     var activeStep = $('.mentoring', element).data('active-step');
-    var reviewStep, checkmark, submitDOM, nextDOM, reviewDOM, tryAgainDOM, submitXHR;
+    var reviewStep, checkmark, submitDOM, nextDOM, reviewDOM, tryAgainDOM, assessmentMessageDOM, submitXHR;
 
     function isLastStep() {
         return (activeStep === steps.length-1);
@@ -71,11 +71,13 @@ function MentoringWithStepsBlock(runtime, element) {
         checkmark.removeClass('checkmark-partially-correct icon-ok fa-check');
         checkmark.removeClass('checkmark-incorrect icon-exclamation fa-exclamation');
         hideAllSteps();
+        assessmentMessageDOM.html('');
     }
 
     function updateDisplay() {
         cleanAll();
         if (atReviewStep()) {
+            showAssessmentMessage();
             showReviewStep();
         } else {
             showActiveStep();
@@ -87,6 +89,11 @@ function MentoringWithStepsBlock(runtime, element) {
         }
     }
 
+    function showAssessmentMessage() {
+        var data = $('.grade', element).data();
+        assessmentMessageDOM.html(data.assessment_message);
+    }
+
     function showReviewStep() {
         reviewStep.show();
         submitDOM.hide();
@@ -135,6 +142,7 @@ function MentoringWithStepsBlock(runtime, element) {
 
     function showGrade() {
         cleanAll();
+        showAssessmentMessage();
         showReviewStep();
     }
 
@@ -178,6 +186,8 @@ function MentoringWithStepsBlock(runtime, element) {
         tryAgainDOM = $(element).find('.submit .input-try-again');
         tryAgainDOM.on('click', tryAgain);
 
+        assessmentMessageDOM = $('.assessment-message', element);
+
         var options = {
             onChange: onChange
         };

problem_builder/templates/html/mentoring_with_steps.html

@@ -9,10 +9,16 @@
 
   <div class="assessment-question-block">
 
+    <div class="assessment-message"></div>
+
     {% for child_content in children_contents %}
       {{ child_content|safe }}
     {% endfor %}
 
+    <div class="grade"
+         data-assessment_message="{{ self.assessment_message }}"
+    </div>
+
     <div class="submit">
       <span class="assessment-checkmark fa icon-2x"></span>
       <input type="button" class="input-main" value="Submit" disabled="disabled" />