Skip to content

E
edx-platform
Commit a5cce476 by Brian Wilson
Options

add accommodation listing, and revise error messages

parent 25f08374
Showing with 22 additions and 80 deletions
common/djangoapps/student/models.py
...@@ -53,9 +53,6 @@ from django.forms import ModelForm, forms ...@@ -53,9 +53,6 @@ from django.forms import ModelForm, forms
import comment_client as cc import comment_client as cc
from django_comment_client.models import Role from django_comment_client.models import Role
from feedparser import binascii
import os
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
...@@ -329,7 +326,7 @@ class TestCenterUserForm(ModelForm): ...@@ -329,7 +326,7 @@ class TestCenterUserForm(ModelForm):
# our own code to indicate that a request has been rejected. # our own code to indicate that a request has been rejected.
ACCOMMODATION_REJECTED_CODE = 'NONE' ACCOMMODATION_REJECTED_CODE = 'NONE'
ACCOMODATION_CODES = ( ACCOMMODATION_CODES = (
(ACCOMMODATION_REJECTED_CODE, 'No Accommodation Granted'), (ACCOMMODATION_REJECTED_CODE, 'No Accommodation Granted'),
('EQPMNT', 'Equipment'), ('EQPMNT', 'Equipment'),
('ET12ET', 'Extra Time - 1/2 Exam Time'), ('ET12ET', 'Extra Time - 1/2 Exam Time'),
...@@ -343,6 +340,8 @@ ACCOMODATION_CODES = ( ...@@ -343,6 +340,8 @@ ACCOMODATION_CODES = (
('SRSGNR', 'Separate Room and Sign Language Interpreter'), ('SRSGNR', 'Separate Room and Sign Language Interpreter'),
) )
ACCOMMODATION_CODE_DICT = { code : name for (code, name) in ACCOMMODATION_CODES }
class TestCenterRegistration(models.Model): class TestCenterRegistration(models.Model):
""" """
This is our representation of a user's registration for in-person testing, This is our representation of a user's registration for in-person testing,
...@@ -494,14 +493,11 @@ class TestCenterRegistration(models.Model): ...@@ -494,14 +493,11 @@ class TestCenterRegistration(models.Model):
def is_pending(self): def is_pending(self):
return not self.is_accepted and not self.is_rejected return not self.is_accepted and not self.is_rejected
@property def get_accommodation_codes(self):
def is_pending_accommodation(self): return self.accommodation_code.split('*')
return self.accommodation_is_pending
@property
def is_pending_acknowledgement(self):
return (not self.is_accepted and not self.is_rejected) and not self.is_pending_accommodation
def get_accommodation_names(self):
return [ ACCOMMODATION_CODE_DICT.get(code, "Unknown code " + code) for code in self.get_accommodation_codes() ]
class TestCenterRegistrationForm(ModelForm): class TestCenterRegistrationForm(ModelForm):
class Meta: class Meta:
......
lms/templates/dashboard.html
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
<p class="message-copy">Your <p class="message-copy">Your
<a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a> <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
has been rejected. Please check the information you provided, and try to correct any demographic errors. Otherwise has been rejected. Please check the information you provided, and try to correct any demographic errors. Otherwise
contact someone at edX or Pearson, or just scream for help.</p> contact edX for further help.</p>
</div> </div>
% endif % endif
......
lms/templates/test_center_register.html
...@@ -103,11 +103,13 @@ ...@@ -103,11 +103,13 @@
% if registration: % if registration:
<% exam_help_href = "mailto:exam-help@edx.org?subject=Pearson VUE Exam - %s %s".format(get_course_about_section(course, 'university'), course.number) %>
% if registration.is_rejected: % if registration.is_rejected:
<section class="status message message-flash registration-rejected message-action"> <section class="status message message-flash registration-rejected message-action">
<h3 class="message-title">Your registration for the Pearson exam has been rejected</h3> <h3 class="message-title">Your registration for the Pearson exam has been rejected</h3>
<p class="message-copy">Please check the information you provided, and try to correct any demographic errors. Otherwise contact someone at edX or Pearson, or just scream for help.</p> <p class="message-copy">Please check the information you provided, and try to correct any demographic errors. Otherwise contact edX at exam-help@edx.org.</p>
<a href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}" class="button contact-button">Contact exam-help@edx.org</a> <a href="${exam_help_href}" class="button contact-button">Contact exam-help@edx.org</a>
</section> </section>
% endif % endif
...@@ -344,7 +346,10 @@ ...@@ -344,7 +346,10 @@
% if registration.demographics_is_rejected: % if registration.demographics_is_rejected:
<li class="item status status-rejected status-demographics"> <li class="item status status-rejected status-demographics">
<h4 class="title">Demographic Information</h4> <h4 class="title">Demographic Information</h4>
<p class="details">The demographic information you most recently provided has been rejected by Pearson. You can correct and submit it again before the exam registration closes on <strong>${exam_info.registration_end_date_text}</strong>.</p> <p class="details">The demographic information you most recently provided has been rejected by Pearson. You can correct and submit it again before the exam registration closes on <strong>${exam_info.registration_end_date_text}</strong>.
The error message is:</p>
<p class="details">${registration.testcenter_user.upload_error_message}.</p>
<p class="details">If the error is not correctable by revising demographic information and resubmitting, please contact edX at <a href="${exam_help_href}">exam-help@edx.org</a>.</p>
</li> </li>
% endif % endif
...@@ -361,9 +366,9 @@ ...@@ -361,9 +366,9 @@
<p class="details">Your requested accommodations have been reviewed and processed. You are allowed:</p> <p class="details">Your requested accommodations have been reviewed and processed. You are allowed:</p>
<ul class="accommodations-list"> <ul class="accommodations-list">
<li class="item">Extra Time - Double Time</li> % for accommodation_name in registration.get_accommodation_names():
<li class="item">Separate Room & Reader/Recorder</li> <li class="item">${accommodation_name}</li>
<li class="item">Equipment</li> % endfor
</ul> </ul>
</li> </li>
% endif % endif
...@@ -390,7 +395,9 @@ ...@@ -390,7 +395,9 @@
% if registration.registration_is_rejected: % if registration.registration_is_rejected:
<li class="item status status-rejected status-registration"> <li class="item status status-rejected status-registration">
<h4 class="title">Registration Request</h4> <h4 class="title">Registration Request</h4>
<p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>.</p> <p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>.
Please contact edX at <a href="${exam_help_href}">exam-help@edx.org</a>. The error message is:</p>
<p class="details">${registration.upload_error_message}.</p>
</li> </li>
% endif % endif
...@@ -398,67 +405,6 @@ ...@@ -398,67 +405,6 @@
</div> </div>
<!-- NOTE: Dem processed, Accom pending, Registration pending -->
<div class="message message-status registration-pending is-shown">
<h3>Pearson Exam Registration Status</h3>
<ol class="status-list">
<li class="item status status-processed status-demographics">
<h4 class="title">Demographic Information</h4>
<p class="details">The demographic information you most recently provided has been processed. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
</li>
<li class="item status status-pending status-accommodations">
<h4 class="title">Accommodations Request</h4>
<p class="details">Your requested accommodations are pending. Within a few days, you should see confirmation here of granted accommodations.</p>
</li>
<li class="item status status-pending status-registration">
<h4 class="title">Registration Request</h4>
<p class="details">Your exam registration is pending. Once your information is processed, it will be forwarded to Pearson and you will be able to schedule an exam.</p>
</li>
</ol>
</div>
<!-- NOTE: Dem processed, Accom processed, Registration processed -->
<div class="message message-status registration-processed is-shown">
<h3>Pearson Exam Registration Status</h3>
<ol class="status-list">
<li class="item status status-processed status-demographics">
<h4 class="title">Demographic Information</h4>
<p class="details">The demographic information you most recently provided has been processed. You may edit this information at any point before exam registration closes on <strong>${exam_info.registration_end_date_text}</strong></p>
</li>
<li class="item status status-processed status-accommodations">
<h4 class="title">Accommodations Request</h4>
<p class="details">Your requested accommodations have been reviewed and processed. You are allowed:</p>
<ul class="accommodations-list">
<li class="item">Extra Time - Double Time</li>
<li class="item">Separate Room & Reader/Recorder</li>
<li class="item">Equipment</li>
</ul>
</li>
<li class="item status status-processed status-registration">
<h4 class="title">Registration Request</h4>
<p class="details">Your exam registration has been processed and has been forwarded to Pearson. You are now able to schedule an exam.</p>
</li>
</ol>
</div>
<!-- NOTE: Dem rejected, Accom none, Registration rejected -->
<div class="message message-status registration-rejected is-shown">
<h3>Pearson Exam Registration Status</h3>
<ol class="status-list">
<li class="item status status-rejected status-demographics">
<h4 class="title">Demographic Information</h4>
<p class="details">The demographic information you most recently provided has been rejected by Pearson. You can correct and submit it again before the exam registration closes on <strong>${exam_info.registration_end_date_text}</strong>.</p>
</li>
<li class="item status status-rejected status-registration">
<h4 class="title">Registration Request</h4>
<p class="details">Your exam registration has been rejected by Pearson. <strong>You currently cannot schedule an exam</strong>.</p>
</li>
</ol>
</div>
% endif % endif
......
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