New registration form

common/djangoapps/student/models.py

@@ -25,6 +25,7 @@ from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.forms import ModelForm, forms
+from django.utils.translation import ugettext_lazy as _
 
 import comment_client as cc
 from pytz import UTC
@@ -62,6 +63,13 @@ class UserProfile(models.Model):
     user = models.OneToOneField(User, unique=True, db_index=True, related_name='profile')
     name = models.CharField(blank=True, max_length=255, db_index=True)
     
+    lastname = models.CharField(blank=False, null=True, max_length=30, db_index=True)
+    firstname = models.CharField(blank=False, null=True, max_length=30, db_index=True)
+    middlename = models.CharField(blank=False, null=True, max_length=30, db_index=True)
+    
+    
+
+
     meta = models.TextField(blank=True)  # JSON dictionary for future expansion
     courseware = models.CharField(blank=True, max_length=255, default='course.xml')
 
@@ -74,6 +82,7 @@ class UserProfile(models.Model):
     this_year = datetime.now(UTC).year
     VALID_YEARS = range(this_year, this_year - 120, -1)
     year_of_birth = models.IntegerField(blank=True, null=True, db_index=True)
+    
     GENDER_CHOICES = (('m', 'Male'), ('f', 'Female'), ('o', 'Other'))
     gender = models.CharField(
         blank=True, null=True, max_length=6, db_index=True, choices=GENDER_CHOICES
@@ -84,20 +93,108 @@ class UserProfile(models.Model):
     # ('p_se', 'Doctorate in science or engineering'),
     # ('p_oth', 'Doctorate in another field'),
     LEVEL_OF_EDUCATION_CHOICES = (
-        ('p', 'Doctorate'),
-        ('m', "Master's or professional degree"),
-        ('b', "Bachelor's degree"),
-        ('a', "Associate's degree"),
-        ('hs', "Secondary/high school"),
-        ('jhs', "Junior secondary/junior high/middle school"),
-        ('el', "Elementary/primary school"),
-        ('none', "None"),
-        ('other', "Other")
+        ('p', _("Doctorate")),
+        ('m', _("Master's or professional degree")),
+        ('b', _("Bachelor's degree")),
+        ('a', _("Associate's degree")),
+        ('hs', _("Secondary/high school")),
+        ('jhs', _("Junior secondary/junior high/middle school")),
+        ('el', _("Elementary/primary school")),
+        ('none', _("None")),
+        ('other', _("Other"))
     )
     level_of_education = models.CharField(
         blank=True, null=True, max_length=6, db_index=True,
         choices=LEVEL_OF_EDUCATION_CHOICES
     )
+    
+    education_place = models.CharField(blank=False, null=True, max_length=255, db_index=False)
+    education_year = models.IntegerField(blank=False, null=True, db_index=True)
+    education_qualification = models.CharField(blank=True, null=True, max_length=30)
+    education_specialty = models.CharField(blank=True, null=True, max_length=30)
+    
+    
+    WORK_TYPE_CHOICES = (
+        ('sch', _("School")),
+        ('lyc', _("Lyceum")),
+        ('edc', _('Education Center')),
+        ('gymn', _('Gymnasium')),
+        ('edu', _('Educational complex')),
+        ('kind', _('Kindergarten')),
+        ('npe', _('Non-profit educational institution')),
+        ('coll', _('College')),
+        ('none', _('None')),
+        ('other', _('Other'))
+    )
+    work_type = models.CharField(blank=False, null=True, max_length=6, choices=WORK_TYPE_CHOICES)
+    work_number = models.IntegerField(blank=False, null=True, db_index=True)
+    work_name = models.CharField(blank=False, null=True, max_length=255, db_index=False)
+    work_login = models.CharField(blank=False, null=True, max_length=10, db_index=False)
+    WORK_LOCATION_CHOICES = (
+        ('CAO', 'Central Administrative Okrug'),
+        ('EAO', 'Eastern Administrative Okrug'),
+        ('WAO', 'Western Administrative Okrug'),
+        ('NAO', 'Northern Administrative Okrug'),
+        ('NEAO', 'North-Eastern Administrative Okrug'),
+        ('NWAO', 'North-Western Administrative Okrug'),
+        ('SWAO', 'South-Western Administrative Okrug'),
+        ('SEAO', 'South-Eastern Administrative Okrug'),
+        ('SAO', 'Southern Administrative Okrug'),
+        ('zel', 'Zelenogradsky Administrative Okrug'),
+        ('troi', 'Troitsky Administrative Okrug'),
+        ('novo', 'Novomoskovsky Administrative Okrug'),
+        ('city', 'Territorial units with special status'),
+        ('non', 'None'),
+        ('other', 'Other')
+    )
+    work_location = models.CharField(blank=False, null=True, max_length=6, db_index=False, choices=WORK_LOCATION_CHOICES)
+    WORK_OCCUPATION_CHOICES = (
+        ('tchr', _('Teacher')),
+        ('tchrorg', _('Teacher and organizer')),
+        ('scltchr', _('Social teacher')),
+        ('edupsy', _('Educational Psychologist')),
+        ('care', _('Caregiver (including older)')),
+        ('mng', _('Manager (Director, Head of) the educational institution')),
+        ('vcmng', _('Vice manager (director, head of) the educational institution')),
+        ('smstr', _('Senior master')),
+        ('intr', _('Instructor')),
+        ('tchrsp', _('Teacher-pathologists, speech therapists (speech therapist)')),
+        ('tutor', _('Tutor')),
+        ('tchrlib', _('Teacher-librarian')),
+        ('slead', _('Senior leader')),
+        ('tchredu', _('Teacher of additional education (including older)')),
+        ('mushead', _('Musical head')),
+        ('conc', _('Concertmaster')),
+        ('mstrphy', _('Master of Physical Education')),
+        ('instphy', _('Instructor of Physical Education')),
+        ('meth', _('The Methodist (including older)')),
+        ('instlab', _('Instructor for Labour')),
+        ('instorg', _('Instructor-organizer life safety')),
+        ('coach', _('Coach and teacher (including older)')),
+        ('mstrind', _('Master of of industrial training')),
+        ('dtreg', _('The duty on the regime (including older)')),
+        ('lead', _('Leader')),
+        ('ascare', _('Assistant caregiver')),
+        ('juncare', _('Junior caregiver')),
+        ('secr', _('Secretary of teaching department')),
+        ('disp', _('Dispatcher of the educational institution')),
+        ('other', _('Other'))
+    )
+    work_occupation = models.CharField(blank=False, null=True, max_length=10, db_index=False, choices=WORK_OCCUPATION_CHOICES)
+    work_occupation_other = models.CharField(blank=True, max_length=10, db_index=False, choices=WORK_OCCUPATION_CHOICES)
+    work_teaching_experience = models.IntegerField(blank=True, null=True, db_index=True)
+    work_managing_experience = models.IntegerField(blank=False, null=True, db_index=True)
+    WORK_QUALIFICATION_CATEGORY_CHOICES = (
+        ('none', _("None")),
+        ('high', _("High")),
+        ('first', _("First")),
+        ('second', _("Second"))
+    )
+    work_qualification_category = models.CharField(blank=False, null=True, max_length=10, db_index=False, choices=WORK_QUALIFICATION_CATEGORY_CHOICES) 
+    work_qualification_category_year = models.IntegerField(blank=False, null=True, db_index=True)
+    
+    contact_phone = models.CharField(blank=False, null=True, max_length=10, db_index=False)
+    
     mailing_address = models.TextField(blank=True, null=True)
     goals = models.TextField(blank=True, null=True)
     allow_certificate = models.BooleanField(default=1)

common/djangoapps/student/views.py

@@ -526,7 +526,7 @@ def _do_create_account(post_vars):
 
     Note: this function is also used for creating test users.
     """
-    user = User(username=post_vars['username'],
+    user = User(username=post_vars['email'],
                 email=post_vars['email'],
                 is_active=False)
     user.set_password(post_vars['password'])
@@ -538,11 +538,6 @@ def _do_create_account(post_vars):
     except IntegrityError:
         js = {'success': False}
         # Figure out the cause of the integrity error
-        if len(User.objects.filter(username=post_vars['username'])) > 0:
-            js['value'] = _("An account with the Public Username '{username}' already exists.").format(username=post_vars['username'])
-            js['field'] = 'username'
-            return HttpResponse(json.dumps(js))
-
         if len(User.objects.filter(email=post_vars['email'])) > 0:
             js['value'] = _("An account with the Email '{email}' already exists.").format(email=post_vars['email'])
             js['field'] = 'email'
@@ -553,18 +548,34 @@ def _do_create_account(post_vars):
     registration.register(user)
 
     profile = UserProfile(user=user)
-    profile.name = post_vars['name']
+    profile.lastname = post_vars.get('lastname')
+    profile.firstname = post_vars.get('firstname')
+    profile.middlename = post_vars.get('middlename')
+    profile.year_of_birth = post_vars.get('year_of_birth')
     profile.level_of_education = post_vars.get('level_of_education')
-    profile.gender = post_vars.get('gender')
-    profile.mailing_address = post_vars.get('mailing_address')
-    profile.goals = post_vars.get('goals')
-
-    try:
-        profile.year_of_birth = int(post_vars['year_of_birth'])
-    except (ValueError, KeyError):
-        # If they give us garbage, just ignore it instead
-        # of asking them to put an integer.
-        profile.year_of_birth = None
+    profile.education_place = post_vars.get('education_place')
+    profile.education_year = post_vars.get('education_year')
+    profile.education_qualification = post_vars.get('education_qualification')
+    profile.education_specialty = post_vars.get('education_specialty')
+    profile.work_type = post_vars.get('work_type')
+    profile.work_number = post_vars.get('work_number')
+    profile.work_name = post_vars.get('work_name')
+    profile.work_login = post_vars.get('work_login')
+    profile.work_location = post_vars.get('work_location')
+    profile.work_occupation = post_vars.get('work_occupation')
+    profile.work_occupation_other = post_vars.get('work_occupation_other')
+    profile.work_teaching_experience = post_vars.get('work_teaching_experience')
+    profile.work_managing_experience = post_vars.get('work_managing_experience')
+    profile.work_qualification_category = post_vars.get('work_qualification_category')
+    profile.work_qualification_category_year = post_vars.get('work_qualification_category_year')
+    profile.contact_phone = post_vars.get('contact_phone')
+
+    # try:
+    #     profile.year_of_birth = int(post_vars['year_of_birth'])
+    # except (ValueError, KeyError):
+    #     # If they give us garbage, just ignore it instead
+    #     # of asking them to put an integer.
+    #     profile.year_of_birth = None
     try:
         profile.save()
     except Exception:
@@ -603,7 +614,7 @@ def create_account(request, post_override=None):
         log.debug(u'In create_account with external_auth: user = %s, email=%s', name, email)
 
     # Confirm we have a properly formed request
-    for a in ['username', 'email', 'password', 'name']:
+    for a in ['email', 'password']:
         if a not in post_vars:
             js['value'] = _("Error (401 {field}). E-mail us.").format(field=a)
             js['field'] = a
@@ -631,7 +642,11 @@ def create_account(request, post_override=None):
     # this is a good idea
     # TODO: Check password is sane
 
-    required_post_vars = ['username', 'email', 'name', 'password', 'terms_of_service', 'honor_code']
+    required_post_vars = ['email', 'password', 'lastname', 'firstname', 'middlename', 'year_of_birth',
+        'level_of_education', 'education_place', 'education_year',
+        'work_type', 'work_number', 'work_name', 'work_login', 'work_location',
+        'work_occupation', 'work_teaching_experience', 'work_qualification_category', 'work_qualification_category_year',
+        'contact_phone', 'terms_of_service', 'honor_code']
     if tos_not_required:
         required_post_vars = ['username', 'email', 'name', 'password', 'honor_code']
 
@@ -654,12 +669,12 @@ def create_account(request, post_override=None):
         js['field'] = 'email'
         return HttpResponse(json.dumps(js))
 
-    try:
-        validate_slug(post_vars['username'])
-    except ValidationError:
-        js['value'] = _("Username should only consist of A-Z and 0-9, with no spaces.").format(field=a)
-        js['field'] = 'username'
-        return HttpResponse(json.dumps(js))
+    # try:
+    #     validate_slug(post_vars['username'])
+    # except ValidationError:
+    #     js['value'] = _("Username should only consist of A-Z and 0-9, with no spaces.").format(field=a)
+    #     js['field'] = 'username'
+    #     return HttpResponse(json.dumps(js))
 
     # Ok, looks like everything is legit.  Create the account.
     ret = _do_create_account(post_vars)
@@ -667,7 +682,7 @@ def create_account(request, post_override=None):
         return ret
     (user, profile, registration) = ret
 
-    d = {'name': post_vars['name'],
+    d = {'name': post_vars['lastname'],
          'key': registration.activation_key,
          }
 
@@ -695,7 +710,7 @@ def create_account(request, post_override=None):
     # Immediately after a user creates an account, we log them in. They are only
     # logged in until they close the browser. They can't log in again until they click
     # the activation link from the email.
-    login_user = authenticate(username=post_vars['username'], password=post_vars['password'])
+    login_user = authenticate(username=post_vars['email'], password=post_vars['password'])
     login(request, login_user)
     request.session.set_expiry(0)
 
@@ -708,8 +723,8 @@ def create_account(request, post_override=None):
         eamap.user = login_user
         eamap.dtsignup = datetime.datetime.now(UTC)
         eamap.save()
-        AUDIT_LOG.info("User registered with external_auth %s", post_vars['username'])
-        AUDIT_LOG.info('Updated ExternalAuthMap for %s to be %s', post_vars['username'], eamap)
+        AUDIT_LOG.info("User registered with external_auth %s", post_vars['email'])
+        AUDIT_LOG.info('Updated ExternalAuthMap for %s to be %s', post_vars['email'], eamap)
 
         if settings.MITX_FEATURES.get('BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH'):
             log.info('bypassing activation email')

conf/locale/babel.cfg

 # Extraction from Python source files
-#[python: cms/**.py]
-#[python: lms/**.py]
-#[python: common/**.py]
+[python: cms/**.py]
+[python: lms/**.py]
+[python: common/**.py]
 
 # Extraction from Javscript source files
-#[javascript: cms/**.js]
-#[javascript: lms/**.js]
-#[javascript: common/static/js/capa/**.js]
-#[javascript: common/static/js/course_groups/**.js]
+[javascript: cms/**.js]
+[javascript: lms/**.js]
+[javascript: common/static/js/capa/**.js]
+[javascript: common/static/js/course_groups/**.js]
 # do not extract from common/static/js/vendor/**
 
 # Extraction from Mako templates

conf/locale/config

 {
- "locales" : ["en"],
+ "locales" : ["en","ru"],
  "dummy-locale" : "fr"
 }

lms/templates/register.html

@@ -12,7 +12,6 @@
 <%! from student.models import UserProfile %>
 <%! from datetime import date %>
 <%! import calendar %>
-
 <%block name="title"><title>${_("Register for {platform_name}").format(platform_name=settings.PLATFORM_NAME)}</title></%block>
 
 <%block name="js_extra">
@@ -123,16 +122,6 @@
             <label for="password">${_('Password')}</label>
             <input id="password" type="password" name="password" value="" required aria-required="true" />
           </li>
-          <li class="field required text" id="field-username">
-            <label for="username">${_('Public Username')}</label>
-            <input id="username" type="text" name="username" value="" placeholder="${_('example: JaneDoe')}" required aria-required="true" />
-            <span class="tip tip-input">${_('Will be shown in any discussions or forums you participate in')}</span>
-          </li>
-          <li class="field required text" id="field-name">
-            <label for="name">${_('Full Name')}</label>
-            <input id="name" type="text" name="name" value="" placeholder="${_('example: Jane Doe')}" required aria-required="true" />
-            <span class="tip tip-input">${_("Needed for any certificates you may earn <strong>(cannot be changed later)</strong>")}</span>
-          </li>
         </ol>
 
         % else:
@@ -175,55 +164,129 @@
       </fieldset>
 
       <fieldset class="group group-form group-form-secondary group-form-personalinformation">
-        <legend class="sr">${_("Optional Personal Information")}</legend>
+        <legend class="sr">${_("Personal Information")}</legend>
 
 		<ol class="list-input"> 
-          <li class="field-group">
-            <div class="field select" id="field-education-level">
+        	<li class="field required text" id="field-lastname">
+        		<label for="lastname">${_('Lastname')}</label>
+        		<input id="lastname" type="text" name="lastname" value="" required aria-required="true" />
+        	</li>
+          	<li class="field required text" id="field-firstname">
+        		<label for="firstname">${_('Firstname')}</label>
+        		<input id="firstname" type="text" name="firstname" value="" required aria-required="true" />
+        	</li>
+        	<li class="field required text" id="field-middlename">
+        		<label for="middlename">${_('Middlename')}</label>
+        		<input id="middlename" type="text" name="middlename" value="" required aria-required="true" />
+        	</li>
+        	<li class="field required select" id="field-yob">
+              <label for="yob">${_("Year of Birth")}</label>
+              <select id="yob" name="year_of_birth">
+                <option value="">--</option>
+                %for year in UserProfile.VALID_YEARS:
+                <option value="${year}">${year}</option>
+                %endfor
+              </select>
+            </li>
+        	<li class="field required select" id="field-education-level">
               <label for="education-level">${_("Highest Level of Education Completed")}</label>
               <select id="education-level" name="level_of_education">
                 <option value="">--</option>
                 %for code, ed_level in UserProfile.LEVEL_OF_EDUCATION_CHOICES:
-                <option value="${code}">${ed_level}</option>
+                <option value="${code}">${_(ed_level)}</option>
                 %endfor
               </select>
-            </div>
-
-            <div class="field select" id="field-gender">
-              <label for="gender">${_("Gender")}</label>
-              <select id="gender" name="gender">
+            </li>
+        	<li class="field required select" id="field-education-year">
+              <label for="education-year">${_("Year of Birth")}</label>
+              <select id="education-year" name="education_year">
                 <option value="">--</option>
-                %for code, gender in UserProfile.GENDER_CHOICES:
-                <option value="${code}">${gender}</option>
+                %for year in UserProfile.VALID_YEARS:
+                <option value="${year}">${year}</option>
                 %endfor
               </select>
-            </div>
+            </li>
         	
-            <div class="field select" id="field-yob">
-              <label for="yob">${_("Year of Birth")}</label>
-              <select id="yob" name="year_of_birth">
+        	<li class="field text" id="field-education-qualification">
+        		<label for="education-qualification">${_('Diploma qualification')}</label>
+        		<input id="education-qualification" type="text" name="education_qualification" value="" required aria-required="true" />
+        	</li>
+        	<li class="field text" id="field-education-specialty">
+        		<label for="education-specialty">${_('Diploma specialty')}</label>
+        		<input id="education-specialty" type="text" name="education_specialty" value="" required aria-required="true" />
+        	</li>
+        	<li class="field required select" id="field-work-type">
+        		<label for="work-type">${_("Type of educational institution")}</label>
+				<select id="work-type" name="work_type">
 					<option value="">--</option>
-                %for year in UserProfile.VALID_YEARS:
-                <option value="${year}">${year}</option>
+					%for code, wo_type in UserProfile.WORK_TYPE_CHOICES:
+					<option value="${code}">${_(wo_type)}</option>
 					%endfor
 				</select>
-            </div>
         	</li>
-        </ol>
-      </fieldset>
-
-      <fieldset class="group group-form group-form-personalinformation2">
-        <legend class="sr">${_("Optional Personal Information")}</legend>
-
-        <ol class="list-input">
-          <li class="field text" id="field-address-mailing">
-            <label for="address-mailing">${_("Mailing Address")}</label>
-            <textarea id="address-mailing" name="mailing_address" value=""></textarea>
+        	<li class="field required text" id="field-work-number">
+        		<label for="work-number">${_('Number of educational institution')}</label>
+        		<input id="work-number" type="text" name="work_number" value="" required aria-required="true" />
         	</li>
-
-          <li class="field text" id="field-goals">
-            <label for="goals">${_("Please share with us your reasons for registering with {platform_name}").format(platform_name=settings.PLATFORM_NAME)}</label>
-            <textarea id="goals" name="goals" value=""></textarea>
+        	<li class="field required text" id="field-work-name">
+        		<label for="work-name">${_('Name of educational institution')}</label>
+        		<input id="work-name" type="text" name="work_name" value="" required aria-required="true" />
+        	</li>
+        	<li class="field required text" id="field-work-login">
+        		<label for="work-login">${_('StatGrad login of educational institution')}</label>
+        		<input id="work-login" type="text" name="work_login" value="" required aria-required="true" />
+        	</li>
+        	<li class="field required select" id="field-work-location">
+				<label for="work-location">${_("Okrug of educational institution")}</label>
+				<select id="work-location" name="work_location">
+					<option value="">--</option>
+					%for code, wo_loc in UserProfile.WORK_LOCATION_CHOICES:
+					<option value="${code}">${_(wo_loc)}</option>
+					%endfor
+				</select>
+        	</li>
+        	<li class="field required select" id="field-work-occupation">
+				<label for="work-occupation">${_("Occupation at educational institution")}</label>
+				<select id="work-occupation" name="work_occupation">
+					<option value="">--</option>
+					%for code, wo_occ in UserProfile.WORK_OCCUPATION_CHOICES:
+					<option value="${code}">${_(wo_occ)}</option>
+					%endfor
+				</select>
+        	</li>
+        	<li class="field select" id="field-work-occupation-other">
+				<label for="work-occupation-other">${_("Another occupation at educational institution")}</label>
+				<select id="work-occupation-other" name="work_occupation_other">
+					<option value="">--</option>
+					%for code, wo_occ in UserProfile.WORK_OCCUPATION_CHOICES:
+					<option value="${code}">${_(wo_occ)}</option>
+					%endfor
+				</select>
+        	</li>
+        	<li class="field required text" id="field-work-teaching-experience">
+        		<label for="work-work_teaching_experience">${_('Educational experience at educational institution')}</label>
+        		<input id="work-work_teaching_experience" type="text" name="work_teaching_experience" value="" required aria-required="true" />
+        	</li>
+        	<li class="field text" id="field-work-managing-experience">
+        		<label for="work-managing-experience">${_('Managing experience at educational institution')}</label>
+        		<input id="work-managing-experience" type="text" name="work-managing-experience" value="" required aria-required="true" />
+        	</li>
+        	<li class="field select" id="field-work-qualification-category">
+				<label for="work-qualification-category">${_("Qualification category")}</label>
+				<select id="work-qualification-category" name="work_qualification_category">
+					<option value="">--</option>
+					%for code, wo_qua in UserProfile.WORK_QUALIFICATION_CATEGORY_CHOICES:
+					<option value="${code}">${_(wo_qua)}</option>
+					%endfor
+				</select>
+        	</li>
+        	<li class="field text" id="field-work-qualification-category">
+        		<label for="work-qualification-category">${_('Qualification category year')}</label>
+        		<input id="work-qualification-category" type="text" name="work_qualification_category" value="" required aria-required="true" />
+        	</li>
+        	<li class="field text" id="field-contact-phone">
+        		<label for="contact-phone">${_('Contact phone')}</label>
+        		<input id="contact-phone" type="text" name="contact_phone" value="" required aria-required="true" />
         	</li>
         </ol>
       </fieldset>