Commit 0e2355c2 by Vik Paruchuri

Work on templating for status display

parent a06680a2
...@@ -98,7 +98,9 @@ class CombinedOpenEndedModule(XModule): ...@@ -98,7 +98,9 @@ class CombinedOpenEndedModule(XModule):
return tag return tag
def overwrite_state(self, current_task_state): def overwrite_state(self, current_task_state):
last_response, last_score=self.get_last_response(self.current_task_number-1) last_response_data=self.get_last_response(self.current_task_number-1)
last_response = last_response_data['response']
loaded_task_state=json.loads(current_task_state) loaded_task_state=json.loads(current_task_state)
if loaded_task_state['state']== self.INITIAL: if loaded_task_state['state']== self.INITIAL:
loaded_task_state['state']=self.ASSESSING loaded_task_state['state']=self.ASSESSING
...@@ -139,7 +141,8 @@ class CombinedOpenEndedModule(XModule): ...@@ -139,7 +141,8 @@ class CombinedOpenEndedModule(XModule):
self.task_states.append(self.current_task.get_instance_state()) self.task_states.append(self.current_task.get_instance_state())
self.state=self.ASSESSING self.state=self.ASSESSING
elif current_task_state is None and self.current_task_number>0: elif current_task_state is None and self.current_task_number>0:
last_response, last_score=self.get_last_response(self.current_task_number-1) last_response_data =self.get_last_response(self.current_task_number-1)
last_response = last_response_data['response']
current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' + current_task_state = ('{"state": "assessing", "version": 1, "max_score": ' + str(self._max_score) + ', ' +
'"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}') '"attempts": 0, "created": "True", "history": [{"answer": "' + str(last_response) + '"}]}')
self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state) self.current_task=children['modules'][current_task_type](self.system, self.location, self.current_task_parsed_xml, self.current_task_descriptor, instance_state=current_task_state)
...@@ -191,8 +194,10 @@ class CombinedOpenEndedModule(XModule): ...@@ -191,8 +194,10 @@ class CombinedOpenEndedModule(XModule):
task=children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor, instance_state=task_state) task=children['modules'][task_type](self.system, self.location, task_parsed_xml, task_descriptor, instance_state=task_state)
last_response=task.latest_answer() last_response=task.latest_answer()
last_score = task.latest_score() last_score = task.latest_score()
last_post_response = task.latest_post_response()
last_response_dict={'response' : last_response, 'score' : last_score, 'post_response' : post_response, 'type' : task_type}
return last_response, last_score return last_response_dict
def update_task_states(self): def update_task_states(self):
changed=False changed=False
...@@ -285,7 +290,12 @@ class CombinedOpenEndedModule(XModule): ...@@ -285,7 +290,12 @@ class CombinedOpenEndedModule(XModule):
return json.dumps(state) return json.dumps(state)
def get_status(self): def get_status(self):
pass status=[]
for i in xrange(0,self.current_task_number):
task_data = self.get_last_response(i)
status.append(task_data)
context = {'status_list' : status}
status_html = self.system.render_template("combined_open_ended_status.html", context)
class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor): class CombinedOpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
""" """
......
...@@ -243,6 +243,9 @@ class OpenEndedChild(): ...@@ -243,6 +243,9 @@ class OpenEndedChild():
def handle_ajax(self): def handle_ajax(self):
pass pass
def type(self):
pass
...@@ -296,7 +296,6 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor): ...@@ -296,7 +296,6 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
'hintprompt': parse('hintprompt'), 'hintprompt': parse('hintprompt'),
} }
def definition_to_xml(self, resource_fs): def definition_to_xml(self, resource_fs):
'''Return an xml element representing this definition.''' '''Return an xml element representing this definition.'''
elt = etree.Element('selfassessment') elt = etree.Element('selfassessment')
......
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