Kaffe bonger

core/filters.py

@@ -10,7 +10,7 @@ class Meta:
         fields = ['user', 'card_number', 'disabled']
 
 
-class NfcCardFilet(django_filters.FilterSet):
+class NfcCardFilter(django_filters.FilterSet):
     user = django_filters.CharFilter(name='user__username')
 
     class Meta:

core/models.py

@@ -111,4 +111,6 @@ class NfcCard(models.Model):
     comment = models.CharField(max_length=20, blank=True)
 
     def __str__(self):
-        return "NFC Card: [card_uid: %s, user=%s, intern=%s]" % (self.card_uid, self.user, self.intern)
+        if not self.user:
+            return self.card_uid
+        return "%s (%s)" % (self.card_uid, self.user)

core/rest.py

@@ -6,7 +6,7 @@
 from core.serializers import CardCreateSerializer, CardSerializer, UserExtendedSerializer, NfcCardCreateSerializer, \
     NfcCardSerializer
 from core.models import Card, User, NfcCard
-from core.filters import CardFilter, UserFilter, NfcCardFilet
+from core.filters import CardFilter, UserFilter, NfcCardFilter
 
 
 class CardViewSet(viewsets.ReadOnlyModelViewSet):
@@ -44,7 +44,7 @@ def destroy(self, request):
 
 class NfcCardViewSet(viewsets.ReadOnlyModelViewSet):
     permission_classes = (IsAuthenticated,)
-    filter_class = NfcCardFilet
+    filter_class = NfcCardFilter
     queryset = NfcCard.objects.all()
 
     def get_serializer_class(self):

core/serializers.py

@@ -31,13 +31,13 @@ class CardSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Card
-        fields = ('id', 'user', 'card_number', 'disabled', 'comment')
+        fields = ('id', 'user', 'card_number', 'card_uid', 'disabled', 'comment')
 
 
 class CardCreateSerializer(serializers.ModelSerializer):
     class Meta:
         model = Card
-        fields = ('user', 'card_number', 'comment')
+        fields = ('user', 'card_number', 'card_uid', 'comment')
         extra_kwargs = {'comment': {'default': None}}
 
 

core/urls.py

@@ -8,7 +8,7 @@
 router = SharedAPIRootRouter()
 router.register(r'core/users', UserViewSet, base_name='users')
 router.register(r'core/cards', CardViewSet, base_name='voucher_cards')
