Merge lp:~mboehn/lancms/lc2-profile into lp:lancms

[Mathias Bøhn Grytemark]

* Adds a UserProfile (OneToOne with User).
* Populates date of birth and/or gender from Facebook if it is available.

[Mathias Bøhn Grytemark (mboehn)]

self-approved :-)

review: Approve

[lp:~mboehn/lancms/lc2-profile]

26. By Mathias Bøhn Grytemark <email address hidden> on 2014-01-09

merged lc2-profile

=== modified file 'core/common.py'
--- core/common.py	2014-01-07 21:23:42 +0000
+++ core/common.py	2014-01-09 20:36:49 +0000
@@ -2,4 +2,6 @@
 from django.template import RequestContext
 
 def prtr (template, dict, request):
-    return render_to_response (template, dict, context_instance=RequestContext(request))
+	return render_to_response (template, dict, context_instance=RequestContext(request))
+
+

=== modified file 'core/models.py'
--- core/models.py	2014-01-07 21:23:42 +0000
+++ core/models.py	2014-01-09 20:36:49 +0000
@@ -1,3 +1,38 @@
+### Models
 from django.db import models
 
-# Create your models here.
+
+from django.contrib.auth.models import User
+from django_countries import CountryField
+
+
+CHOICES_GENDER = (
+	('female', 'Female'),
+	('male', 'Male'),
+	)
+
+
+class UserProfile(models.Model):
+	user = models.OneToOneField (User)
+	date_of_birth = models.DateField (null=True)
+	streetaddress = models.CharField (max_length=255, null=True)
+	country = CountryField (null=True)
+	postalcode = models.IntegerField (null=True)
+	gender = models.CharField (max_length=6, choices=CHOICES_GENDER, null=True)
+
+
+
+
+### Signals
+
+from django.dispatch import receiver
+from allauth.account.signals import user_signed_up
+import datetime
+@receiver(user_signed_up)
+def populate_user_profile (request, user, sociallogin=None, **kwargs):
+	if sociallogin:
+		if sociallogin.account.provider == 'facebook':
+			up = UserProfile(user=user)
+			up.gender = sociallogin.account.extra_data['gender']
+			up.date_of_birth = datetime.datetime.strptime (sociallogin.account.extra_data['birthday'], "%m/%d/%Y")
+			up.save()

=== modified file 'lancms2/settings.py'
--- lancms2/settings.py	2014-01-08 12:03:17 +0000
+++ lancms2/settings.py	2014-01-09 20:36:49 +0000
@@ -43,6 +43,7 @@
     'allauth.socialaccount.providers.facebook',
     'core',
 	 'debug_toolbar', # for DEBUG
+	 'django_countries',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -116,7 +117,7 @@
 	'allauth.account.auth_backends.AuthenticationBackend',
 	)
 
-SOCIALACCOUNT_PROVIDERS = { 'facebook': { 'SCOPE': ['email'], 'AUTH_PARAMS': { 'auth_type': 'reauthenticate' }, 'METHOD': 'oauth2', 'LOCALE_FUNC': lambda request: 'en_GB' } }
+SOCIALACCOUNT_PROVIDERS = { 'facebook': { 'SCOPE': ['email', 'user_birthday'], 'AUTH_PARAMS': { 'auth_type': 'reauthenticate' }, 'METHOD': 'oauth2', 'LOCALE_FUNC': lambda request: 'en_GB' } }
 
 ##### end allauth
 

=== modified file 'requirements.txt'
--- requirements.txt	2014-01-08 12:03:17 +0000
+++ requirements.txt	2014-01-09 20:36:49 +0000
@@ -1,3 +1,4 @@
 Django==1.6.1
 django_allauth
 django-debug-toolbar
+django-countries

=== modified file 'templates/account/profile.html'
--- templates/account/profile.html	2014-01-08 17:02:40 +0000
+++ templates/account/profile.html	2014-01-09 20:36:49 +0000
@@ -38,6 +38,34 @@
 			{{user.email}}
 		</td>	
 	</tr>
+	{% if user.userprofile.date_of_birth %}
+	<tr>
+		<th>
+			Gender
+		</th>
+		<td>
+			{{user.userprofile.date_of_birth}}
+		</td>	
+	</tr>
+	{% endif %}
+	{% if user.userprofile.gender %}
+	<tr>
+		<th>
+			Gender
+		</th>
+		<td>
+			<i class="fa fa-{{user.userprofile.gender}}"></i> {{user.userprofile.get_gender_display}}
+		</td>	
+	</tr>
+	{% endif %}
+	<tr>
+		<th>
+			Registered
+		</th>
+		<td>
+			{{user.date_joined}}
+		</td>	
+	</tr>
 	{% if user.is_staff or user.is_superuser %}
 	<tr>
 		<th>