Merge branch '185-subject-should-have-social-security-number' into 'master'

Resolve "subject should have social security number"

Closes #185

See merge request NCER-PD/scheduling-system!103

smash/web/forms/subject_forms.py

 from django import forms
 from django.forms import ModelForm
 
+from web.forms.forms import DATEPICKER_DATE_ATTRS
 from web.models import Subject
 from web.models.constants import COUNTRY_OTHER_ID
-from web.forms.forms import DATEPICKER_DATE_ATTRS
 
 
 def validate_subject_country(self, cleaned_data):
@@ -11,12 +11,19 @@ def validate_subject_country(self, cleaned_data):
         self.add_error('country', "Select valid country")
 
 
+FIELD_ORDER = ["first_name", "last_name", "sex", "date_born", "social_security_number",
+               "default_written_communication_language", "languages", "phone_number", "phone_number_2",
+               "phone_number_3", "address", "city", "postal_code", "country"]
+
+
 class SubjectAddForm(ModelForm):
     date_born = forms.DateField(label="Date of birth",
                                 widget=forms.DateInput(DATEPICKER_DATE_ATTRS, "%Y-%m-%d"),
                                 required=False
                                 )
 
+    field_order = FIELD_ORDER
+
     class Meta:
         model = Subject
         fields = '__all__'
@@ -34,6 +41,8 @@ class SubjectEditForm(ModelForm):
                                 required=False
                                 )
 
+    field_order = FIELD_ORDER
+
     def __init__(self, *args, **kwargs):
         was_dead = kwargs.get('was_dead', False)
         if 'was_dead' in kwargs:
@@ -51,6 +60,8 @@ class SubjectEditForm(ModelForm):
 
 
 class SubjectDetailForm(ModelForm):
+    field_order = FIELD_ORDER
+
     class Meta:
         model = Subject
         fields = '__all__'

smash/web/migrations/0078_auto_20171204_1040.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-12-04 10:40
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('web', '0077_subjectcolumns'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='subject',
+            name='social_security_number',
+            field=models.CharField(blank=True, max_length=50, verbose_name=b'Social security_number'),
+        ),
+        migrations.AddField(
+            model_name='subjectcolumns',
+            name='social_security_number',
+            field=models.BooleanField(default=False, verbose_name=b'Social security_number'),
+        ),
+    ]

smash/web/models/subject.py

@@ -19,6 +19,11 @@ class Subject(models.Model):
                                   verbose_name='First name'
                                   )
 
+    social_security_number = models.CharField(max_length=50,
+                                              verbose_name='Social security_number',
+                                              blank=True,
+                                              )
+
     last_name = models.CharField(max_length=50,
                                  verbose_name='Last name'
                                  )

smash/web/models/subject_columns.py

@@ -16,6 +16,10 @@ class SubjectColumns(models.Model):
                                      verbose_name='First name'
                                      )
 
+    social_security_number = models.BooleanField(default=False,
+                                                 verbose_name='Social security_number'
+                                                 )
+
     last_name = models.BooleanField(max_length=1,
                                     default=True,
                                     verbose_name='Last name'