Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make event handlers fire properly

Browse Source 
Respond to review comments

LMS-1242
This commit is contained in:
Sarina Canelake
2013-10-29 16:56:49 -04:00
parent 57a57e8af7
commit b86e912905
12 changed files with 78 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lms/djangoapps/instructor/views/api.py
View File

@@ -690,21 +690,25 @@ def list_instructor_tasks(request, course_id):
"""
# Pull out information from the task
features = ['task_type', 'task_input', 'task_id', 'requester', 'task_state']
task_feature_dict = dict((feature, str(getattr(task, feature))) for feature in features)
task_feature_dict = {feature: str(getattr(task, feature)) for feature in features}
# Some information (created, duration, status, task message) require additional formatting
task_feature_dict['created'] = task.created.isoformat()
# Get duration info, if known
duration_sec = 'unknown'
if hasattr(task, 'task_output') and task.task_output is not None:
task_output = json.loads(task.task_output)
if 'duration_ms' in task_output:
duration_sec = int(task_output['duration_ms'] / 1000.0)
try:
task_output = json.loads(task.task_output)
except ValueError:
log.error("Could not parse task output as valid json; task output: %s", task.task_output)
else:
if 'duration_ms' in task_output:
duration_sec = int(task_output['duration_ms'] / 1000.0)
task_feature_dict['duration_sec'] = duration_sec
# Get progress status message & success information
success, task_message = get_task_completion_info(task)
status = "Complete" if success else "Incomplete"
status = _("Complete") if success else _("Incomplete")
task_feature_dict['status'] = status
task_feature_dict['task_message'] = task_message

2
lms/djangoapps/instructor/views/instructor_dashboard.py
View File

@@ -95,7 +95,7 @@ def _section_course_info(course_id):
""" Provide data for the corresponding dashboard section """
course = get_course_by_id(course_id, depth=None)
(course_org, course_num, course_name) = course_id.split('/')
course_org, course_num, course_name = course_id.split('/')
section_data = {
'section_key': 'course_info',