-router.register(r'core/nfc', NfcCardViewSet, base_name='nfc_cards')
+router.register(r'core/nfc', NfcCardViewSet)
 
 urlpatterns = patterns('',
     url(r'^api/me$', me, name='me'),

voucher/admin.py

@@ -1,12 +1,16 @@
 from django.contrib import admin
-from voucher.models import Wallet, WorkLog, UseLog
+from voucher.models import Wallet, WorkLog, UseLog, VoucherWallet, CoffeeWallet, VoucherUseLog, CoffeeUseLog, \
+    CoffeeRegisterLog
 
 
 class WalletAdmin(admin.ModelAdmin):
     model = Wallet
     readonly_fields = ('cached_balance',)
 
 
-admin.site.register(Wallet, WalletAdmin)
+admin.site.register(VoucherWallet, WalletAdmin)
+admin.site.register(CoffeeWallet, WalletAdmin)
+admin.site.register(CoffeeRegisterLog)
 admin.site.register(WorkLog)
-admin.site.register(UseLog)
+admin.site.register(VoucherUseLog)
+admin.site.register(CoffeeUseLog)

voucher/filters.py

@@ -4,8 +4,9 @@
 from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import get_current_timezone
 
-from core.models import Card
-from voucher.models import UseLog, Wallet, WorkLog
+from core.models import NfcCard
+from voucher.models import UseLog, Wallet, WorkLog, VoucherWallet, CoffeeWallet, VoucherUseLog, CoffeeUseLog, \
+    CoffeeRegisterLog
 from voucher.utils import get_valid_semesters
 
 
@@ -21,45 +22,75 @@ def apply_date_filter(queryset, value, field, lte):
 
 
 class UseLogFilter(django_filters.FilterSet):
-    user = django_filters.CharFilter(name='wallet__user__username')
     semester = django_filters.CharFilter(name='wallet__semester')
     date_from = django_filters.MethodFilter(action='filter_date_from')
     date_to = django_filters.MethodFilter(action='filter_date_to')
 
-    class Meta:
-        model = UseLog
-        fields = ['id', 'user', 'semester']
-
     def filter_date_from(self, queryset, value):
         return apply_date_filter(queryset, value, 'date_spent', lte=False)
 
     def filter_date_to(self, queryset, value):
         return apply_date_filter(queryset, value, 'date_spent', lte=True)
 
 
+class VoucherUseLogFilter(UseLogFilter):
+    user = django_filters.CharFilter(name='wallet__user__username')
+
+    class Meta:
+        model = VoucherUseLog
+        fields = ['id', 'user', 'semester']
+
+
+class CoffeeUseLogFilter(UseLogFilter):
+    card = django_filters.CharFilter(name='wallet__card__card_uid')
+
+    class Meta:
+        model = CoffeeUseLog
+        fields = ['id', 'card', 'semester']
+
+
 class WalletFilter(django_filters.FilterSet):
-    user = django_filters.CharFilter(name='user__username')
-    card_number = django_filters.MethodFilter(action='filter_card_number')
     valid = django_filters.MethodFilter(action='filter_active')
 
     class Meta:
         model = Wallet
-        fields = ['user', 'card_number', 'semester']
-
-    def filter_card_number(self, queryset, value):
-        cards = Card.objects.filter(card_number=value)
-        if cards.exists():
-            return queryset.filter(user=cards.first().user)
-        return queryset.none()
+        fields = ['semester']
 
     def filter_active(self, queryset, value):
         return queryset.filter(semester__in=get_valid_semesters())
 
 
-class WorkLogFilter(django_filters.FilterSet):
-    user = django_filters.CharFilter(name='wallet__user__username')
+class VoucherWalletFilter(WalletFilter):
+    user = django_filters.CharFilter(name='user__username')
+
+    class Meta:
+        model = VoucherWallet
+        fields = ['user', 'semester']
+
+
+class CoffeeWalletFilter(WalletFilter):
+    card = django_filters.CharFilter(name='nfccard__card_uid')
+
+    class Meta:
+        model = CoffeeWallet
+        fields = ['card', 'semester']
+
+
+class RegisterLogFilter(django_filters.FilterSet):
     issuing_user = django_filters.CharFilter(name='issuing_user__username')
     semester = django_filters.CharFilter(name='wallet__semester')
+
+
+class CoffeeRegisterLogFilter(RegisterLogFilter):
+    card = django_filters.CharFilter(name='wallet__card__card_uid')
+
+    class Meta:
+        model = CoffeeRegisterLog
+        fields = ['id', 'card', 'issuing_user', 'semester']
+
+
+class WorkLogFilter(RegisterLogFilter):
+    user = django_filters.CharFilter(name='wallet__user__username')
     date_from = django_filters.MethodFilter(action='filter_date_from')
     date_to = django_filters.MethodFilter(action='filter_date_to')
 

voucher/migrations/0008_auto_20160127_0512.py

@@ -7,10 +7,7 @@
 
 
 def fix_balance(apps, schema_editor):
-    print(repr(Wallet))
-    for wallet in Wallet.objects.all():
-        print(repr(vars(wallet)))
-        wallet.calculate_balance()
+    pass
 
 
 def noop(apps, schema_editor):

voucher/migrations/0010_rename_voucher.py

@@ -0,0 +1,33 @@
+# -*- 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),
+        ('voucher', '0009_uselog_issuing_user'),
+    ]
+
+    operations = [
+        migrations.RenameModel('Wallet', 'VoucherWallet'),
+        migrations.RenameModel('UseLog', 'VoucherUseLog'),
+
+        migrations.AlterField(
+            model_name='worklog',
+            name='wallet',
+            field=models.ForeignKey(to='voucher.VoucherWallet', related_name='worklogs'),
+        ),
+        migrations.AlterField(
+            model_name='voucheruselog',
+            name='wallet',
+            field=models.ForeignKey(to='voucher.VoucherWallet', related_name='uselogs'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='voucherwallet',
+            unique_together=set([('user', 'semester')]),
+        ),
+    ]

voucher/migrations/0011_coffee_vouchers.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0006_nfccard'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('voucher', '0010_rename_voucher'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CoffeeUseLog',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
+                ('date_spent', models.DateTimeField(auto_now_add=True)),
+                ('comment', models.CharField(blank=True, max_length=100, null=True)),
+                ('vouchers', models.IntegerField()),
+                ('issuing_user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['-date_spent'],
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='CoffeeWallet',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
+                ('cached_balance', models.DecimalField(max_digits=8, decimal_places=2, editable=False, default=0)),
+                ('cached_vouchers', models.DecimalField(max_digits=8, decimal_places=2, editable=False, default=0)),
+                ('cached_vouchers_used', models.IntegerField(editable=False, default=0)),
+                ('card', models.ForeignKey(to='core.NfcCard')),
+                ('semester', models.ForeignKey(to='core.Semester')),
+            ],
+            options={
+                'ordering': ['card__card_uid'],
+            },
+        ),
+        migrations.CreateModel(
+            name='CoffeeRegisterLog',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
+                ('date_issued', models.DateTimeField(auto_now_add=True)),
+                ('comment', models.CharField(blank=True, max_length=100, null=True)),
+                ('vouchers', models.DecimalField(decimal_places=2, max_digits=8)),
+                ('issuing_user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('wallet', models.ForeignKey(to='voucher.CoffeeWallet', related_name='registerlogs')),
+            ],
+            options={
+                'ordering': ['-date_issued'],
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='coffeeuselog',
+            name='wallet',
+            field=models.ForeignKey(to='voucher.CoffeeWallet', related_name='uselogs'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='coffeewallet',
+            unique_together=set([('card', 'semester')]),
+        ),
+    ]