Add treasury flag

Author: stefanw

correctiv_justizgelder/admin.py

@@ -4,13 +4,14 @@
 
 
 class OrganisationAdmin(admin.ModelAdmin):
-    list_display = ('name', 'sum_fines')
+    list_display = ('name', 'sum_fines', 'treasury')
+    list_filter = ('treasury',)
     search_fields = ['name']
 
 
 class FineAdmin(admin.ModelAdmin):
-    list_display = ('name', 'amount', 'state', 'year', 'department', 'department_detail')
-    list_filter = ('state', 'department', 'year')
+    list_display = ('name', 'amount', 'state', 'year', 'department', 'department_detail', 'treasury')
+    list_filter = ('state', 'department', 'year', 'treasury')
     search_fields = ['original_name', 'department_detail']
     raw_id_fields = ('organisation',)
 

correctiv_justizgelder/management/commands/justizgelder_import.py

@@ -20,6 +20,11 @@ def handle(self, *args, **options):
 
         filename = args[0]
 
+        self.staatskasse = Organisation.objects.get_or_create(
+            name='Staatskasse', slug='staatskasse',
+            treasury=True
+        )
+
         collection = []
         for fine in self.get_fine_objects(filename):
             collection.append(fine)
@@ -48,11 +53,18 @@ def create_from_row(self, row, fine=None):
 
         org_slug = slugify(row['name'])
 
-        try:
-            org = Organisation.objects.get(slug=org_slug)
-        except Organisation.DoesNotExist:
-            org = Organisation.objects.create(name=row['name'], slug=org_slug)
+        treasury = False
+
+        if bool(int(row.get('staatkasse', '0'))):
+            org = self.staatskasse
+            treasury = True
+        else:
+            try:
+                org = Organisation.objects.get(slug=org_slug)
+            except Organisation.DoesNotExist:
+                org = Organisation.objects.create(name=row['name'], slug=org_slug)
 
+        fine.treasury = treasury
         fine.organisation = org
         fine.name = row['name']
         fine.original_name = row['orig_name']
@@ -61,9 +73,9 @@ def create_from_row(self, row, fine=None):
         fine.state = parts[1]
         fine.year = int(parts[2])
         fine.department = parts[3]
-        fine.department_detail = parts[4].split('_')[1].title()
+        fine.department_detail = parts[4].split('_')[0].title()
         fine.amount = decimal.Decimal(row['betrag'])
-        if row['betrag_eingegangen']:
+        if row.get('betrag_eingegangen'):
             fine.amount_received = decimal.Decimal(row['betrag_eingegangen'])
 
         fine.address = row['adresse']

correctiv_justizgelder/migrations/0003_auto_20150428_1218.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('correctiv_justizgelder', '0002_fine_search_index'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='fine',
+            name='treasury',
+            field=models.BooleanField(default=False),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='organisation',
+            name='treasury',
+            field=models.BooleanField(default=False),
+            preserve_default=True,
+        ),
+    ]

correctiv_justizgelder/models.py

@@ -80,6 +80,7 @@ class Organisation(models.Model):
     slug = models.SlugField(max_length=255)
     sum_fines = models.DecimalField(null=True, decimal_places=2, max_digits=19)
     note = models.TextField(blank=True)
+    treasury = models.BooleanField(default=False)
 
     objects = OrganisationManager()
 
@@ -134,6 +135,8 @@ class Fine(models.Model):
     city = models.CharField(max_length=255, blank=True)
     postcode = models.CharField(max_length=10, blank=True)
 
+    treasury = models.BooleanField(default=False)
+
     search_index = VectorField()
 
     objects = FineManager(