- JSONField entfernt für SIX-Fehler

- DAL entfernt

areas/forms.py

@@ -2,7 +2,6 @@ from django import forms
 from django.forms import ModelForm
 from django.forms.widgets import TextInput
 from .models import Areas
-from dal import autocomplete
 from django.contrib.auth.models import User
 from django import forms
 

areas/migrations/0001_initial.py

@@ -1,5 +1,8 @@
-# Generated by Django 2.2.7 on 2019-12-02 17:34
+# Generated by Django 3.0 on 2019-12-03 22:58
 
+import colorful.fields
+import datetime
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -9,7 +12,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('users', '0038_auto_20191202_1757'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('users', '0001_initial'),
     ]
 
     operations = [
@@ -17,10 +21,14 @@ class Migration(migrations.Migration):
             name='Areas',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(blank=True, max_length=200)),
-                ('color', models.CharField(blank=True, max_length=60)),
-                ('desc', models.CharField(blank=True, max_length=3000)),
+                ('name', models.CharField(max_length=200)),
+                ('color', colorful.fields.RGBColorField(blank=True, colors=['#FFB900', '#E74856', '#0078D7', '#0099BC', '#7A7574'], default='#0099BC')),
+                ('desc', models.TextField(blank=True, max_length=3000)),
+                ('created_area_date', models.DateField(blank=True, default=datetime.date.today)),
+                ('visible', models.BooleanField(default=True)),
                 ('agency', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency')),
+                ('created_area_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                ('usersfield', models.ManyToManyField(blank=True, related_name='users_in_area', to=settings.AUTH_USER_MODEL)),
             ],
         ),
     ]

areas/migrations/0002_auto_20191202_2001.py

@@ -1,30 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-02 19:01
-
-import colorful.fields
-from django.db import migrations, models
-import multiselectfield.db.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('areas', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='areas',
-            name='usersfield',
-            field=multiselectfield.db.fields.MultiSelectField(blank=True, max_length=200),
-        ),
-        migrations.AlterField(
-            model_name='areas',
-            name='color',
-            field=colorful.fields.RGBColorField(colors=['#FFB900', '#E74856', '#0078D7', '#0099BC', '#7A7574'], default='#0099BC'),
-        ),
-        migrations.AlterField(
-            model_name='areas',
-            name='desc',
-            field=models.TextField(blank=True, max_length=3000),
-        ),
-    ]

areas/migrations/0003_auto_20191202_2255.py

@@ -1,42 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-02 21:55
-
-import colorful.fields
-import datetime
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('areas', '0002_auto_20191202_2001'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='areas',
-            name='usersfield',
-        ),
-        migrations.AddField(
-            model_name='areas',
-            name='created_by',
-            field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='areas',
-            name='created_date',
-            field=models.DateField(blank=True, default=datetime.date.today),
-        ),
-        migrations.AlterField(
-            model_name='areas',
-            name='color',
-            field=colorful.fields.RGBColorField(blank=True, colors=['#FFB900', '#E74856', '#0078D7', '#0099BC', '#7A7574'], default='#0099BC'),
-        ),
-        migrations.AlterField(
-            model_name='areas',
-            name='name',
-            field=models.CharField(max_length=200),
-        ),
-    ]

areas/migrations/0004_remove_areas_created_by.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-02 21:55
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('areas', '0003_auto_20191202_2255'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='areas',
-            name='created_by',
-        ),
-    ]

areas/migrations/0005_auto_20191202_2256.py

@@ -1,26 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-02 21:56
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('areas', '0004_remove_areas_created_by'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='areas',
-            old_name='created_date',
-            new_name='created_area_date',
-        ),
-        migrations.AddField(
-            model_name='areas',
-            name='created_area_by',
-            field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
-        ),
-    ]

areas/migrations/0006_auto_20191202_2300.py

@@ -1,20 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-02 22:00
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('areas', '0005_auto_20191202_2256'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='areas',
-            name='created_area_by',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
-        ),
-    ]

