diff --git a/areas/__pycache__/__init__.cpython-38.pyc b/areas/__pycache__/__init__.cpython-38.pyc index 3fed716..3ff9165 100644 Binary files a/areas/__pycache__/__init__.cpython-38.pyc and b/areas/__pycache__/__init__.cpython-38.pyc differ diff --git a/areas/__pycache__/admin.cpython-38.pyc b/areas/__pycache__/admin.cpython-38.pyc index f4e758a..c67ec55 100644 Binary files a/areas/__pycache__/admin.cpython-38.pyc and b/areas/__pycache__/admin.cpython-38.pyc differ diff --git a/areas/__pycache__/apps.cpython-38.pyc b/areas/__pycache__/apps.cpython-38.pyc index 9290f60..e7a6b78 100644 Binary files a/areas/__pycache__/apps.cpython-38.pyc and b/areas/__pycache__/apps.cpython-38.pyc differ diff --git a/areas/__pycache__/forms.cpython-38.pyc b/areas/__pycache__/forms.cpython-38.pyc index b1a2c81..c9f46ac 100644 Binary files a/areas/__pycache__/forms.cpython-38.pyc and b/areas/__pycache__/forms.cpython-38.pyc differ diff --git a/areas/__pycache__/models.cpython-38.pyc b/areas/__pycache__/models.cpython-38.pyc index 04f8d72..83d08a8 100644 Binary files a/areas/__pycache__/models.cpython-38.pyc and b/areas/__pycache__/models.cpython-38.pyc differ diff --git a/areas/__pycache__/urls.cpython-38.pyc b/areas/__pycache__/urls.cpython-38.pyc index 7683456..ddff2d1 100644 Binary files a/areas/__pycache__/urls.cpython-38.pyc and b/areas/__pycache__/urls.cpython-38.pyc differ diff --git a/areas/__pycache__/views.cpython-38.pyc b/areas/__pycache__/views.cpython-38.pyc index 0d77c06..aae0ee2 100644 Binary files a/areas/__pycache__/views.cpython-38.pyc and b/areas/__pycache__/views.cpython-38.pyc differ diff --git a/areas/migrations/0001_initial.py b/areas/migrations/0001_initial.py deleted file mode 100644 index 6d36ba4..0000000 --- a/areas/migrations/0001_initial.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 17:02 - -import colorful.fields -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Areas', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('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)), - ], - ), - ] diff --git a/areas/migrations/0002_auto_20191209_1802.py b/areas/migrations/0002_auto_20191209_1802.py deleted file mode 100644 index c81cbd3..0000000 --- a/areas/migrations/0002_auto_20191209_1802.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 17:02 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('areas', '0001_initial'), - ('users', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='areas', - name='agency', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency'), - ), - migrations.AddField( - model_name='areas', - name='created_area_by', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='areas', - name='usersfield', - field=models.ManyToManyField(blank=True, related_name='users_in_area', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/areas/migrations/__init__.py b/areas/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/areas/migrations/__pycache__/0001_initial.cpython-38.pyc b/areas/migrations/__pycache__/0001_initial.cpython-38.pyc deleted file mode 100644 index e7289b8..0000000 Binary files a/areas/migrations/__pycache__/0001_initial.cpython-38.pyc and /dev/null differ diff --git a/areas/migrations/__pycache__/0002_auto_20191202_2001.cpython-38.pyc b/areas/migrations/__pycache__/0002_auto_20191202_2001.cpython-38.pyc deleted file mode 100644 index f9f651f..0000000 Binary files a/areas/migrations/__pycache__/0002_auto_20191202_2001.cpython-38.pyc and /dev/null differ diff --git a/areas/migrations/__pycache__/0002_auto_20191209_1802.cpython-38.pyc b/areas/migrations/__pycache__/0002_auto_20191209_1802.cpython-38.pyc deleted file mode 100644 index 547252b..0000000 Binary files a/areas/migrations/__pycache__/0002_auto_20191209_1802.cpython-38.pyc and /dev/null differ diff --git a/areas/migrations/__pycache__/0003_auto_20191202_2255.cpython-38.pyc b/areas/migrations/__pycache__/0003_auto_20191202_2255.cpython-38.pyc deleted file mode 100644 index 17ea359..0000000 Binary files a/areas/migrations/__pycache__/0003_auto_20191202_2255.cpython-38.pyc and /dev/null differ diff --git a/areas/migrations/__pycache__/0004_remove_areas_created_by.cpython-38.pyc b/areas/migrations/__pycache__/0004_remove_areas_created_by.cpython-38.pyc deleted file mode 100644 index cadf4b4..0000000 Binary files a/areas/migrations/__pycache__/0004_remove_areas_created_by.cpython-38.pyc and /dev/null differ diff --git a/areas/migrations/__pycache__/0005_auto_20191202_2256.cpython-38.pyc b/areas/migrations/__pycache__/0005_auto_20191202_2256.cpython-38.pyc deleted file mode 100644 index bda9723..0000000 Binary files a/areas/migrations/__pycache__/0005_auto_20191202_2256.cpython-38.pyc and /dev/null differ diff --git a/areas/migrations/__pycache__/0006_auto_20191202_2300.cpython-38.pyc b/areas/migrations/__pycache__/0006_auto_20191202_2300.cpython-38.pyc deleted file mode 100644 index e4a1d08..0000000 Binary files a/areas/migrations/__pycache__/0006_auto_20191202_2300.cpython-38.pyc and /dev/null differ diff --git a/areas/migrations/__pycache__/__init__.cpython-38.pyc b/areas/migrations/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 2cd3248..0000000 Binary files a/areas/migrations/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/digitaleagentur/__pycache__/__init__.cpython-38.pyc b/digitaleagentur/__pycache__/__init__.cpython-38.pyc index 1ffa496..f932871 100644 Binary files a/digitaleagentur/__pycache__/__init__.cpython-38.pyc and b/digitaleagentur/__pycache__/__init__.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 33e2d22..0ba5f30 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc index a45d73b..d5dc7f2 100644 Binary files a/digitaleagentur/__pycache__/urls.cpython-38.pyc and b/digitaleagentur/__pycache__/urls.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/views.cpython-38.pyc b/digitaleagentur/__pycache__/views.cpython-38.pyc index 268c51d..ecd32fe 100644 Binary files a/digitaleagentur/__pycache__/views.cpython-38.pyc and b/digitaleagentur/__pycache__/views.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/wsgi.cpython-38.pyc b/digitaleagentur/__pycache__/wsgi.cpython-38.pyc index c66704f..3e8074e 100644 Binary files a/digitaleagentur/__pycache__/wsgi.cpython-38.pyc and b/digitaleagentur/__pycache__/wsgi.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index b15286a..aa72f7f 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -114,7 +114,7 @@ CKEDITOR_CONFIGS = { } # Database # https://docs.djangoproject.com/en/2.2/ref/settings/#databases - +''' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', @@ -124,6 +124,16 @@ DATABASES = { 'PORT' : 3306 } } +''' +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'NAME' : 'digitaleagentur', + 'USER' : 'root', + 'PASSWORD' : '', + 'PORT' : 3306 + } +} # Password validation # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators diff --git a/news/__pycache__/__init__.cpython-38.pyc b/news/__pycache__/__init__.cpython-38.pyc index 50d4891..fe38ad1 100644 Binary files a/news/__pycache__/__init__.cpython-38.pyc and b/news/__pycache__/__init__.cpython-38.pyc differ diff --git a/news/__pycache__/admin.cpython-38.pyc b/news/__pycache__/admin.cpython-38.pyc index 8692976..144b68c 100644 Binary files a/news/__pycache__/admin.cpython-38.pyc and b/news/__pycache__/admin.cpython-38.pyc differ diff --git a/news/__pycache__/apps.cpython-38.pyc b/news/__pycache__/apps.cpython-38.pyc index 45a5cfe..c643216 100644 Binary files a/news/__pycache__/apps.cpython-38.pyc and b/news/__pycache__/apps.cpython-38.pyc differ diff --git a/news/__pycache__/forms.cpython-38.pyc b/news/__pycache__/forms.cpython-38.pyc index 4f2a036..2903330 100644 Binary files a/news/__pycache__/forms.cpython-38.pyc and b/news/__pycache__/forms.cpython-38.pyc differ diff --git a/news/__pycache__/models.cpython-38.pyc b/news/__pycache__/models.cpython-38.pyc index bd27abd..b32eaa5 100644 Binary files a/news/__pycache__/models.cpython-38.pyc and b/news/__pycache__/models.cpython-38.pyc differ diff --git a/news/__pycache__/urls.cpython-38.pyc b/news/__pycache__/urls.cpython-38.pyc index 4f0ef46..329ef64 100644 Binary files a/news/__pycache__/urls.cpython-38.pyc and b/news/__pycache__/urls.cpython-38.pyc differ diff --git a/news/__pycache__/views.cpython-38.pyc b/news/__pycache__/views.cpython-38.pyc index f23ea34..069e8d5 100644 Binary files a/news/__pycache__/views.cpython-38.pyc and b/news/__pycache__/views.cpython-38.pyc differ diff --git a/news/migrations/0001_initial.py b/news/migrations/0001_initial.py deleted file mode 100644 index 859bf21..0000000 --- a/news/migrations/0001_initial.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 17:02 - -import ckeditor_uploader.fields -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='News', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(default='', max_length=200)), - ('content', ckeditor_uploader.fields.RichTextUploadingField(blank=True, verbose_name='Inhalt')), - ('created_date', models.DateField(blank=True, default=datetime.date.today)), - ('go_online_on', models.DateField(blank=True, default=datetime.date.today)), - ('go_offline_on', models.DateField(blank=True, default=datetime.date.today)), - ('last_modified_on', models.DateField(blank=True, default=datetime.date.today)), - ], - ), - ] diff --git a/news/migrations/0002_auto_20191209_1802.py b/news/migrations/0002_auto_20191209_1802.py deleted file mode 100644 index ee73a8a..0000000 --- a/news/migrations/0002_auto_20191209_1802.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 17:02 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('news', '0001_initial'), - ('users', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='news', - name='agency', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.Agency'), - ), - migrations.AddField( - model_name='news', - name='created_by', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='news', - name='last_modified_by', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, related_name='news_mod_by', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/news/migrations/0003_auto_20191209_1828.py b/news/migrations/0003_auto_20191209_1828.py deleted file mode 100644 index ebba84d..0000000 --- a/news/migrations/0003_auto_20191209_1828.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 17:28 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('news', '0002_auto_20191209_1802'), - ] - - operations = [ - migrations.AlterField( - model_name='news', - name='go_offline_on', - field=models.DateTimeField(blank=True, default=datetime.date.today), - ), - migrations.AlterField( - model_name='news', - name='go_online_on', - field=models.DateTimeField(blank=True, default=datetime.date.today), - ), - ] diff --git a/news/migrations/0004_auto_20191209_2227.py b/news/migrations/0004_auto_20191209_2227.py deleted file mode 100644 index 1331670..0000000 --- a/news/migrations/0004_auto_20191209_2227.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 21:27 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('news', '0003_auto_20191209_1828'), - ] - - operations = [ - migrations.AlterField( - model_name='news', - name='created_date', - field=models.DateTimeField(blank=True, default=datetime.date.today), - ), - migrations.AlterField( - model_name='news', - name='last_modified_on', - field=models.DateTimeField(blank=True, default=datetime.date.today), - ), - ] diff --git a/news/migrations/__init__.py b/news/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/news/migrations/__pycache__/0001_initial.cpython-38.pyc b/news/migrations/__pycache__/0001_initial.cpython-38.pyc deleted file mode 100644 index 5c9082c..0000000 Binary files a/news/migrations/__pycache__/0001_initial.cpython-38.pyc and /dev/null differ diff --git a/news/migrations/__pycache__/0002_auto_20191209_1753.cpython-38.pyc b/news/migrations/__pycache__/0002_auto_20191209_1753.cpython-38.pyc deleted file mode 100644 index 0a3ee48..0000000 Binary files a/news/migrations/__pycache__/0002_auto_20191209_1753.cpython-38.pyc and /dev/null differ diff --git a/news/migrations/__pycache__/0002_auto_20191209_1802.cpython-38.pyc b/news/migrations/__pycache__/0002_auto_20191209_1802.cpython-38.pyc deleted file mode 100644 index 87961de..0000000 Binary files a/news/migrations/__pycache__/0002_auto_20191209_1802.cpython-38.pyc and /dev/null differ diff --git a/news/migrations/__pycache__/0003_auto_20191209_1757.cpython-38.pyc b/news/migrations/__pycache__/0003_auto_20191209_1757.cpython-38.pyc deleted file mode 100644 index 23af06f..0000000 Binary files a/news/migrations/__pycache__/0003_auto_20191209_1757.cpython-38.pyc and /dev/null differ diff --git a/news/migrations/__pycache__/0003_auto_20191209_1828.cpython-38.pyc b/news/migrations/__pycache__/0003_auto_20191209_1828.cpython-38.pyc deleted file mode 100644 index 4af0db9..0000000 Binary files a/news/migrations/__pycache__/0003_auto_20191209_1828.cpython-38.pyc and /dev/null differ diff --git a/news/migrations/__pycache__/0004_auto_20191209_2227.cpython-38.pyc b/news/migrations/__pycache__/0004_auto_20191209_2227.cpython-38.pyc deleted file mode 100644 index fef0d53..0000000 Binary files a/news/migrations/__pycache__/0004_auto_20191209_2227.cpython-38.pyc and /dev/null differ diff --git a/news/migrations/__pycache__/__init__.cpython-38.pyc b/news/migrations/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index a1952a4..0000000 Binary files a/news/migrations/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/orga/__pycache__/__init__.cpython-38.pyc b/orga/__pycache__/__init__.cpython-38.pyc index 5fbb46a..496d807 100644 Binary files a/orga/__pycache__/__init__.cpython-38.pyc and b/orga/__pycache__/__init__.cpython-38.pyc differ diff --git a/orga/__pycache__/admin.cpython-38.pyc b/orga/__pycache__/admin.cpython-38.pyc index 52eca0c..6513846 100644 Binary files a/orga/__pycache__/admin.cpython-38.pyc and b/orga/__pycache__/admin.cpython-38.pyc differ diff --git a/orga/__pycache__/apps.cpython-38.pyc b/orga/__pycache__/apps.cpython-38.pyc index bad2d21..52f5b45 100644 Binary files a/orga/__pycache__/apps.cpython-38.pyc and b/orga/__pycache__/apps.cpython-38.pyc differ diff --git a/orga/__pycache__/models.cpython-38.pyc b/orga/__pycache__/models.cpython-38.pyc index 0ceedb8..96f69e5 100644 Binary files a/orga/__pycache__/models.cpython-38.pyc and b/orga/__pycache__/models.cpython-38.pyc differ diff --git a/orga/__pycache__/urls.cpython-38.pyc b/orga/__pycache__/urls.cpython-38.pyc index dbd2557..442122f 100644 Binary files a/orga/__pycache__/urls.cpython-38.pyc and b/orga/__pycache__/urls.cpython-38.pyc differ diff --git a/orga/__pycache__/views.cpython-38.pyc b/orga/__pycache__/views.cpython-38.pyc index 8f8bb8b..bdc046f 100644 Binary files a/orga/__pycache__/views.cpython-38.pyc and b/orga/__pycache__/views.cpython-38.pyc differ diff --git a/orga/migrations/__init__.py b/orga/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/orga/migrations/__pycache__/__init__.cpython-38.pyc b/orga/migrations/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 378acdf..0000000 Binary files a/orga/migrations/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/standards/__pycache__/__init__.cpython-38.pyc b/standards/__pycache__/__init__.cpython-38.pyc index 10c9914..3efa48c 100644 Binary files a/standards/__pycache__/__init__.cpython-38.pyc and b/standards/__pycache__/__init__.cpython-38.pyc differ diff --git a/standards/__pycache__/admin.cpython-38.pyc b/standards/__pycache__/admin.cpython-38.pyc index 636f01b..a4a2637 100644 Binary files a/standards/__pycache__/admin.cpython-38.pyc and b/standards/__pycache__/admin.cpython-38.pyc differ diff --git a/standards/__pycache__/apps.cpython-38.pyc b/standards/__pycache__/apps.cpython-38.pyc index 4506211..4552384 100644 Binary files a/standards/__pycache__/apps.cpython-38.pyc and b/standards/__pycache__/apps.cpython-38.pyc differ diff --git a/standards/__pycache__/forms.cpython-38.pyc b/standards/__pycache__/forms.cpython-38.pyc index a2f4a40..26a019c 100644 Binary files a/standards/__pycache__/forms.cpython-38.pyc and b/standards/__pycache__/forms.cpython-38.pyc differ diff --git a/standards/__pycache__/models.cpython-38.pyc b/standards/__pycache__/models.cpython-38.pyc index fdd798a..49f2123 100644 Binary files a/standards/__pycache__/models.cpython-38.pyc and b/standards/__pycache__/models.cpython-38.pyc differ diff --git a/standards/__pycache__/urls.cpython-38.pyc b/standards/__pycache__/urls.cpython-38.pyc index 67f12f1..29e42d3 100644 Binary files a/standards/__pycache__/urls.cpython-38.pyc and b/standards/__pycache__/urls.cpython-38.pyc differ diff --git a/standards/__pycache__/views.cpython-38.pyc b/standards/__pycache__/views.cpython-38.pyc index 09985db..c6ad04a 100644 Binary files a/standards/__pycache__/views.cpython-38.pyc and b/standards/__pycache__/views.cpython-38.pyc differ diff --git a/standards/migrations/0001_initial.py b/standards/migrations/0001_initial.py deleted file mode 100644 index a3bf549..0000000 --- a/standards/migrations/0001_initial.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 17:02 - -import ckeditor_uploader.fields -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Standards', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(default='', max_length=200)), - ('content', ckeditor_uploader.fields.RichTextUploadingField(blank=True, verbose_name='Inhalt')), - ('created_standard_date', models.DateField(blank=True, default=datetime.date.today)), - ('published_on', models.DateField(blank=True, default=datetime.date.today)), - ('last_modified_on', models.DateField(blank=True, default=datetime.date.today)), - ('public', models.BooleanField(default=False)), - ], - ), - ] diff --git a/standards/migrations/0002_auto_20191209_1802.py b/standards/migrations/0002_auto_20191209_1802.py deleted file mode 100644 index 7731721..0000000 --- a/standards/migrations/0002_auto_20191209_1802.py +++ /dev/null @@ -1,51 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 17:02 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('standards', '0001_initial'), - ('tasks', '0001_initial'), - ('areas', '0002_auto_20191209_1802'), - ('users', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='standards', - name='agency', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.Agency'), - ), - migrations.AddField( - model_name='standards', - name='area', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='areas.Areas'), - ), - migrations.AddField( - model_name='standards', - name='created_standard_by', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='standards', - name='last_modified_by', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, related_name='user_modified_standard', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='standards', - name='published_by', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, related_name='user_published_standard', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='standards', - name='task', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tasks.Tasks'), - ), - ] diff --git a/standards/migrations/0003_auto_20191209_2226.py b/standards/migrations/0003_auto_20191209_2226.py deleted file mode 100644 index 3dc16c7..0000000 --- a/standards/migrations/0003_auto_20191209_2226.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 21:26 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('standards', '0002_auto_20191209_1802'), - ] - - operations = [ - migrations.AlterField( - model_name='standards', - name='created_standard_date', - field=models.DateTimeField(blank=True, default=datetime.date.today), - ), - migrations.AlterField( - model_name='standards', - name='last_modified_on', - field=models.DateTimeField(blank=True, default=datetime.date.today), - ), - migrations.AlterField( - model_name='standards', - name='published_on', - field=models.DateTimeField(blank=True, default=datetime.date.today), - ), - ] diff --git a/standards/migrations/__init__.py b/standards/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/standards/migrations/__pycache__/0001_initial.cpython-38.pyc b/standards/migrations/__pycache__/0001_initial.cpython-38.pyc deleted file mode 100644 index c923d66..0000000 Binary files a/standards/migrations/__pycache__/0001_initial.cpython-38.pyc and /dev/null differ diff --git a/standards/migrations/__pycache__/0002_auto_20191204_1808.cpython-38.pyc b/standards/migrations/__pycache__/0002_auto_20191204_1808.cpython-38.pyc deleted file mode 100644 index 3212bf7..0000000 Binary files a/standards/migrations/__pycache__/0002_auto_20191204_1808.cpython-38.pyc and /dev/null differ diff --git a/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc b/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc deleted file mode 100644 index a457549..0000000 Binary files a/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc and /dev/null differ diff --git a/standards/migrations/__pycache__/0002_auto_20191209_1802.cpython-38.pyc b/standards/migrations/__pycache__/0002_auto_20191209_1802.cpython-38.pyc deleted file mode 100644 index d05a16b..0000000 Binary files a/standards/migrations/__pycache__/0002_auto_20191209_1802.cpython-38.pyc and /dev/null differ diff --git a/standards/migrations/__pycache__/0003_auto_20191204_1813.cpython-38.pyc b/standards/migrations/__pycache__/0003_auto_20191204_1813.cpython-38.pyc deleted file mode 100644 index c5f02a1..0000000 Binary files a/standards/migrations/__pycache__/0003_auto_20191204_1813.cpython-38.pyc and /dev/null differ diff --git a/standards/migrations/__pycache__/0003_auto_20191209_2226.cpython-38.pyc b/standards/migrations/__pycache__/0003_auto_20191209_2226.cpython-38.pyc deleted file mode 100644 index ccfef80..0000000 Binary files a/standards/migrations/__pycache__/0003_auto_20191209_2226.cpython-38.pyc and /dev/null differ diff --git a/standards/migrations/__pycache__/0004_auto_20191204_1831.cpython-38.pyc b/standards/migrations/__pycache__/0004_auto_20191204_1831.cpython-38.pyc deleted file mode 100644 index a7c8716..0000000 Binary files a/standards/migrations/__pycache__/0004_auto_20191204_1831.cpython-38.pyc and /dev/null differ diff --git a/standards/migrations/__pycache__/0005_auto_20191204_1924.cpython-38.pyc b/standards/migrations/__pycache__/0005_auto_20191204_1924.cpython-38.pyc deleted file mode 100644 index f0e6a57..0000000 Binary files a/standards/migrations/__pycache__/0005_auto_20191204_1924.cpython-38.pyc and /dev/null differ diff --git a/standards/migrations/__pycache__/0006_auto_20191204_2003.cpython-38.pyc b/standards/migrations/__pycache__/0006_auto_20191204_2003.cpython-38.pyc deleted file mode 100644 index 0c6eb96..0000000 Binary files a/standards/migrations/__pycache__/0006_auto_20191204_2003.cpython-38.pyc and /dev/null differ diff --git a/standards/migrations/__pycache__/__init__.cpython-38.pyc b/standards/migrations/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 912f5d5..0000000 Binary files a/standards/migrations/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html index 6955979..f0e1ce0 100644 --- a/standards/templates/standards/standards_management.html +++ b/standards/templates/standards/standards_management.html @@ -47,7 +47,6 @@ {% endif %} {% endfor %} - {% endfor %} diff --git a/tasks/__pycache__/__init__.cpython-38.pyc b/tasks/__pycache__/__init__.cpython-38.pyc index ba2b443..5761d3d 100644 Binary files a/tasks/__pycache__/__init__.cpython-38.pyc and b/tasks/__pycache__/__init__.cpython-38.pyc differ diff --git a/tasks/__pycache__/admin.cpython-38.pyc b/tasks/__pycache__/admin.cpython-38.pyc index 4785bcc..64cf5df 100644 Binary files a/tasks/__pycache__/admin.cpython-38.pyc and b/tasks/__pycache__/admin.cpython-38.pyc differ diff --git a/tasks/__pycache__/apps.cpython-38.pyc b/tasks/__pycache__/apps.cpython-38.pyc index acb7215..1b8289c 100644 Binary files a/tasks/__pycache__/apps.cpython-38.pyc and b/tasks/__pycache__/apps.cpython-38.pyc differ diff --git a/tasks/__pycache__/forms.cpython-38.pyc b/tasks/__pycache__/forms.cpython-38.pyc index 7d05cbf..bfae0d8 100644 Binary files a/tasks/__pycache__/forms.cpython-38.pyc and b/tasks/__pycache__/forms.cpython-38.pyc differ diff --git a/tasks/__pycache__/models.cpython-38.pyc b/tasks/__pycache__/models.cpython-38.pyc index d012e57..45cdb3b 100644 Binary files a/tasks/__pycache__/models.cpython-38.pyc and b/tasks/__pycache__/models.cpython-38.pyc differ diff --git a/tasks/__pycache__/urls.cpython-38.pyc b/tasks/__pycache__/urls.cpython-38.pyc index 065fae8..fbe82ce 100644 Binary files a/tasks/__pycache__/urls.cpython-38.pyc and b/tasks/__pycache__/urls.cpython-38.pyc differ diff --git a/tasks/__pycache__/views.cpython-38.pyc b/tasks/__pycache__/views.cpython-38.pyc index 2d837b9..c25b548 100644 Binary files a/tasks/__pycache__/views.cpython-38.pyc and b/tasks/__pycache__/views.cpython-38.pyc differ diff --git a/tasks/migrations/0001_initial.py b/tasks/migrations/0001_initial.py deleted file mode 100644 index e5386c0..0000000 --- a/tasks/migrations/0001_initial.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 17:02 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Tasks', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(default='', max_length=200)), - ('desc', models.TextField(blank=True, max_length=3000)), - ('created_area_date', models.DateField(blank=True, default=datetime.date.today)), - ('visible', models.BooleanField(default=True)), - ], - ), - ] diff --git a/tasks/migrations/0002_auto_20191209_1802.py b/tasks/migrations/0002_auto_20191209_1802.py deleted file mode 100644 index 23caba7..0000000 --- a/tasks/migrations/0002_auto_20191209_1802.py +++ /dev/null @@ -1,40 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 17:02 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('tasks', '0001_initial'), - ('users', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('areas', '0002_auto_20191209_1802'), - ] - - operations = [ - migrations.AddField( - model_name='tasks', - name='agency', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.Agency'), - ), - migrations.AddField( - model_name='tasks', - name='area', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='areas.Areas'), - ), - migrations.AddField( - model_name='tasks', - name='created_area_by', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='tasks', - name='usersfield', - field=models.ManyToManyField(blank=True, related_name='users_in_task', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/tasks/migrations/__init__.py b/tasks/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc b/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc deleted file mode 100644 index dd3c6d4..0000000 Binary files a/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc and /dev/null differ diff --git a/tasks/migrations/__pycache__/0002_auto_20191209_1802.cpython-38.pyc b/tasks/migrations/__pycache__/0002_auto_20191209_1802.cpython-38.pyc deleted file mode 100644 index bb1c7b8..0000000 Binary files a/tasks/migrations/__pycache__/0002_auto_20191209_1802.cpython-38.pyc and /dev/null differ diff --git a/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc b/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc deleted file mode 100644 index 3872823..0000000 Binary files a/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc and /dev/null differ diff --git a/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc b/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc deleted file mode 100644 index 212e6c2..0000000 Binary files a/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc and /dev/null differ diff --git a/tasks/migrations/__pycache__/__init__.cpython-38.pyc b/tasks/migrations/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 42a7700..0000000 Binary files a/tasks/migrations/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/users/__pycache__/__init__.cpython-38.pyc b/users/__pycache__/__init__.cpython-38.pyc index 09287f9..1988400 100644 Binary files a/users/__pycache__/__init__.cpython-38.pyc and b/users/__pycache__/__init__.cpython-38.pyc differ diff --git a/users/__pycache__/admin.cpython-38.pyc b/users/__pycache__/admin.cpython-38.pyc index 131dcf0..407ba3c 100644 Binary files a/users/__pycache__/admin.cpython-38.pyc and b/users/__pycache__/admin.cpython-38.pyc differ diff --git a/users/__pycache__/apps.cpython-38.pyc b/users/__pycache__/apps.cpython-38.pyc index e12f316..cea3da8 100644 Binary files a/users/__pycache__/apps.cpython-38.pyc and b/users/__pycache__/apps.cpython-38.pyc differ diff --git a/users/__pycache__/models.cpython-38.pyc b/users/__pycache__/models.cpython-38.pyc index 0ec8d15..6a63d41 100644 Binary files a/users/__pycache__/models.cpython-38.pyc and b/users/__pycache__/models.cpython-38.pyc differ diff --git a/users/__pycache__/priomodel.cpython-38.pyc b/users/__pycache__/priomodel.cpython-38.pyc index e0c5566..f822ee2 100644 Binary files a/users/__pycache__/priomodel.cpython-38.pyc and b/users/__pycache__/priomodel.cpython-38.pyc differ diff --git a/users/__pycache__/signals.cpython-38.pyc b/users/__pycache__/signals.cpython-38.pyc index 46f1761..a854aad 100644 Binary files a/users/__pycache__/signals.cpython-38.pyc and b/users/__pycache__/signals.cpython-38.pyc differ diff --git a/users/__pycache__/urls.cpython-38.pyc b/users/__pycache__/urls.cpython-38.pyc index d28ce66..8024ef2 100644 Binary files a/users/__pycache__/urls.cpython-38.pyc and b/users/__pycache__/urls.cpython-38.pyc differ diff --git a/users/__pycache__/usersforms.cpython-38.pyc b/users/__pycache__/usersforms.cpython-38.pyc index e972567..eff3788 100644 Binary files a/users/__pycache__/usersforms.cpython-38.pyc and b/users/__pycache__/usersforms.cpython-38.pyc differ diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index e466373..0fc6dae 100644 Binary files a/users/__pycache__/views.cpython-38.pyc and b/users/__pycache__/views.cpython-38.pyc differ diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py deleted file mode 100644 index fe376f9..0000000 --- a/users/migrations/0001_initial.py +++ /dev/null @@ -1,56 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 17:02 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('tasks', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - 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')), - ('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'), ('areas_management', 'Bereiche bearbeiten'), ('tasks_management', 'Aufgabenbereiche bearbeiten'), ('standard_management', 'Standards bearbeiten und freischalten'), ('news_management', 'News bearbeiten und veröffentlichen')], - }, - ), - migrations.CreateModel( - name='Prio', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('prio', models.IntegerField(default=0)), - ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tasks.Tasks')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/users/migrations/0002_auto_20191209_2226.py b/users/migrations/0002_auto_20191209_2226.py deleted file mode 100644 index bd5b4fa..0000000 --- a/users/migrations/0002_auto_20191209_2226.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 21:26 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='func', - field=models.CharField(choices=[('lead', 'Agenturleitung'), ('external', 'Außendienst'), ('indoor', 'Innendienst'), ('trainee', 'Azubi')], default='lead', max_length=50), - ), - ] diff --git a/users/migrations/__init__.py b/users/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/users/migrations/__pycache__/0001_initial.cpython-37.pyc b/users/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index 67f91f5..0000000 Binary files a/users/migrations/__pycache__/0001_initial.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0001_initial.cpython-38.pyc b/users/migrations/__pycache__/0001_initial.cpython-38.pyc deleted file mode 100644 index 833bdc6..0000000 Binary files a/users/migrations/__pycache__/0001_initial.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc b/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc deleted file mode 100644 index 095b6ca..0000000 Binary files a/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0002_auto_20191209_2226.cpython-38.pyc b/users/migrations/__pycache__/0002_auto_20191209_2226.cpython-38.pyc deleted file mode 100644 index 5aa46d1..0000000 Binary files a/users/migrations/__pycache__/0002_auto_20191209_2226.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0002_profile_rolls.cpython-37.pyc b/users/migrations/__pycache__/0002_profile_rolls.cpython-37.pyc deleted file mode 100644 index b3f19aa..0000000 Binary files a/users/migrations/__pycache__/0002_profile_rolls.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0002_profile_rolls.cpython-38.pyc b/users/migrations/__pycache__/0002_profile_rolls.cpython-38.pyc deleted file mode 100644 index 538803b..0000000 Binary files a/users/migrations/__pycache__/0002_profile_rolls.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-37.pyc b/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-37.pyc deleted file mode 100644 index 6d90591..0000000 Binary files a/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-38.pyc b/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-38.pyc deleted file mode 100644 index 7e82623..0000000 Binary files a/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0003_prio.cpython-38.pyc b/users/migrations/__pycache__/0003_prio.cpython-38.pyc deleted file mode 100644 index 1a17aa4..0000000 Binary files a/users/migrations/__pycache__/0003_prio.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-37.pyc b/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-37.pyc deleted file mode 100644 index d594312..0000000 Binary files a/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-38.pyc b/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-38.pyc deleted file mode 100644 index 1c1970f..0000000 Binary files a/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0004_auto_20191209_1753.cpython-38.pyc b/users/migrations/__pycache__/0004_auto_20191209_1753.cpython-38.pyc deleted file mode 100644 index 5deef91..0000000 Binary files a/users/migrations/__pycache__/0004_auto_20191209_1753.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0005_auto_20191125_2258.cpython-37.pyc b/users/migrations/__pycache__/0005_auto_20191125_2258.cpython-37.pyc deleted file mode 100644 index 6a74c05..0000000 Binary files a/users/migrations/__pycache__/0005_auto_20191125_2258.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0005_auto_20191125_2258.cpython-38.pyc b/users/migrations/__pycache__/0005_auto_20191125_2258.cpython-38.pyc deleted file mode 100644 index 8202863..0000000 Binary files a/users/migrations/__pycache__/0005_auto_20191125_2258.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-37.pyc b/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-37.pyc deleted file mode 100644 index cb5df2b..0000000 Binary files a/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-38.pyc b/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-38.pyc deleted file mode 100644 index 2500423..0000000 Binary files a/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-37.pyc b/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-37.pyc deleted file mode 100644 index ef69361..0000000 Binary files a/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-38.pyc b/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-38.pyc deleted file mode 100644 index ff3a111..0000000 Binary files a/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-37.pyc b/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-37.pyc deleted file mode 100644 index 2980631..0000000 Binary files a/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-38.pyc b/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-38.pyc deleted file mode 100644 index 8e0f726..0000000 Binary files a/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-37.pyc b/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-37.pyc deleted file mode 100644 index 2ad9d32..0000000 Binary files a/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-38.pyc b/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-38.pyc deleted file mode 100644 index a5d3cfb..0000000 Binary files a/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-37.pyc b/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-37.pyc deleted file mode 100644 index cb62287..0000000 Binary files a/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-38.pyc b/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-38.pyc deleted file mode 100644 index a54f85f..0000000 Binary files a/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0011_auto_20191126_2120.cpython-37.pyc b/users/migrations/__pycache__/0011_auto_20191126_2120.cpython-37.pyc deleted file mode 100644 index 8620bfb..0000000 Binary files a/users/migrations/__pycache__/0011_auto_20191126_2120.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0011_auto_20191126_2120.cpython-38.pyc b/users/migrations/__pycache__/0011_auto_20191126_2120.cpython-38.pyc deleted file mode 100644 index 49618d9..0000000 Binary files a/users/migrations/__pycache__/0011_auto_20191126_2120.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0012_remove_profile_agency.cpython-37.pyc b/users/migrations/__pycache__/0012_remove_profile_agency.cpython-37.pyc deleted file mode 100644 index 7ac8899..0000000 Binary files a/users/migrations/__pycache__/0012_remove_profile_agency.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0012_remove_profile_agency.cpython-38.pyc b/users/migrations/__pycache__/0012_remove_profile_agency.cpython-38.pyc deleted file mode 100644 index 099895f..0000000 Binary files a/users/migrations/__pycache__/0012_remove_profile_agency.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0013_profile_agency.cpython-37.pyc b/users/migrations/__pycache__/0013_profile_agency.cpython-37.pyc deleted file mode 100644 index d84dbe8..0000000 Binary files a/users/migrations/__pycache__/0013_profile_agency.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0013_profile_agency.cpython-38.pyc b/users/migrations/__pycache__/0013_profile_agency.cpython-38.pyc deleted file mode 100644 index 2c3d8bc..0000000 Binary files a/users/migrations/__pycache__/0013_profile_agency.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0014_remove_profile_agency.cpython-37.pyc b/users/migrations/__pycache__/0014_remove_profile_agency.cpython-37.pyc deleted file mode 100644 index 74555eb..0000000 Binary files a/users/migrations/__pycache__/0014_remove_profile_agency.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0014_remove_profile_agency.cpython-38.pyc b/users/migrations/__pycache__/0014_remove_profile_agency.cpython-38.pyc deleted file mode 100644 index f23eef7..0000000 Binary files a/users/migrations/__pycache__/0014_remove_profile_agency.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0015_profile_agency.cpython-37.pyc b/users/migrations/__pycache__/0015_profile_agency.cpython-37.pyc deleted file mode 100644 index a89541d..0000000 Binary files a/users/migrations/__pycache__/0015_profile_agency.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0015_profile_agency.cpython-38.pyc b/users/migrations/__pycache__/0015_profile_agency.cpython-38.pyc deleted file mode 100644 index 379ba5a..0000000 Binary files a/users/migrations/__pycache__/0015_profile_agency.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-37.pyc b/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-37.pyc deleted file mode 100644 index f38f6a4..0000000 Binary files a/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-38.pyc b/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-38.pyc deleted file mode 100644 index 23c1de2..0000000 Binary files a/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-37.pyc b/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-37.pyc deleted file mode 100644 index 966b58f..0000000 Binary files a/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-38.pyc b/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-38.pyc deleted file mode 100644 index b060818..0000000 Binary files a/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0018_profile_image.cpython-38.pyc b/users/migrations/__pycache__/0018_profile_image.cpython-38.pyc deleted file mode 100644 index bee675a..0000000 Binary files a/users/migrations/__pycache__/0018_profile_image.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0019_auto_20191128_1853.cpython-38.pyc b/users/migrations/__pycache__/0019_auto_20191128_1853.cpython-38.pyc deleted file mode 100644 index 71c62f3..0000000 Binary files a/users/migrations/__pycache__/0019_auto_20191128_1853.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0020_auto_20191128_2029.cpython-38.pyc b/users/migrations/__pycache__/0020_auto_20191128_2029.cpython-38.pyc deleted file mode 100644 index d514cdb..0000000 Binary files a/users/migrations/__pycache__/0020_auto_20191128_2029.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0021_auto_20191128_2252.cpython-38.pyc b/users/migrations/__pycache__/0021_auto_20191128_2252.cpython-38.pyc deleted file mode 100644 index b2d9b6b..0000000 Binary files a/users/migrations/__pycache__/0021_auto_20191128_2252.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0022_auto_20191130_2358.cpython-38.pyc b/users/migrations/__pycache__/0022_auto_20191130_2358.cpython-38.pyc deleted file mode 100644 index a503455..0000000 Binary files a/users/migrations/__pycache__/0022_auto_20191130_2358.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0023_auto_20191201_1118.cpython-38.pyc b/users/migrations/__pycache__/0023_auto_20191201_1118.cpython-38.pyc deleted file mode 100644 index e412999..0000000 Binary files a/users/migrations/__pycache__/0023_auto_20191201_1118.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0024_auto_20191201_1130.cpython-38.pyc b/users/migrations/__pycache__/0024_auto_20191201_1130.cpython-38.pyc deleted file mode 100644 index 4bff923..0000000 Binary files a/users/migrations/__pycache__/0024_auto_20191201_1130.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0025_auto_20191201_1150.cpython-38.pyc b/users/migrations/__pycache__/0025_auto_20191201_1150.cpython-38.pyc deleted file mode 100644 index 82a31b1..0000000 Binary files a/users/migrations/__pycache__/0025_auto_20191201_1150.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0026_profile_perms.cpython-38.pyc b/users/migrations/__pycache__/0026_profile_perms.cpython-38.pyc deleted file mode 100644 index d9d654d..0000000 Binary files a/users/migrations/__pycache__/0026_profile_perms.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0027_remove_profile_perms.cpython-38.pyc b/users/migrations/__pycache__/0027_remove_profile_perms.cpython-38.pyc deleted file mode 100644 index fdfd67d..0000000 Binary files a/users/migrations/__pycache__/0027_remove_profile_perms.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0028_delete_userspermission.cpython-38.pyc b/users/migrations/__pycache__/0028_delete_userspermission.cpython-38.pyc deleted file mode 100644 index 135458d..0000000 Binary files a/users/migrations/__pycache__/0028_delete_userspermission.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0029_profile_tt.cpython-38.pyc b/users/migrations/__pycache__/0029_profile_tt.cpython-38.pyc deleted file mode 100644 index 7de3871..0000000 Binary files a/users/migrations/__pycache__/0029_profile_tt.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0030_remove_profile_tt.cpython-38.pyc b/users/migrations/__pycache__/0030_remove_profile_tt.cpython-38.pyc deleted file mode 100644 index 980f375..0000000 Binary files a/users/migrations/__pycache__/0030_remove_profile_tt.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0031_auto_20191201_1205.cpython-38.pyc b/users/migrations/__pycache__/0031_auto_20191201_1205.cpython-38.pyc deleted file mode 100644 index cf2d98d..0000000 Binary files a/users/migrations/__pycache__/0031_auto_20191201_1205.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0032_auto_20191201_1217.cpython-38.pyc b/users/migrations/__pycache__/0032_auto_20191201_1217.cpython-38.pyc deleted file mode 100644 index b9e3488..0000000 Binary files a/users/migrations/__pycache__/0032_auto_20191201_1217.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0033_userspermission.cpython-38.pyc b/users/migrations/__pycache__/0033_userspermission.cpython-38.pyc deleted file mode 100644 index 507b6d5..0000000 Binary files a/users/migrations/__pycache__/0033_userspermission.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0034_auto_20191201_1234.cpython-38.pyc b/users/migrations/__pycache__/0034_auto_20191201_1234.cpython-38.pyc deleted file mode 100644 index 8c1cd5b..0000000 Binary files a/users/migrations/__pycache__/0034_auto_20191201_1234.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0035_auto_20191201_1307.cpython-38.pyc b/users/migrations/__pycache__/0035_auto_20191201_1307.cpython-38.pyc deleted file mode 100644 index f17347f..0000000 Binary files a/users/migrations/__pycache__/0035_auto_20191201_1307.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0036_auto_20191201_1308.cpython-38.pyc b/users/migrations/__pycache__/0036_auto_20191201_1308.cpython-38.pyc deleted file mode 100644 index c0fcf18..0000000 Binary files a/users/migrations/__pycache__/0036_auto_20191201_1308.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0037_auto_20191201_1555.cpython-38.pyc b/users/migrations/__pycache__/0037_auto_20191201_1555.cpython-38.pyc deleted file mode 100644 index 68fe1e1..0000000 Binary files a/users/migrations/__pycache__/0037_auto_20191201_1555.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/0038_auto_20191202_1757.cpython-38.pyc b/users/migrations/__pycache__/0038_auto_20191202_1757.cpython-38.pyc deleted file mode 100644 index 90dd9e9..0000000 Binary files a/users/migrations/__pycache__/0038_auto_20191202_1757.cpython-38.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/__init__.cpython-37.pyc b/users/migrations/__pycache__/__init__.cpython-37.pyc deleted file mode 100644 index c38abe3..0000000 Binary files a/users/migrations/__pycache__/__init__.cpython-37.pyc and /dev/null differ diff --git a/users/migrations/__pycache__/__init__.cpython-38.pyc b/users/migrations/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index d799506..0000000 Binary files a/users/migrations/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/users/templates/users/users_areatasks.html b/users/templates/users/users_areatasks.html new file mode 100644 index 0000000..51936aa --- /dev/null +++ b/users/templates/users/users_areatasks.html @@ -0,0 +1,17 @@ +{% extends "users/base.html" %} +{% load crispy_forms_tags %} +{% block content %} +
+

