Commit 8bfad8f2 by Vik Paruchuri

Work on properly displaying rubric icons

parent 35babcf5
...@@ -532,11 +532,12 @@ class CombinedOpenEndedV1Module(): ...@@ -532,11 +532,12 @@ class CombinedOpenEndedV1Module():
Input: AJAX get dictionary Input: AJAX get dictionary
Output: Dictionary to be rendered via ajax that contains the result html. Output: Dictionary to be rendered via ajax that contains the result html.
""" """
self.update_task_states()
all_responses = [] all_responses = []
loop_up_to_task = self.current_task_number+1 loop_up_to_task = self.current_task_number+1
if self.state in [self.ASSESSING, self.INITIAL] and self.current_task_number>0: if self.state in [self.ASSESSING, self.INITIAL] and self.current_task_number>0:
loop_up_to_task = loop_up_to_task-1 loop_up_to_task = loop_up_to_task-1
log.debug(self.allow_reset)
log.debug(self.check_allow_reset())
log.debug(self.state) log.debug(self.state)
log.debug(self.current_task_number) log.debug(self.current_task_number)
log.debug(loop_up_to_task) log.debug(loop_up_to_task)
......
...@@ -96,6 +96,9 @@ class @CombinedOpenEnded ...@@ -96,6 +96,9 @@ class @CombinedOpenEnded
@rebind() @rebind()
if @task_number>1
@show_combined_rubric_current()
# locally scoped jquery. # locally scoped jquery.
$: (selector) -> $: (selector) ->
$(selector, @el) $(selector, @el)
...@@ -180,8 +183,6 @@ class @CombinedOpenEnded ...@@ -180,8 +183,6 @@ class @CombinedOpenEnded
@hide_file_upload() @hide_file_upload()
@hint_area.attr('disabled', false) @hint_area.attr('disabled', false)
@show_status_current() @show_status_current()
if @task_number>1
@show_combined_rubric_current()
if @task_number==1 and @child_state=='assessing' if @task_number==1 and @child_state=='assessing'
@prompt_hide() @prompt_hide()
if @child_state == 'done' if @child_state == 'done'
......
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