digitaleagentur/settings.py

@@ -80,17 +80,25 @@ WSGI_APPLICATION = 'digitaleagentur.wsgi.application'
 # Database
 # https://docs.djangoproject.com/en/2.2/ref/settings/#databases
 
+#DATABASES = {
+#    'default': {
+#        'ENGINE': 'django.db.backends.mysql',
+#        'NAME' : 'digitaleagentur',
+#        'USER' : 'digitaleagentur',
+#        'PASSWORD' : 'H9hzbzyBqtUCnZlIwL1qSrzh',
+#        'PORT' : 3306
+#    }
+#}
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
         'NAME' : 'digitaleagentur',
-        'USER' : 'digitaleagentur',
-        'PASSWORD' : 'H9hzbzyBqtUCnZlIwL1qSrzh',
+        'USER' : 'root',
+        'PASSWORD' : '',
         'PORT' : 3306
     }
 }
 
-
 # Password validation
 # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators
 
@@ -113,7 +121,7 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/2.2/topics/i18n/
 
-LANGUAGE_CODE = 'de-de'
+LANGUAGE_CODE = 'de'
 
 TIME_ZONE = 'UTC'
 
@@ -129,6 +137,7 @@ LOGIN_REDIRECT_URL = 'users-dashboard'
 # LOGIN PAGE FOR LOGIN-REDIRECT
 LOGIN_URL = 'login'
 
+
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.2/howto/static-files/
 
@@ -143,17 +152,8 @@ MEDIA_URL = '/media/'
 
 # FOR COLORFIELD
 GRAPPELLI_CLEAN_INPUT_TYPES = False
-# ROLLS
-'''
-Rolle in der BASE.html unter USERS entsprechend einfügen und URL einfügen, damit das Modul auch gefunden wird!
-0 = NICHT DIESE ROLLE
-1 = HAT DIESE ROLLE
-
-Wenn adminstrator = 1 dann darf keine andere Rolle 1 sein! Sonst wird das Menü links mehrfach ausgegeben
-
-'''
-#ROLLS = {"administrator": 0, "usermanagement": 0, "areamanagement": 0, "taskmanagement": 0}
 
+# EMAILs
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = 'smtp.strato.de'
 EMAIL_PORT = 587

users/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.2.7 on 2019-11-25 19:42
+# Generated by Django 3.0 on 2019-12-03 22:58
 
 from django.conf import settings
 from django.db import migrations, models
@@ -14,17 +14,33 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Agency',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(default='', max_length=200)),
+                ('inhaber', models.CharField(blank=True, default='', max_length=200)),
+                ('street', models.CharField(blank=True, default='', max_length=200)),
+                ('city', models.CharField(blank=True, default='', max_length=200)),
+                ('email', models.EmailField(blank=True, default='', max_length=254)),
+                ('phone', models.CharField(blank=True, default='', max_length=20)),
+                ('agencypic', models.ImageField(blank=True, default='default.jpg', upload_to='agencymain')),
+            ],
+        ),
         migrations.CreateModel(
             name='Profile',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=60)),
-                ('prename', models.CharField(max_length=60)),
-                ('mailaddress', models.EmailField(max_length=60)),
-                ('phoneland', models.CharField(max_length=60)),
-                ('phonemobile', models.CharField(max_length=60)),
-                ('compfunc', models.CharField(max_length=60)),
+                ('phoneland', models.CharField(blank=True, max_length=60)),
+                ('phonemobile', models.CharField(blank=True, max_length=60)),
+                ('func', models.CharField(choices=[('lead', 'Agenturleitung'), ('external', 'Außendienst'), ('indoor', 'Innendienst'), ('trainee', 'Azubi')], default='external', max_length=50)),
+                ('image', models.ImageField(blank=True, default='default.jpg', upload_to='userprofilepics')),
+                ('compfunc', models.CharField(blank=True, max_length=60)),
+                ('agency', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency')),
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
+            options={
+                'permissions': [('agency_change', 'Agenturinformationen verändern'), ('users_usermanagement', 'Benutzer bearbeiten'), ('tasks_management', 'Aufgabenbereiche bearbeiten'), ('areas_management', 'Bereiche bearbeiten')],
+            },
         ),
     ]

users/migrations/0002_profile_rolls.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-25 21:16
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='profile',
-            name='rolls',
-            field=models.CharField(default='', max_length=1000),
-        ),
-    ]

users/migrations/0003_auto_20191125_2231.py

@@ -1,26 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-25 21:31
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0002_profile_rolls'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Agency',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=200)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='agency',
-            field=models.ForeignKey(default='', on_delete=django.db.models.deletion.PROTECT, to='users.Agency'),
-        ),
-    ]

users/migrations/0004_auto_20191125_2233.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-25 21:33
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0003_auto_20191125_2231'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='agency',
-            field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, to='users.Agency'),
-        ),
-    ]

users/migrations/0005_auto_20191125_2258.py

@@ -1,33 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-25 21:58
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0004_auto_20191125_2233'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='compfunc',
-            field=models.CharField(blank=True, max_length=60),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='phoneland',
-            field=models.CharField(blank=True, max_length=60),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='phonemobile',
-            field=models.CharField(blank=True, max_length=60),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='rolls',
-            field=models.CharField(blank=True, default='', max_length=1000),
-        ),
-    ]

users/migrations/0006_auto_20191126_1644.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-26 15:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0005_auto_20191125_2258'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='rolls',
-            field=models.CharField(blank=True, default={'administrator': False, 'areamanagament': False, 'taskmanagament': False, 'usermanagement': False}, max_length=2000),
-        ),
-    ]

users/migrations/0007_auto_20191126_1801.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-26 17:01
-
-from django.db import migrations
-import jsonfield.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0006_auto_20191126_1644'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='rolls',
-            field=jsonfield.fields.JSONField(blank=True, default={'administrator': True, 'areamanagament': False, 'taskmanagament': False, 'usermanagement': False}, max_length=2000),
-        ),
-    ]

users/migrations/0008_auto_20191126_1952.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-26 18:52
-
-from django.db import migrations
-import jsonfield.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0007_auto_20191126_1801'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='profile',
-            name='mailaddress',
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='rolls',
-            field=jsonfield.fields.JSONField(blank=True, default={'administrator': 0, 'areamanagement': 0, 'taskmanagement': 0, 'usermanagement': 0}, max_length=2000),
-        ),
-    ]

users/migrations/0009_auto_20191126_2031.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-26 19:31
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0008_auto_20191126_1952'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='agency',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency'),
-        ),
-    ]

users/migrations/0010_auto_20191126_2119.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-26 20:19
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0009_auto_20191126_2031'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='agency',
-            field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, to='users.Agency'),
-        ),
-    ]

users/migrations/0011_auto_20191126_2120.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-26 20:20
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0010_auto_20191126_2119'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='agency',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency'),
-        ),
-    ]

users/migrations/0012_remove_profile_agency.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-26 20:21
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0011_auto_20191126_2120'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='profile',
-            name='agency',
-        ),
-    ]

users/migrations/0013_profile_agency.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-26 20:55
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0012_remove_profile_agency'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='profile',
-            name='agency',
-            field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, to='users.Agency'),
-        ),
-    ]

users/migrations/0014_remove_profile_agency.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-26 20:56
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0013_profile_agency'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='profile',
-            name='agency',
-        ),
-    ]

users/migrations/0015_profile_agency.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-26 20:57
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0014_remove_profile_agency'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='profile',
-            name='agency',
-            field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, to='users.Agency'),
-        ),
-    ]

users/migrations/0016_auto_20191127_0846.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-27 07:46
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0015_profile_agency'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='agency',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency'),
-        ),
-    ]

users/migrations/0017_remove_profile_rolls.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-27 20:34
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0016_auto_20191127_0846'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='profile',
-            name='rolls',
-        ),
-    ]

users/migrations/0018_profile_image.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-28 16:28
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0017_remove_profile_rolls'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='profile',
-            name='image',
-            field=models.ImageField(default='default.jpg', upload_to='profile_pics'),
-        ),
-    ]

users/migrations/0019_auto_20191128_1853.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-28 17:53
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0018_profile_image'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='profile',
-            name='func',
-            field=models.CharField(choices=[('external', 'Außendienst'), ('indoor', 'Innendienst'), ('trainee', 'Außendienst')], default=('external', 'Außendienst'), max_length=50),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='image',
-            field=models.ImageField(blank=True, default='default.jpg', upload_to='userprofilepics'),
-        ),
-    ]

users/migrations/0020_auto_20191128_2029.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-28 19:29
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0019_auto_20191128_1853'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='func',
-            field=models.CharField(choices=[('external', 'Außendienst'), ('indoor', 'Innendienst'), ('trainee', 'Azubi')], default=('external', 'Außendienst'), max_length=50),
-        ),
-    ]

users/migrations/0021_auto_20191128_2252.py

@@ -1,26 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-28 21:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0020_auto_20191128_2029'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='profile',
-            name='name',
-        ),
-        migrations.RemoveField(
-            model_name='profile',
-            name='prename',
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='func',
-            field=models.CharField(choices=[('external', 'Außendienst'), ('indoor', 'Innendienst'), ('trainee', 'Azubi')], default='external', max_length=50),
-        ),
-    ]

users/migrations/0022_auto_20191130_2358.py

@@ -1,53 +0,0 @@
-# Generated by Django 2.2.7 on 2019-11-30 22:58
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0021_auto_20191128_2252'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='agency',
-            name='agencypic',
-            field=models.ImageField(blank=True, default='default.jpg', upload_to='agencymain'),
-        ),
-        migrations.AddField(
-            model_name='agency',
-            name='city',
-            field=models.CharField(default='', max_length=200),
-        ),
-        migrations.AddField(
-            model_name='agency',
-            name='email',
-            field=models.EmailField(default='', max_length=254),
-        ),
-        migrations.AddField(
-            model_name='agency',
-            name='inhaber',
-            field=models.CharField(default='', max_length=200),
-        ),
-        migrations.AddField(
-            model_name='agency',
-            name='phone',
-            field=models.CharField(default='', max_length=60),
-        ),
-        migrations.AddField(
-            model_name='agency',
-            name='street',
-            field=models.CharField(default='', max_length=200),
-        ),
-        migrations.AlterField(
-            model_name='agency',
-            name='name',
-            field=models.CharField(default='', max_length=200),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='func',
-            field=models.CharField(choices=[('lead', 'Agenturleitung'), ('external', 'Außendienst'), ('indoor', 'Innendienst'), ('trainee', 'Azubi')], default='external', max_length=50),
-        ),
-    ]

users/migrations/0023_auto_20191201_1118.py

@@ -1,42 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 10:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0022_auto_20191130_2358'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='agency',
-            options={'permissions': [('agency_change', 'Agenturinformationen verändern')]},
-        ),
-        migrations.AlterField(
-            model_name='agency',
-            name='city',
-            field=models.CharField(blank=True, default='', max_length=200),
-        ),
-        migrations.AlterField(
-            model_name='agency',
-            name='email',
-            field=models.EmailField(blank=True, default='', max_length=254),
-        ),
-        migrations.AlterField(
-            model_name='agency',
-            name='inhaber',
-            field=models.CharField(blank=True, default='', max_length=200),
-        ),
-        migrations.AlterField(
-            model_name='agency',
-            name='phone',
-            field=models.CharField(blank=True, default='', max_length=20),
-        ),
-        migrations.AlterField(
-            model_name='agency',
-            name='street',
-            field=models.CharField(blank=True, default='', max_length=200),
-        ),
-    ]

users/migrations/0024_auto_20191201_1130.py

