Remove annoying rubric parsing error, redo how notifications work

This commit is contained in:
Vik Paruchuri
2013-08-08 13:16:32 -04:00
parent 45d94c17f7
commit bd9097596c
3 changed files with 1 additions and 8 deletions

View File

@@ -201,10 +201,6 @@ class @CombinedOpenEnded
@rebind()
if @task_number>1
@show_combined_rubric_current()
@show_results_current()
show_results_current: () =>
data = {'task_number' : @task_number-1}
$.postWithPrefix "#{@ajax_url}/get_results", data, (response) =>

View File

@@ -267,8 +267,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
try:
rubric_scores = json.loads(latest_post_assessment)
except:
# This is a dev_facing_error
log.error("Cannot parse rubric scores in self assessment module from {0}".format(latest_post_assessment))
rubric_scores = []
return [rubric_scores]

View File

@@ -93,7 +93,6 @@ def peer_grading_notifications(course, user):
log.info(
"Problem with getting notifications from peer grading service for course {0} user {1}.".format(course_id,
student_id))
if pending_grading:
img_path = "/static/images/grading_notification.png"
@@ -166,7 +165,7 @@ def combined_notifications(course, user):
last_time_viewed)
notifications = json.loads(controller_response)
if notifications['success']:
if notifications['overall_need_to_check']:
if notifications['staff_needs_to_grade'] or notifications['student_needs_to_peer_grade']:
pending_grading = True
except:
#Non catastrophic error, so no real action