diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 88b3c3cd80..d55abbe760 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -217,20 +217,26 @@ class TestCenterUser(models.Model):
return False
- def update(self, dict):
- # leave user and client_candidate_id as before
- self.user_updated_at = datetime.now()
- for fieldname in TestCenterUser.user_provided_fields():
- self.__setattr__(fieldname, dict[fieldname])
+# def update(self, dict):
+# # leave user and client_candidate_id as before
+# self.user_updated_at = datetime.now()
+# for fieldname in TestCenterUser.user_provided_fields():
+# self.__setattr__(fieldname, dict[fieldname])
- @staticmethod
- def create(user, dict):
- testcenter_user = TestCenterUser(user=user)
- testcenter_user.update(dict)
- # testcenter_user.candidate_id remains unset
- # TODO: assign an ID of our own:
- testcenter_user.client_candidate_id = 'edx' + '123456' # some unique value
+# @staticmethod
+# def create(user, dict):
+# testcenter_user = TestCenterUser(user=user)
+# testcenter_user.update(dict)
+# # testcenter_user.candidate_id remains unset
+# # TODO: assign an ID of our own:
+# testcenter_user.client_candidate_id = 'edx' + unique_id_for_user(user) # some unique value
+ @staticmethod
+ def create(user):
+ testcenter_user = TestCenterUser(user=user)
+ # testcenter_user.candidate_id remains unset
+ # assign an ID of our own:
+ testcenter_user.client_candidate_id = 'edx' + unique_id_for_user(user) # some unique value
class TestCenterUserForm(ModelForm):
class Meta:
@@ -239,8 +245,11 @@ class TestCenterUserForm(ModelForm):
'address_1', 'address_2', 'address_3', 'city', 'state', 'postal_code', 'country',
'phone', 'extension', 'phone_country_code', 'fax', 'fax_country_code', 'company_name')
-
-
+ def update_and_save(self):
+ new_user = self.save(commit=False)
+ # create additional values here:
+ new_user.user_updated_at = datetime.now()
+ new_user.save()
@@ -286,7 +295,7 @@ class TestCenterRegistration(models.Model):
user_updated_at = models.DateTimeField(db_index=True)
# "client_authorization_id" is the client's unique identifier for the authorization.
# This must be present for an update or delete to be sent to Pearson.
- # client_authorization_id = models.CharField(max_length=20, unique=True, db_index=True)
+ #client_authorization_id = models.CharField(max_length=20, unique=True, db_index=True)
# information about the test, from the course policy:
exam_series_code = models.CharField(max_length=15, db_index=True)
@@ -312,24 +321,50 @@ class TestCenterRegistration(models.Model):
def client_candidate_id(self):
return self.testcenter_user.client_candidate_id
- @property
- def client_authorization_id(self):
- # TODO: make this explicitly into a string object:
- return self.id
+ @staticmethod
+ def create(testcenter_user, course_id, exam_info, accommodation_request):
+ registration = TestCenterRegistration(testcenter_user = testcenter_user)
+ registration.course_id = course_id
+ registration.accommodation_request = accommodation_request
+ registration.exam_series_code = exam_info.get('Exam_Series_Code')
+ registration.eligibility_appointment_date_first = exam_info.get('First_Eligible_Appointment_Date')
+ registration.eligibility_appointment_date_last = exam_info.get('Last_Eligible_Appointment_Date')
+ # accommodation_code remains blank for now, along with Pearson confirmation
+ registration.user_updated_at = datetime.now()
+ #registration.client_authorization_id = registration._create_client_authorization_id()
+ return registration
+
+ def _create_client_authorization_id(self):
+ """
+ Return a unique id for a registration, suitable for inserting into
+ e.g. personalized survey links.
+ """
+ # include the secret key as a salt, and to make the ids unique across
+ # different LMS installs. Then add in (user, course, exam), which should
+ # be unique.
+ h = hashlib.md5()
+ h.update(settings.SECRET_KEY)
+ h.update(str(self.testcenter_user.user.id))
+ h.update(str(self.course_id))
+ h.update(str(self.exam_series_code))
+ return h.hexdigest()
-def get_testcenter_registrations_for_user_and_course(user, course_id):
+def get_testcenter_registrations_for_user_and_course(user, course_id, exam_series_code=None):
try:
tcu = TestCenterUser.objects.get(user=user)
except TestCenterUser.DoesNotExist:
return []
- return TestCenterRegistration.objects.filter(testcenter_user=tcu, course_id=course_id)
-
+ if exam_series_code is None:
+ return TestCenterRegistration.objects.filter(testcenter_user=tcu, course_id=course_id)
+ else:
+ return TestCenterRegistration.objects.filter(testcenter_user=tcu, course_id=course_id, exam_series_code=exam_series_code)
+
def unique_id_for_user(user):
"""
Return a unique id for a user, suitable for inserting into
e.g. personalized survey links.
"""
- # include the secret key as a salt, and to make the ids unique accross
+ # include the secret key as a salt, and to make the ids unique across
# different LMS installs.
h = hashlib.md5()
h.update(settings.SECRET_KEY)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 202bfefac5..1ad464bbc6 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -614,6 +614,8 @@ def begin_test_registration(request, course_id, form=None, message=''):
registration = registrations[0]
else:
registration = None
+
+ log.info("User {0} enrolled in course {1} calls for test registration page".format(user.username, course_id))
# we want to populate the registration page with the relevant information,
# if it already exists. Create an empty object otherwise.
@@ -654,44 +656,31 @@ def create_test_registration(request, post_override=None):
user = User.objects.get(username=username)
course_id = post_vars['course_id']
course = (course_from_id(course_id)) # assume it will be found....
+ log.info("User {0} enrolled in course {1} clicked on enter/update demographic info for test registration".format(user.username, course_id))
-# needs_saving = False
try:
testcenter_user = TestCenterUser.objects.get(user=user)
except TestCenterUser.DoesNotExist:
- testcenter_user = TestCenterUser(user=user)
+ # do additional initialization here:
+ testcenter_user = TestCenterUser.create(user)
needs_updating = testcenter_user.needs_update(post_vars)
-# if needs_updating:
-# testcenter_user.update(post_vars)
-# needs_saving = True
-
- # except TestCenterUser.DoesNotExist:
- # did not find the TestCenterUser, so create a new one
-# testcenter_user = TestCenterUser.create(user, post_vars)
-# needs_saving = True
# perform validation:
if needs_updating:
+ log.info("User {0} enrolled in course {1} updating demographic info for test registration".format(user.username, course_id))
try:
# first perform validation on the user information
# using a Django Form.
form = TestCenterUserForm(instance=testcenter_user, data=post_vars)
if not form.is_valid():
- return begin_test_registration(request, course_id, form, 'failed to validate')
-# response_data = {'success': False}
-# # return a list of errors...
-# response_data['field_errors'] = form.errors
-# response_data['non_field_errors'] = form.non_field_errors()
-# return HttpResponse(json.dumps(response_data))
-
- new_user = form.save(commit=False)
- # create additional values here:
- new_user.user_updated_at = datetime.datetime.now()
- # TODO: create client value....
- new_user.save()
-
- # testcenter_user.save()
+# return begin_test_registration(request, course_id, form, 'failed to validate')
+ response_data = {'success': False}
+ # return a list of errors...
+ response_data['field_errors'] = form.errors
+ response_data['non_field_errors'] = form.non_field_errors()
+ return HttpResponse(json.dumps(response_data), mimetype="application/json")
+ form.update_and_save()
except IntegrityError, ie:
js = {'success': False}
error_msg = unicode(ie);
@@ -700,15 +689,16 @@ def create_test_registration(request, post_override=None):
if error_msg.find(fieldname) >= 0:
js['value'] = error_msg
js['field'] = fieldname
- return HttpResponse(json.dumps(js))
+ return HttpResponse(json.dumps(js), mimetype="application/json")
# otherwise just return the error message
js['value'] = error_msg
js['field'] = "General Error"
- return HttpResponse(json.dumps(js))
+ return HttpResponse(json.dumps(js), mimetype="application/json")
# create and save the registration:
needs_saving = False
- registrations = get_testcenter_registrations_for_user_and_course(user, course.id)
+ exam_info = course.testcenter_info
+ registrations = get_testcenter_registrations_for_user_and_course(user, course_id)
# In future, this should check the exam series code of the registrations, if there
# were multiple.
if len(registrations) > 0:
@@ -719,15 +709,8 @@ def create_test_registration(request, post_override=None):
# right now.
else:
- registration = TestCenterRegistration(testcenter_user = testcenter_user)
- registration.course_id = post_vars['course_id']
- registration.accommodation_request = post_vars.get('accommodations','')
- exam_info = course.testcenter_info
- registration.exam_series_code = exam_info.get('Exam_Series_Code')
- registration.eligibility_appointment_date_first = exam_info.get('First_Eligible_Appointment_Date')
- registration.eligibility_appointment_date_last = exam_info.get('Last_Eligible_Appointment_Date')
- # accommodation_code remains blank for now, along with Pearson confirmation
- registration.user_updated_at = datetime.datetime.now()
+ accommodation_request = post_vars.get('accommodations','')
+ registration = TestCenterRegistration.create(testcenter_user, course_id, exam_info, accommodation_request)
needs_saving = True
# "client_authorization_id" is the client's unique identifier for the authorization.
@@ -790,14 +773,17 @@ def create_test_registration(request, post_override=None):
except:
log.exception(sys.exc_info())
js['value'] = 'Could not send accommodation e-mail.'
- return HttpResponse(json.dumps(js))
+ return HttpResponse(json.dumps(js), mimetype="application/json")
# TODO: enable appropriate stat
# statsd.increment("common.student.account_created")
-# js = {'success': True}
-# return HttpResponse(json.dumps(js), mimetype="application/json")
- return HttpResponseRedirect(reverse('dashboard'))
+ log.info("User {0} enrolled in course {1} returning from enter/update demographic info for test registration".format(user.username, course_id))
+
+ js = {'success': True}
+ return HttpResponse(json.dumps(js), mimetype="application/json")
+# return HttpResponseRedirect(reverse('dashboard'))
+ #return HttpResponse("Hello world")
def get_random_post_override():
diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html
index fe175b11e4..b5080ab9b2 100644
--- a/lms/templates/test_center_register.html
+++ b/lms/templates/test_center_register.html
@@ -10,7 +10,7 @@
<%namespace name='static' file='static_content.html'/>
<%block name="title">Pearson VUE Test Center Proctoring - Sign Up
-<%doc>
+
<%block name="js_extra">
-
-