Commit 257f7329 by Douglas Hall

Merge pull request #257 from edx/hasnain-naveed/PHX-239-admin-error

PHX-239 / Removed the "not reviewed" status from the model
parents 6f3895f8 f35d5462
...@@ -386,7 +386,6 @@ class ProctoredExamAttemptForm(forms.ModelForm): ...@@ -386,7 +386,6 @@ class ProctoredExamAttemptForm(forms.ModelForm):
(ProctoredExamStudentAttemptStatus.second_review_required, _('Second Review Required')), (ProctoredExamStudentAttemptStatus.second_review_required, _('Second Review Required')),
(ProctoredExamStudentAttemptStatus.verified, _('Verified')), (ProctoredExamStudentAttemptStatus.verified, _('Verified')),
(ProctoredExamStudentAttemptStatus.rejected, _('Rejected')), (ProctoredExamStudentAttemptStatus.rejected, _('Rejected')),
(ProctoredExamStudentAttemptStatus.not_reviewed, _('Not Reviewed')),
(ProctoredExamStudentAttemptStatus.error, _('Error')), (ProctoredExamStudentAttemptStatus.error, _('Error')),
] ]
......
...@@ -159,9 +159,6 @@ class ProctoredExamStudentAttemptStatus(object): ...@@ -159,9 +159,6 @@ class ProctoredExamStudentAttemptStatus(object):
# the exam has been rejected # the exam has been rejected
rejected = 'rejected' rejected = 'rejected'
# the exam was not reviewed
not_reviewed = 'not_reviewed'
# the exam is believed to be in error # the exam is believed to be in error
error = 'error' error = 'error'
...@@ -180,7 +177,7 @@ class ProctoredExamStudentAttemptStatus(object): ...@@ -180,7 +177,7 @@ class ProctoredExamStudentAttemptStatus(object):
""" """
return status in [ return status in [
cls.declined, cls.timed_out, cls.submitted, cls.second_review_required, cls.declined, cls.timed_out, cls.submitted, cls.second_review_required,
cls.verified, cls.rejected, cls.not_reviewed, cls.error cls.verified, cls.rejected, cls.error
] ]
@classmethod @classmethod
...@@ -199,8 +196,7 @@ class ProctoredExamStudentAttemptStatus(object): ...@@ -199,8 +196,7 @@ class ProctoredExamStudentAttemptStatus(object):
Returns a boolean if the passed in to_status calls for an update to the credit requirement status. Returns a boolean if the passed in to_status calls for an update to the credit requirement status.
""" """
return to_status in [ return to_status in [
cls.verified, cls.rejected, cls.declined, cls.not_reviewed, cls.verified, cls.rejected, cls.declined, cls.submitted, cls.error
cls.submitted, cls.error
] ]
@classmethod @classmethod
......
...@@ -18,7 +18,6 @@ var edx = edx || {}; ...@@ -18,7 +18,6 @@ var edx = edx || {};
submitted: gettext('Submitted'), submitted: gettext('Submitted'),
verified: gettext('Verified'), verified: gettext('Verified'),
rejected: gettext('Rejected'), rejected: gettext('Rejected'),
not_reviewed: gettext('Not reviewed'),
error: gettext('Error') error: gettext('Error')
}; };
var viewHelper = { var viewHelper = {
......
...@@ -2089,7 +2089,6 @@ class ProctoredExamApiTests(LoggedInTestCase): ...@@ -2089,7 +2089,6 @@ class ProctoredExamApiTests(LoggedInTestCase):
(ProctoredExamStudentAttemptStatus.submitted, ProctoredExamStudentAttemptStatus.ready_to_start), (ProctoredExamStudentAttemptStatus.submitted, ProctoredExamStudentAttemptStatus.ready_to_start),
(ProctoredExamStudentAttemptStatus.verified, ProctoredExamStudentAttemptStatus.started), (ProctoredExamStudentAttemptStatus.verified, ProctoredExamStudentAttemptStatus.started),
(ProctoredExamStudentAttemptStatus.rejected, ProctoredExamStudentAttemptStatus.started), (ProctoredExamStudentAttemptStatus.rejected, ProctoredExamStudentAttemptStatus.started),
(ProctoredExamStudentAttemptStatus.not_reviewed, ProctoredExamStudentAttemptStatus.started),
(ProctoredExamStudentAttemptStatus.error, ProctoredExamStudentAttemptStatus.started), (ProctoredExamStudentAttemptStatus.error, ProctoredExamStudentAttemptStatus.started),
(ProctoredExamStudentAttemptStatus.submitted, ProctoredExamStudentAttemptStatus.error), (ProctoredExamStudentAttemptStatus.submitted, ProctoredExamStudentAttemptStatus.error),
) )
...@@ -2560,7 +2559,6 @@ class ProctoredExamApiTests(LoggedInTestCase): ...@@ -2560,7 +2559,6 @@ class ProctoredExamApiTests(LoggedInTestCase):
ProctoredExamStudentAttemptStatus.ready_to_submit, ProctoredExamStudentAttemptStatus.ready_to_submit,
ProctoredExamStudentAttemptStatus.declined, ProctoredExamStudentAttemptStatus.declined,
ProctoredExamStudentAttemptStatus.timed_out, ProctoredExamStudentAttemptStatus.timed_out,
ProctoredExamStudentAttemptStatus.not_reviewed,
ProctoredExamStudentAttemptStatus.error ProctoredExamStudentAttemptStatus.error
) )
@patch.dict('settings.PROCTORING_SETTINGS', {'ALLOW_TIMED_OUT_STATE': True}) @patch.dict('settings.PROCTORING_SETTINGS', {'ALLOW_TIMED_OUT_STATE': True})
......
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