Bereiche und Aufgaben von {{ user_first_name }} {{ user_last_name }} bearbeiten

+
+
+ {% for key in finaldata %} + {{key}} + {% endfor %} +
+ Speichern + Abbrechen +
+ +{% endblock content %} + diff --git a/users/templates/users/users_management.html b/users/templates/users/users_management.html index db914b8..aa1f18f 100644 --- a/users/templates/users/users_management.html +++ b/users/templates/users/users_management.html @@ -50,7 +50,7 @@
Rechte - Zuständigkeitenn + Zuständigkeitenn {% if item != request.user %}
Löschen diff --git a/users/urls.py b/users/urls.py index d8f4d51..b7a5def 100644 --- a/users/urls.py +++ b/users/urls.py @@ -25,6 +25,7 @@ urlpatterns = [ path('agencyinfo//', permission_required('users.agency_change')(AgencyUpdateView.as_view()), name='agency-manage'), path('usersman//prio', views.UsersPrio, name='users-prio'), path('prioupdate/', views.UsersPrioUpdate, name="users-prioupdate"), + path('areataskupdate//', views.UsersAreaTaskUpdate, name="users-areataskupdate"), path('globalsearch/', views.GlobalSearch, name="globalsearch"), path('standardrout/', views.searchStandardRouter, name="standardrouter") ] diff --git a/users/views.py b/users/views.py index 120def8..2c3e141 100644 --- a/users/views.py +++ b/users/views.py @@ -18,6 +18,7 @@ from standards.models import Standards from datetime import datetime from django.utils import formats from news.models import News +import json ''' DASHBOARD-View @@ -324,4 +325,45 @@ def searchStandardRouter(request): else: return redirect('dashboard') - \ No newline at end of file + +def UsersAreaTaskUpdate(request, pk): + + user = User.objects.get(pk=pk) + + finaldata = {} + + if(user.profile.agency.pk != request.user.profile.agency.pk): + return HttpResponseRedirect('users-dashboard') + else: + areas = list(Areas.objects.filter(agency__pk=request.user.profile.agency.pk)) + tasks = list(Tasks.objects.filter(agency__pk=request.user.profile.agency.pk)) + + # Build final JSON-Form-Input + # User in area/task 1, User NOT in area/task 0 + for area in areas: + finaldata.update({'areapk': area.pk, 'areaname' : area.name, 'areauserstat' : 0, 'tasks' : {}}) + if(user in area.usersfield.all()): + print(finaldata['areapk']) + # finaldata['areapk'][len(finaldata)]['areauserstat'] = 1 + #for task in tasks: + # if(task.area == area): + # finaldata['areapk'][len(finaldata)]['tasks'].update({task.pk : {}}) + # finaldata['areapk'][len(finaldata)]['tasks'][task.pk].update({'taskname' : task.name, 'userstat' : 0}) + # if(user in task.usersfield.all()): + # finaldata['areapk'][len(finaldata)]['tasks'][task.pk]['userstat'] = 1 + + print(finaldata) + + user_first_name = user.first_name + user_last_name = user.last_name + user_id = user.pk + context = { + 'active_link' : '', + 'finaldata' : finaldata, + 'user_first_name' : user_first_name, + 'user_last_name' : user_last_name, + 'user_id' : user_id + } + + return render(request, 'users/users_areatasks.html', context) +