diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py index 96d75b366c..780194a41e 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py @@ -663,17 +663,21 @@ class OpenEndedModule(openendedchild.OpenEndedChild): Output: Rendered HTML """ #set context variables and render template + eta_string = None if self.state != self.INITIAL: latest = self.latest_answer() previous_answer = latest if latest is not None else self.initial_display post_assessment = self.latest_post_assessment(system) score = self.latest_score() correct = 'correct' if self.is_submission_correct(score) else 'incorrect' + if self.state == self.ASSESSING: + eta_string = self.get_eta() else: post_assessment = "" correct = "" previous_answer = self.initial_display + context = { 'prompt': self.prompt, 'previous_answer': previous_answer, @@ -686,6 +690,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild): 'child_type': 'openended', 'correct': correct, 'accept_file_upload': self.accept_file_upload, + 'eta_message' : eta_string, } html = system.render_template('open_ended.html', context) return html diff --git a/lms/djangoapps/open_ended_grading/views.py b/lms/djangoapps/open_ended_grading/views.py index 0cf498599d..76919d4103 100644 --- a/lms/djangoapps/open_ended_grading/views.py +++ b/lms/djangoapps/open_ended_grading/views.py @@ -23,6 +23,7 @@ from xmodule.modulestore.django import modulestore from xmodule.modulestore import search from django.http import HttpResponse, Http404, HttpResponseRedirect +from mitxmako.shortcuts import render_to_string log = logging.getLogger(__name__) diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html index 64defedda4..9fb136cee6 100644 --- a/lms/templates/open_ended.html +++ b/lms/templates/open_ended.html @@ -15,7 +15,12 @@ % elif state in ['done', 'post_assessment'] and correct == 'incorrect':

Incorrect.

% elif state == 'assessing': - Submitted for grading. + Submitted for grading. + % if eta_message is not None: + ${eta_message} + % endif + + % endif % if hidden: