Merge pull request #469 from RishabhJain2018/master

Add profile for users

Author: ChillarAnand

junction/profiles/admin.py

@@ -0,0 +1,9 @@
+from django.contrib import admin
+from .models import Profile
+
+
+class ProfileAdmin(admin.ModelAdmin):
+    list_display = ('user', 'city', 'contact_no')
+    search_fields = ('contact_no', 'city')
+
+admin.site.register(Profile, ProfileAdmin)

junction/profiles/forms.py

@@ -0,0 +1,9 @@
+from django import forms
+from .models import Profile
+
+
+class ProfileForm(forms.ModelForm):
+    class Meta:
+        model = Profile
+        fields = ['city', 'contact_no', ]
+        exclude = ['user', ]

junction/profiles/migrations/0001_initial.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Profile',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('modified_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('city', models.CharField(max_length=100, null=True, blank=True)),
+                ('contact_no', models.CharField(max_length=15, null=True, blank=True)),
+                ('created_by', models.ForeignKey(related_name='created_profile_set', verbose_name='Created By', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
+                ('modified_by', models.ForeignKey(related_name='updated_profile_set', verbose_name='Modified By', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
+                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+    ]

junction/profiles/models.py

@@ -1,3 +1,15 @@
-# from django.db import models
+from django.contrib.auth.models import User
+from junction.base.models import AuditModel
+from django.db import models
 
-# Create your models here.
+
+class Profile(AuditModel):
+    '''
+    It stores the City/Phone Details of the User.
+    '''
+    user = models.OneToOneField(User)
+    city = models.CharField(max_length=100, blank=True, null=True)
+    contact_no = models.CharField(max_length=15, blank=True, null=True)
+
+    def __unicode__(self):
+        return self.user.username

junction/profiles/tests.py

@@ -1,3 +1,17 @@
-# from django.test import TestCase
+from django.test import TestCase
+from .models import Profile
+from django.contrib.auth.models import User
 
-# Create your tests here.
+# models test
+
+
+class ProfileTest(TestCase):
+
+    def setUp(self):
+        self.user = User.objects.create(username='user1', password='123456')
+        Profile.objects.create(city='noida', contact_no='1234567890')
+
+    def test_create_profile(self):
+        user = User.objects.get(username='user1')
+        profile_details = Profile.objects.get(user=user)
+        self.assertEqual(profile_details.city, 'noida')

junction/profiles/urls.py

@@ -5,4 +5,7 @@
 
 urlpatterns = [
     url(r'^$', views.dashboard, name='dashboard'),
+    url(r'^edit/$', views.profile, name='profile'),
+
+
 ]

junction/profiles/views.py

@@ -5,10 +5,17 @@
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render
 from django.views.decorators.http import require_http_methods
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User
 
 # Junction Stuff
 from junction.conferences.models import Conference
 
+# Profile Stuff
+from .models import Profile
+from .forms import ProfileForm
+
 
 @login_required
 @require_http_methods(['GET'])
@@ -22,3 +29,36 @@ def dashboard(request):
                 conf_proposals[conf.name] = [proposal]
     return render(request, 'profiles/dashboard.html',
                   {'conf_proposals': conf_proposals})
+
+
+@login_required
+def profile(request):
+    username = request.user
+    detail = None
+
+    if request.method == "POST" and username == request.user:
+        user = User.objects.get(pk=username.id)
+        detail = Profile.objects.filter(user=user).exists()
+        if detail:
+            detail = Profile.objects.get(user=user)
+            detail_form = ProfileForm(request.POST, instance=detail)
+            if detail_form.is_valid():
+                detail = detail_form.save()
+                return HttpResponseRedirect(reverse('profiles:dashboard'))
+        else:
+            user = User.objects.get(pk=username.id)
+            detail_form = ProfileForm(request.POST)
+            if detail_form.is_valid():
+                detail_form = detail_form.save(commit=False)
+                detail_form.user = user
+                detail_form.save()
+                return HttpResponseRedirect(reverse('profiles:dashboard'))
+
+    elif request.method == "GET":
+        user = User.objects.get(pk=username.id)
+        detail = Profile.objects.filter(user=user).exists()
+        if detail:
+            detail = Profile.objects.get(user=user)
+            return render(request, 'profiles/userprofile.html', {'detail': detail})
+        else:
+            return render(request, 'profiles/userprofile.html')

junction/proposals/migrations/0021_auto_20160905_0044.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0020_auto_20160806_2023'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='proposalcomment',
+            options={'ordering': ('created_at',)},
+        ),
+    ]

junction/templates/base.html

@@ -109,6 +109,7 @@
                             <ul class="dropdown-menu" role="menu">
                                     <li><a href="{% url 'profiles:dashboard' %}">Dashboard</a></li>
                                     <li><a href="{% url 'socialaccount_connections' %}">Social Accounts</a></li>
+                                    <li><a href="{% url 'profiles:profile' %}">Profile</a></li>
                                     {% if user.is_staff %}
                                         <li><a href="{% url 'admin:index' %}" target="_blank">Admin</a></li>
                                     {% endif %}

junction/templates/profiles/userprofile.html

@@ -0,0 +1,60 @@
+{% extends 'base.html' %}
+
+{% load django_markdown %}
+{% load static from staticfiles %}
+{% load django_bootstrap_breadcrumbs %}
+{% load proposal_filters %}
+
+{% block head_title %} Profile {% endblock %}
+{% block og_title %} Profile {% endblock %}
+{% block og_description %} Profile {% endblock %}
+{% block page_description %} Profile {% endblock %}
+
+{% block endhead %}
+    <!-- Custom CSS -->
+    <link href="{% static 'css/list.css' %}" rel="stylesheet">
+{% endblock %}
+
+{% block breadcrumbs %}
+    {{ block.super }}
+    {% breadcrumb "Dashboard" "user-proposals-list" %}
+    {% breadcrumb "Profile" "user-profile"%}
+{% endblock %}
+
+{% block navbar_logo %}
+        <a href="#" class="navbar-brand">Junction</a>
+{% endblock navbar_logo %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
+            <div class="form-container space-2-bottom {% if form.errors %} has-error {% endif %}">
+               <h2 class="text-center">Edit Profile</h2>
+                <div class="pad-2 push-half-top push-2-bottom">
+                    <form class="form-horizontal login-form" method="POST">
+                        {% csrf_token %}
+                    <div class="form-group">
+                        <label for="city" class="col-lg-4 control-label"> City :</label>
+                    <div class="col-lg-8">
+                        <input autofocus="autofocus" name="city" placeholder="Enter Your City" type="text" value="{{detail.city}}">
+                    </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="contact" class="col-lg-4 control-label"> Contact :</label>
+                    <div class="col-lg-8">
+                        <input autofocus="autofocus" name="contact_no" placeholder="Enter Your Contact No:" type="text" pattern="\d{10}" value="{{detail.contact_no}}" >
+                    </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-lg-8 col-lg-offset-4">
+                            <button class="btn btn-primary" type="submit">
+                            Submit
+                            </button>
+                        </div>
+                    </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}