Joined
-
MHS{{ user.id|stringformat:"05d" }}
Change me
+
MHS{{ user.id|stringformat:"05d" }}
{{user.name}}{{user.last_name}}
Cancel Membership
diff --git a/mhackspace/users/forms.py b/mhackspace/users/forms.py
index 73b16ff..4c2b43e 100644
--- a/mhackspace/users/forms.py
+++ b/mhackspace/users/forms.py
@@ -2,9 +2,9 @@
from django.db import models
from django.forms import ModelForm
-from .models import UserBlurb
+from .models import Blurb
-class UserBlurbForm(ModelForm):
+class BlurbForm(ModelForm):
class Meta:
- model = UserBlurb
+ model = Blurb
exclude = ['user']
diff --git a/mhackspace/users/migrations/0001_initial.py b/mhackspace/users/migrations/0001_initial.py
index e76c333..def69a6 100644
--- a/mhackspace/users/migrations/0001_initial.py
+++ b/mhackspace/users/migrations/0001_initial.py
@@ -1,11 +1,14 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.10.1 on 2016-09-23 04:36
+# Generated by Django 1.10.5 on 2017-01-28 19:46
from __future__ import unicode_literals
+from django.conf import settings
import django.contrib.auth.models
import django.contrib.auth.validators
from django.db import migrations, models
+import django.db.models.deletion
import django.utils.timezone
+import stdimage.models
class Migration(migrations.Migration):
@@ -32,16 +35,38 @@ class Migration(migrations.Migration):
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
('name', models.CharField(blank=True, max_length=255, verbose_name='Name of User')),
+ ('image', stdimage.models.StdImageField(blank=True, null=True, upload_to='avatars/')),
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
],
options={
- 'verbose_name_plural': 'users',
'verbose_name': 'user',
'abstract': False,
+ 'verbose_name_plural': 'users',
},
managers=[
('objects', django.contrib.auth.models.UserManager()),
],
),
+ migrations.CreateModel(
+ name='Blurb',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('skills', models.CharField(max_length=255)),
+ ('description', models.TextField()),
+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Membership',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('payment', models.DecimalField(decimal_places=2, default=0.0, max_digits=6)),
+ ('date', models.DateTimeField()),
+ ('reference', models.CharField(max_length=255)),
+ ('status', models.PositiveSmallIntegerField(default=0)),
+ ('email', models.CharField(max_length=255)),
+ ('user', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='user', to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
]
diff --git a/mhackspace/users/migrations/0002_membership_userblurb.py b/mhackspace/users/migrations/0002_membership_userblurb.py
deleted file mode 100644
index 4e0c458..0000000
--- a/mhackspace/users/migrations/0002_membership_userblurb.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.4 on 2017-01-06 08:53
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('users', '0001_initial'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Membership',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('payment', models.DecimalField(decimal_places=2, max_digits=6)),
- ('date', models.DateTimeField()),
- ('reference', models.CharField(max_length=255)),
- ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
- ],
- ),
- migrations.CreateModel(
- name='UserBlurb',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('skills', models.CharField(max_length=255)),
- ('description', models.TextField()),
- ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
- ],
- ),
- ]
diff --git a/mhackspace/users/migrations/0003_user_image.py b/mhackspace/users/migrations/0003_user_image.py
deleted file mode 100644
index f55e304..0000000
--- a/mhackspace/users/migrations/0003_user_image.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.4 on 2017-01-06 19:03
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('users', '0002_membership_userblurb'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='user',
- name='image',
- field=models.ImageField(blank=True, null=True, upload_to='/upload/avatars'),
- ),
- ]
diff --git a/mhackspace/users/migrations/0004_auto_20170106_2030.py b/mhackspace/users/migrations/0004_auto_20170106_2030.py
deleted file mode 100644
index c98e20c..0000000
--- a/mhackspace/users/migrations/0004_auto_20170106_2030.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.4 on 2017-01-06 20:30
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('users', '0003_user_image'),
- ]
-
- operations = [
- migrations.RenameModel(
- old_name='Membership',
- new_name='UserMembership',
- ),
- migrations.AlterField(
- model_name='user',
- name='image',
- field=models.ImageField(blank=True, null=True, upload_to='avatars/'),
- ),
- ]
diff --git a/mhackspace/users/migrations/0005_auto_20170108_0050.py b/mhackspace/users/migrations/0005_auto_20170108_0050.py
deleted file mode 100644
index 2d05065..0000000
--- a/mhackspace/users/migrations/0005_auto_20170108_0050.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.4 on 2017-01-08 00:50
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import stdimage.models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('users', '0004_auto_20170106_2030'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='user',
- name='image',
- field=stdimage.models.StdImageField(blank=True, null=True, upload_to='avatars/'),
- ),
- migrations.AlterField(
- model_name='userblurb',
- name='user',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='users', to=settings.AUTH_USER_MODEL),
- ),
- ]
diff --git a/mhackspace/users/models.py b/mhackspace/users/models.py
index 9c2b3e8..b056cac 100644
--- a/mhackspace/users/models.py
+++ b/mhackspace/users/models.py
@@ -29,14 +29,44 @@ class User(AbstractUser):
return reverse('users:detail', kwargs={'username': self.username})
-class UserBlurb(models.Model):
- user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='users')
+class Blurb(models.Model):
+ user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='+')
skills = models.CharField(max_length=255)
description = models.TextField()
-class UserMembership(models.Model):
- user = models.ForeignKey(settings.AUTH_USER_MODEL)
- payment = models.DecimalField(max_digits=6, decimal_places=2)
+MEMBERSHIP_STRING = {
+ 0: 'Non Member',
+ 1: 'Member',
+ 3: 'Membership Expired'
+}
+
+MEMBERSHIP_STATUS = {
+ 'active': 1,
+ 'cancelled': 2
+}
+
+class Membership(models.Model):
+ user = models.ForeignKey(
+ settings.AUTH_USER_MODEL,
+ null=True, blank=True,
+ default=None,
+ related_name='user'
+ )
+ payment = models.DecimalField(max_digits=6, decimal_places=2, default=0.0)
date = models.DateTimeField()
reference = models.CharField(max_length=255)
+ status = models.PositiveSmallIntegerField(default=0)
+ email = models.CharField(max_length=255)
+
+ @property
+ def get_status(self):
+ return MEMBERSHIP_STRING[self.status]
+
+ def lookup_status(name):
+ if not name:
+ return 0
+ return MEMBERSHIP_STATUS.get(name.lower(), 0)
+
+ def __str__(self):
+ return self.reference
diff --git a/mhackspace/users/views.py b/mhackspace/users/views.py
index bbdfb07..e511bcd 100644
--- a/mhackspace/users/views.py
+++ b/mhackspace/users/views.py
@@ -7,10 +7,10 @@ from django.views.generic import DetailView, ListView, RedirectView, UpdateView
from django.contrib.auth.mixins import LoginRequiredMixin
from .models import User
-from .models import UserBlurb
-from .models import UserMembership
+from .models import Blurb
+from .models import Membership
-from .forms import UserBlurbForm
+from .forms import BlurbForm
class UserDetailView(LoginRequiredMixin, DetailView):
model = User
@@ -21,8 +21,8 @@ class UserDetailView(LoginRequiredMixin, DetailView):
def get_context_data(self, **kwargs):
# xxx will be available in the template as the related objects
context = super(UserDetailView, self).get_context_data(**kwargs)
- context['blurb'] = UserBlurb.objects.filter(user=self.get_object()).first()
- context['membership'] = UserMembership.objects.filter(user=self.get_object()).first()
+ context['blurb'] = Blurb.objects.filter(user=self.get_object()).first()
+ context['membership'] = Membership.objects.filter(user=self.get_object()).first()
return context
class UserRedirectView(LoginRequiredMixin, RedirectView):
@@ -45,8 +45,8 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
def get_context_data(self, **kwargs):
context = super(UserUpdateView, self).get_context_data(**kwargs)
- profile = UserBlurb.objects.filter(user=self.get_object()).first()
- context['form_blurb'] = UserBlurbForm(instance=profile)
+ profile = Blurb.objects.filter(user=self.get_object()).first()
+ context['form_blurb'] = BlurbForm(instance=profile)
return context
def get_object(self):
@@ -54,8 +54,8 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
return User.objects.get(username=self.request.user.username)
def form_valid(self, form):
- profile = UserBlurb.objects.filter(user=self.get_object()).first()
- form_blurb = UserBlurbForm(self.request.POST, instance=profile)
+ profile = Blurb.objects.filter(user=self.get_object()).first()
+ form_blurb = BlurbForm(self.request.POST, instance=profile)
if form_blurb.is_valid():
blurb_model = form_blurb.save(commit=False)
blurb_model.user = self.request.user