@@ -1,21 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 10:30
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0023_auto_20191201_1118'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='agency',
-            options={},
-        ),
-        migrations.AlterModelOptions(
-            name='profile',
-            options={'permissions': [('agency_change', 'Agenturinformationen verändern')]},
-        ),
-    ]

users/migrations/0025_auto_20191201_1150.py

@@ -1,27 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 10:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0024_auto_20191201_1130'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='UsersPermission',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('agency_change', models.BooleanField()),
-            ],
-            options={
-                'permissions': [('agency_change', 'Agenturinformationen verändern')],
-            },
-        ),
-        migrations.AlterModelOptions(
-            name='profile',
-            options={},
-        ),
-    ]

users/migrations/0026_profile_perms.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 10:55
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0025_auto_20191201_1150'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='profile',
-            name='perms',
-            field=models.OneToOneField(default=None, on_delete=django.db.models.deletion.CASCADE, to='users.UsersPermission'),
-        ),
-    ]

users/migrations/0027_remove_profile_perms.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 10:58
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0026_profile_perms'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='profile',
-            name='perms',
-        ),
-    ]

users/migrations/0028_delete_userspermission.py

@@ -1,16 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 11:00
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0027_remove_profile_perms'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='UsersPermission',
-        ),
-    ]

users/migrations/0029_profile_tt.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 11:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0028_delete_userspermission'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='profile',
-            name='tt',
-            field=models.CharField(blank=True, max_length=60),
-        ),
-    ]

users/migrations/0030_remove_profile_tt.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 11:03
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0029_profile_tt'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='profile',
-            name='tt',
-        ),
-    ]

users/migrations/0031_auto_20191201_1205.py

@@ -1,29 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 11:05
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0030_remove_profile_tt'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='UsersPermission',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('agency_change', models.BooleanField()),
-            ],
-            options={
-                'permissions': [('agency_change', 'Agenturinformationen verändern')],
-            },
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='perms',
-            field=models.OneToOneField(default=None, on_delete=django.db.models.deletion.CASCADE, to='users.UsersPermission'),
-        ),
-    ]

users/migrations/0032_auto_20191201_1217.py

@@ -1,20 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 11:17
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0031_auto_20191201_1205'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='profile',
-            name='perms',
-        ),
-        migrations.DeleteModel(
-            name='UsersPermission',
-        ),
-    ]

users/migrations/0033_userspermission.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 11:33
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0032_auto_20191201_1217'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='UsersPermission',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('agency_change', models.BooleanField()),
-            ],
-            options={
-                'permissions': [('agency_change', 'Agenturinformationen verändern')],
-            },
-        ),
-    ]

users/migrations/0034_auto_20191201_1234.py

@@ -1,20 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 11:34
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0033_userspermission'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='UsersPermission',
-        ),
-        migrations.AlterModelOptions(
-            name='profile',
-            options={'permissions': [('agency_change', 'Agenturinformationen verändern')]},
-        ),
-    ]

users/migrations/0035_auto_20191201_1307.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 12:07
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0034_auto_20191201_1234'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='profile',
-            options={},
-        ),
-    ]

users/migrations/0036_auto_20191201_1308.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 12:08
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0035_auto_20191201_1307'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='profile',
-            options={'permissions': [('agency_change', 'Agenturinformationen verändern')]},
-        ),
-    ]

users/migrations/0037_auto_20191201_1555.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-01 14:55
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0036_auto_20191201_1308'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='profile',
-            options={'permissions': [('agency_change', 'Agenturinformationen verändern'), ('users_usermanagement', 'Benutzer bearbeiten')]},
-        ),
-    ]

users/migrations/0038_auto_20191202_1757.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.2.7 on 2019-12-02 16:57
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0037_auto_20191201_1555'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='profile',
-            options={'permissions': [('agency_change', 'Agenturinformationen verändern'), ('users_usermanagement', 'Benutzer bearbeiten'), ('tasks_management', 'Aufgabenbereiche bearbeiten'), ('areas_management', 'Bereiche bearbeiten')]},
-        ),
-    ]