My Info
+ My Rfid Cards
E-Mail
diff --git a/mhackspace/users/admin.py b/mhackspace/users/admin.py
index ba7ca58..a183241 100644
--- a/mhackspace/users/admin.py
+++ b/mhackspace/users/admin.py
@@ -9,7 +9,7 @@ from django.contrib.auth.forms import UserChangeForm, UserCreationForm
from django.http import HttpResponseRedirect
from django.urls import reverse
from django.conf.urls import url
-from .models import User, Membership, MEMBERSHIP_STATUS_CHOICES
+from .models import User, Rfid, Membership, MEMBERSHIP_STATUS_CHOICES
from mhackspace.subscriptions.management.commands.update_membership_status import update_subscriptions
@@ -64,3 +64,9 @@ class MyUserAdmin(AuthUserAdmin):
class MembershipAdmin(ModelAdmin):
list_display = ('user', 'payment', 'date', 'status')
list_filter = ('status',)
+
+
+@admin.register(Rfid)
+class RfidAdmin(ModelAdmin):
+ list_display = ('code', 'description')
+
diff --git a/mhackspace/users/migrations/0004_rfid.py b/mhackspace/users/migrations/0004_rfid.py
new file mode 100644
index 0000000..ae8ea00
--- /dev/null
+++ b/mhackspace/users/migrations/0004_rfid.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-04-27 18:25
+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', '0003_merge_20170226_0844'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Rfid',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('code', models.PositiveIntegerField()),
+ ('description', models.CharField(blank=True, max_length=255, verbose_name='Short rfid description')),
+ ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ ]
diff --git a/mhackspace/users/models.py b/mhackspace/users/models.py
index 1f0808a..68b393d 100644
--- a/mhackspace/users/models.py
+++ b/mhackspace/users/models.py
@@ -90,3 +90,20 @@ class Membership(models.Model):
def __str__(self):
return self.reference
+
+
+# users rfid card to user mapping, user can have more than one card
+class Rfid(models.Model):
+ code = models.PositiveIntegerField()
+ description = models.CharField(_('Short rfid description'), blank=True, max_length=255)
+ user = models.ForeignKey(
+ settings.AUTH_USER_MODEL,
+ null=True, blank=True,
+ # related_name='rfid_user'
+ )
+
+ def __str__(self):
+ return self.description
+
+ def name(self):
+ return self.user.name
diff --git a/mhackspace/users/urls.py b/mhackspace/users/urls.py
index 6ae4b6f..530b556 100644
--- a/mhackspace/users/urls.py
+++ b/mhackspace/users/urls.py
@@ -26,4 +26,9 @@ urlpatterns = [
view=views.UserUpdateView.as_view(),
name='update'
),
+ url(
+ regex=r'^-access-cards$',
+ view=views.RfidCardsUpdateView.as_view(),
+ name='access_cards'
+ ),
]
diff --git a/mhackspace/users/views.py b/mhackspace/users/views.py
index c124721..43f5b2f 100644
--- a/mhackspace/users/views.py
+++ b/mhackspace/users/views.py
@@ -2,10 +2,11 @@
from __future__ import absolute_import, unicode_literals
from django.core.urlresolvers import reverse
-from django.views.generic import DetailView, ListView, RedirectView, UpdateView
+from django.views.generic import DetailView, ListView, RedirectView, UpdateView, CreateView
from django.contrib.auth.mixins import LoginRequiredMixin
+from .models import Rfid
from .models import User
from .models import Blurb
from .models import Membership
@@ -65,6 +66,18 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
return super(UserUpdateView, self).form_valid(form)
+
+class RfidCardsUpdateView(LoginRequiredMixin, CreateView):
+ fields = ['user', 'code', 'description', ]
+ model = Rfid
+
+ def form_valid(self, form):
+ user = self.request.user
+ form.instance.user = user
+ return super(RfidCardsUpdateView, self).form_valid(form)
+
+
+
class UserListView(LoginRequiredMixin, ListView):
model = User
# These next two lines tell the view to index lookups by username