diff --git a/evapp/migrations/0001_initial.py b/evapp/migrations/0001_initial.py index 6bba78b..74206eb 100644 --- a/evapp/migrations/0001_initial.py +++ b/evapp/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.4 on 2020-12-23 12:14 +# Generated by Django 3.1.4 on 2021-09-13 12:41 from django.db import migrations, models import multiselectfield.db.fields @@ -18,23 +18,27 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('firstname', models.CharField(max_length=50, verbose_name='Vorname')), ('lastname', models.CharField(max_length=50, verbose_name='Nachname')), - ('email', models.CharField(max_length=50, verbose_name='E-Mail-Adresse')), - ('department', models.CharField(choices=[('PROG', 'Programme'), ('SOFT', 'Softwareentwicklung'), ('CENT', 'Central'), ('VOR', 'Vorstand')], max_length=5)), + ('department', models.CharField(choices=[('PROG', 'Programme'), ('SOFT', 'Softwareentwicklung'), ('CENT', 'Central'), ('VOR', 'Vorstand')], max_length=5, verbose_name='Bereich')), ('team', models.CharField(blank=True, max_length=20, null=True)), - ('firstdate_employment', models.DateField(null=True, verbose_name='erster Arbeitstag')), - ('firstdate_presence', models.DateField(null=True, verbose_name='erster Tag der Anwesenheit in der Geschäftsstelle')), - ('jobdescription_german', models.CharField(max_length=100, null=True, verbose_name='Stellenbeschreibung(deutsch)')), - ('jobdescription_english', models.CharField(max_length=100, null=True, verbose_name='job description(english)')), - ('desk', models.CharField(max_length=100, null=True, verbose_name='Wo soll der Arbeitsplatz sein?')), - ('laptop', models.CharField(choices=[('14', '14", unser Standardgerät'), ('12', '12,5", geeignet für Vielreisende')], default='14', max_length=2)), - ('os', models.CharField(choices=[('UBU', 'Ubuntu (Standard)'), ('WIN', 'Windows (bitte Begründung angeben)')], default='UBU', max_length=3)), - ('screen', models.BooleanField(default=False, verbose_name='zusätzlicher Monitor? Einer ist standard.')), - ('mobile', models.CharField(default='NO', max_length=6)), - ('landline', models.BooleanField(default=True, verbose_name='Festnetztelefon')), + ('firstdate_employment', models.DateField(null=True, verbose_name='Erster Arbeitstag')), + ('firstdate_presence', models.DateField(null=True, verbose_name='Erster Tag der Anwesenheit in der Geschäftsstelle')), + ('jobdescription_german', models.CharField(max_length=100, null=True, verbose_name='Stellenbezeichnung(deutsch)')), + ('jobdescription_english', models.CharField(max_length=100, null=True, verbose_name='Job description(english)')), + ('remote', models.BooleanField(default=True, verbose_name='Braucht Arbeitsplatz in der Geschäftsstelle?')), + ('desk', models.CharField(blank=True, max_length=100, null=True, verbose_name='Wo soll der Arbeitsplatz sein?')), + ('vendor', models.CharField(choices=[('STANDARD', 'Dell Latitude'), ('LENOVO', 'Lenovo Thinkpad'), ('MAC', 'Mac (nur für Grafiker_innen)')], default='STANDARD', max_length=8, verbose_name='Hersteller')), + ('os', models.CharField(choices=[('UBU', 'Ubuntu (Standard)'), ('WIN', 'Windows (bitte Begründung angeben)'), ('MOS', 'Mac OS (nur wenn Mac gewählt)')], default='UBU', max_length=3, verbose_name='Betriebssystem')), + ('screen', models.BooleanField(default=False, verbose_name='Zusätzlicher Monitor? Einer ist standard.')), + ('mobile', models.BooleanField(default=False, max_length=6, verbose_name='Diensttelefon (Handy)')), + ('keyboard', models.CharField(choices=[('DE', 'Deutsch'), ('US', 'USA'), ('OT', 'Anderes (Bitte unten angeben)')], default='DE', max_length=2, verbose_name='Tastaturlayout')), ('comment', models.TextField(blank=True, max_length=500, null=True, verbose_name='zusätzliche IT-Anforderungen')), - ('language', models.CharField(choices=[('GER', 'deutsch'), ('ENG', 'english')], default='GER', max_length=3)), - ('accounts', multiselectfield.db.fields.MultiSelectField(choices=[('OTRSWMDE', 'OTRS (WMDE)'), ('OTRSFUND', 'OTRS (Fundraising)'), ('CIVIC1', 'Civic CRM (allgemein)'), ('CIVIC2', 'Civic CRM (Mailings, impliziert allgemein)'), ('FUND', 'Fundraising Netzlaufwerk'), ('WEB', 'www.wikimedia.de (edit)'), ('BLOG', 'blog.wikimedia.de (edit)'), ('FORUM', 'forum.wikimedia.de')], max_length=51, null=True)), - ('lists', models.CharField(max_length=100, null=True)), + ('language', models.CharField(choices=[('GER', 'Deutsch'), ('ENG', 'English')], default='GER', max_length=3, verbose_name='Sprache')), + ('accounts', multiselectfield.db.fields.MultiSelectField(blank=True, choices=[('OTRSWMDE', 'OTRS Ticketsystem'), ('CIVIC1', 'Civic CRM (allgemein)'), ('CIVIC2', 'Civic CRM (Mailings, impliziert allgemein)'), ('WEB', 'www.wikimedia.de (edit)'), ('BLOG', 'blog.wikimedia.de (edit)'), ('FORUM', 'forum.wikimedia.de')], max_length=37, null=True, verbose_name='Zusätzliche Accounts')), + ('lists', models.CharField(blank=True, max_length=100, null=True, verbose_name='Zusätzliche Mailinglisten')), + ('rebu2go', models.BooleanField(default=False, verbose_name='Rebu2Go-Zugang benötigt?')), + ('transponder', models.CharField(choices=[('NORM', 'Allgemeiner Transponder'), ('SPECIAL', 'Besondere Schließungen (bitte angeben)'), ('NOTRANS', 'Kein Transponder')], default='NORM', max_length=7)), + ('special', models.TextField(blank=True, max_length=500, null=True, verbose_name='Besondere Schließungen hier eintragen')), + ('post_office_box', models.BooleanField(default=True, verbose_name='Postfach am Empfang benötigt?')), ], ), ] diff --git a/evapp/migrations/0002_auto_20201223_1223.py b/evapp/migrations/0002_auto_20201223_1223.py deleted file mode 100644 index fa838bf..0000000 --- a/evapp/migrations/0002_auto_20201223_1223.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.1.4 on 2020-12-23 12:23 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='employee', - name='post_office_box', - field=models.BooleanField(default=True, verbose_name='Postfach am Empfang benötigt?'), - ), - migrations.AddField( - model_name='employee', - name='transponder', - field=models.CharField(choices=[('NORM', 'allgemeiner Transponder'), ('SPECIAL', 'besondere Schließungen (bitte angeben)'), ('NO', 'Kein Transponder')], default='NORM', max_length=7), - ), - ] diff --git a/evapp/migrations/0003_auto_20210114_1357.py b/evapp/migrations/0003_auto_20210114_1357.py deleted file mode 100644 index 8f1fef2..0000000 --- a/evapp/migrations/0003_auto_20210114_1357.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.4 on 2021-01-14 13:57 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0002_auto_20201223_1223'), - ] - - operations = [ - migrations.AlterField( - model_name='employee', - name='transponder', - field=models.CharField(choices=[('NORM', 'allgemeiner Transponder'), ('SPECIAL', 'besondere Schließungen (bitte angeben)'), ('NOTRANS', 'Kein Transponder')], default='NORM', max_length=7), - ), - ] diff --git a/evapp/migrations/0004_employee_intern.py b/evapp/migrations/0004_employee_intern.py deleted file mode 100644 index 5a233eb..0000000 --- a/evapp/migrations/0004_employee_intern.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.4 on 2021-02-08 11:19 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0003_auto_20210114_1357'), - ] - - operations = [ - migrations.AddField( - model_name='employee', - name='intern', - field=models.BooleanField(default=True, verbose_name='Interne_r Mitarbeiter_in?'), - ), - ] diff --git a/evapp/migrations/0005_employee_vendor.py b/evapp/migrations/0005_employee_vendor.py deleted file mode 100644 index 1baf85d..0000000 --- a/evapp/migrations/0005_employee_vendor.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.4 on 2021-02-08 13:45 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0004_employee_intern'), - ] - - operations = [ - migrations.AddField( - model_name='employee', - name='vendor', - field=models.CharField(choices=[('STANDARD', 'Dell Latitude'), ('LENOVO', 'Lenovo Thinkpad'), ('MAC', 'Mac (nur in Ausnahmefällen)')], default='STANDARD', max_length=8), - ), - ] diff --git a/evapp/migrations/0006_auto_20210209_0939.py b/evapp/migrations/0006_auto_20210209_0939.py deleted file mode 100644 index b67fc93..0000000 --- a/evapp/migrations/0006_auto_20210209_0939.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 3.1.4 on 2021-02-09 09:39 - -from django.db import migrations, models -import multiselectfield.db.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0005_employee_vendor'), - ] - - operations = [ - migrations.AddField( - model_name='employee', - name='rebu2go', - field=models.BooleanField(default=False, verbose_name='Rebu2Go-Zugang benötigt?'), - ), - migrations.AlterField( - model_name='employee', - name='accounts', - field=multiselectfield.db.fields.MultiSelectField(choices=[('OTRSWMDE', 'OTRS Ticketsystem'), ('CIVIC1', 'Civic CRM (allgemein)'), ('CIVIC2', 'Civic CRM (Mailings, impliziert allgemein)'), ('ZEDA', 'Zeda Nextcloud'), ('WEB', 'www.wikimedia.de (edit)'), ('BLOG', 'blog.wikimedia.de (edit)'), ('FORUM', 'forum.wikimedia.de')], max_length=42, null=True), - ), - ] diff --git a/evapp/migrations/0007_auto_20210209_1146.py b/evapp/migrations/0007_auto_20210209_1146.py deleted file mode 100644 index 20b526c..0000000 --- a/evapp/migrations/0007_auto_20210209_1146.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.1.4 on 2021-02-09 11:46 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0006_auto_20210209_0939'), - ] - - operations = [ - migrations.AddField( - model_name='employee', - name='remote', - field=models.BooleanField(default=False, verbose_name='Braucht keinen Arbeitsplatz weil Home-Office'), - ), - migrations.AlterField( - model_name='employee', - name='desk', - field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Wo soll der Arbeitsplatz sein?'), - ), - ] diff --git a/evapp/migrations/0008_auto_20210301_1053.py b/evapp/migrations/0008_auto_20210301_1053.py deleted file mode 100644 index 6200290..0000000 --- a/evapp/migrations/0008_auto_20210301_1053.py +++ /dev/null @@ -1,53 +0,0 @@ -# Generated by Django 3.1.4 on 2021-03-01 10:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0007_auto_20210209_1146'), - ] - - operations = [ - migrations.AddField( - model_name='employee', - name='special', - field=models.TextField(blank=True, max_length=500, null=True, verbose_name='Besondere Schließungen hier eintragen'), - ), - migrations.AlterField( - model_name='employee', - name='firstdate_employment', - field=models.DateField(null=True, verbose_name='Erster Arbeitstag'), - ), - migrations.AlterField( - model_name='employee', - name='firstdate_presence', - field=models.DateField(null=True, verbose_name='Erster Tag der Anwesenheit in der Geschäftsstelle'), - ), - migrations.AlterField( - model_name='employee', - name='jobdescription_english', - field=models.CharField(max_length=100, null=True, verbose_name='Job description(english)'), - ), - migrations.AlterField( - model_name='employee', - name='language', - field=models.CharField(choices=[('GER', 'Deutsch'), ('ENG', 'English')], default='GER', max_length=3), - ), - migrations.AlterField( - model_name='employee', - name='laptop', - field=models.CharField(choices=[('14', '14", uUser Standardgerät'), ('12', '12,5", Geeignet für Vielreisende')], default='14', max_length=2), - ), - migrations.AlterField( - model_name='employee', - name='screen', - field=models.BooleanField(default=False, verbose_name='Zusätzlicher Monitor? Einer ist standard.'), - ), - migrations.AlterField( - model_name='employee', - name='transponder', - field=models.CharField(choices=[('NORM', 'Allgemeiner Transponder'), ('SPECIAL', 'Besondere Schließungen (bitte angeben)'), ('NOTRANS', 'Kein Transponder')], default='NORM', max_length=7), - ), - ] diff --git a/evapp/migrations/0009_auto_20210303_1115.py b/evapp/migrations/0009_auto_20210303_1115.py deleted file mode 100644 index 785ab04..0000000 --- a/evapp/migrations/0009_auto_20210303_1115.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.1.4 on 2021-03-03 11:15 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0008_auto_20210301_1053'), - ] - - operations = [ - migrations.AlterField( - model_name='employee', - name='email', - field=models.EmailField(max_length=50, verbose_name='E-Mail-Adresse'), - ), - migrations.AlterField( - model_name='employee', - name='laptop', - field=models.CharField(choices=[('14', '14", Unser Standardgerät'), ('12', '12,5", Geeignet für Vielreisende')], default='14', max_length=2), - ), - ] diff --git a/evapp/migrations/0009_auto_20210315_1408.py b/evapp/migrations/0009_auto_20210315_1408.py deleted file mode 100644 index d1c8c32..0000000 --- a/evapp/migrations/0009_auto_20210315_1408.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.1.4 on 2021-03-15 14:08 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0008_auto_20210301_1053'), - ] - - operations = [ - migrations.AddField( - model_name='employee', - name='usermail', - field=models.EmailField(default='bestechefin@wikimedia.de', max_length=50, verbose_name='Deine Mailadresse'), - ), - migrations.AlterField( - model_name='employee', - name='email', - field=models.EmailField(max_length=50, verbose_name='E-Mail-Adresse ders Mitarbeitenden'), - ), - migrations.AlterField( - model_name='employee', - name='laptop', - field=models.CharField(choices=[('14', '14", Unser Standardgerät'), ('12', '12,5", Geeignet für Vielreisende')], default='14', max_length=2), - ), - ] diff --git a/evapp/migrations/0010_auto_20210325_0813.py b/evapp/migrations/0010_auto_20210325_0813.py deleted file mode 100644 index c0f7580..0000000 --- a/evapp/migrations/0010_auto_20210325_0813.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.4 on 2021-03-25 08:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0009_auto_20210315_1408'), - ] - - operations = [ - migrations.AlterField( - model_name='employee', - name='jobdescription_german', - field=models.CharField(max_length=100, null=True, verbose_name='Stellenbezeichnung(deutsch)'), - ), - ] diff --git a/evapp/migrations/0011_auto_20210329_1254.py b/evapp/migrations/0011_auto_20210329_1254.py deleted file mode 100644 index d41d516..0000000 --- a/evapp/migrations/0011_auto_20210329_1254.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.1.4 on 2021-03-29 12:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0010_auto_20210325_0813'), - ] - - operations = [ - migrations.AddField( - model_name='employee', - name='sim', - field=models.BooleanField(default=False, verbose_name='Mobilfunkvertrag'), - ), - migrations.AddField( - model_name='employee', - name='sim2', - field=models.BooleanField(default=False, verbose_name='Zweite Sim (für Laptop zB)'), - ), - ] diff --git a/evapp/migrations/0012_employee_bvg.py b/evapp/migrations/0012_employee_bvg.py deleted file mode 100644 index 320a45e..0000000 --- a/evapp/migrations/0012_employee_bvg.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.4 on 2021-03-30 08:25 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0011_auto_20210329_1254'), - ] - - operations = [ - migrations.AddField( - model_name='employee', - name='bvg', - field=models.BooleanField(default=True, verbose_name='Bekommt eine BVG-Karte, weil in Berlin tätig'), - ), - ] diff --git a/evapp/migrations/0013_remove_employee_bvg.py b/evapp/migrations/0013_remove_employee_bvg.py deleted file mode 100644 index afa3126..0000000 --- a/evapp/migrations/0013_remove_employee_bvg.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.1.4 on 2021-04-01 08:30 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0012_employee_bvg'), - ] - - operations = [ - migrations.RemoveField( - model_name='employee', - name='bvg', - ), - ] diff --git a/evapp/migrations/0014_auto_20210504_0842.py b/evapp/migrations/0014_auto_20210504_0842.py deleted file mode 100644 index b582d2b..0000000 --- a/evapp/migrations/0014_auto_20210504_0842.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 3.1.4 on 2021-05-04 08:42 - -from django.db import migrations, models -import multiselectfield.db.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0013_remove_employee_bvg'), - ] - - operations = [ - migrations.RemoveField( - model_name='employee', - name='sim2', - ), - migrations.AlterField( - model_name='employee', - name='accounts', - field=multiselectfield.db.fields.MultiSelectField(blank=True, choices=[('OTRSWMDE', 'OTRS Ticketsystem'), ('CIVIC1', 'Civic CRM (allgemein)'), ('CIVIC2', 'Civic CRM (Mailings, impliziert allgemein)'), ('WEB', 'www.wikimedia.de (edit)'), ('BLOG', 'blog.wikimedia.de (edit)'), ('FORUM', 'forum.wikimedia.de')], max_length=37, null=True, verbose_name='Zusätzliche Accounts'), - ), - migrations.AlterField( - model_name='employee', - name='lists', - field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Zusätzliche Mailinglisten'), - ), - migrations.AlterField( - model_name='employee', - name='mobile', - field=models.BooleanField(default=False, max_length=6, verbose_name='Handy benötigt?'), - ), - migrations.AlterField( - model_name='employee', - name='vendor', - field=models.CharField(choices=[('STANDARD', 'Dell Latitude'), ('LENOVO', 'Lenovo Thinkpad'), ('MAC', 'Mac (nur in Ausnahmefällen)')], default='STANDARD', max_length=8, verbose_name='Hersteller'), - ), - ] diff --git a/evapp/migrations/0015_remove_employee_email.py b/evapp/migrations/0015_remove_employee_email.py deleted file mode 100644 index 8fcf23f..0000000 --- a/evapp/migrations/0015_remove_employee_email.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.1.4 on 2021-05-04 09:43 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0014_auto_20210504_0842'), - ] - - operations = [ - migrations.RemoveField( - model_name='employee', - name='email', - ), - ] diff --git a/evapp/migrations/0016_auto_20210504_1040.py b/evapp/migrations/0016_auto_20210504_1040.py deleted file mode 100644 index 5005c9d..0000000 --- a/evapp/migrations/0016_auto_20210504_1040.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 3.1.4 on 2021-05-04 10:40 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0015_remove_employee_email'), - ] - - operations = [ - migrations.RemoveField( - model_name='employee', - name='landline', - ), - migrations.AddField( - model_name='employee', - name='keyboard', - field=models.CharField(choices=[('DE', 'Deutsch'), ('US', 'USA'), ('OT', 'Anderes (Bitte unten angeben)')], default='DE', max_length=2, verbose_name='Tastaturlayout'), - ), - migrations.AlterField( - model_name='employee', - name='department', - field=models.CharField(choices=[('PROG', 'Programme'), ('SOFT', 'Softwareentwicklung'), ('CENT', 'Central'), ('VOR', 'Vorstand')], max_length=5, verbose_name='Bereich'), - ), - ] diff --git a/evapp/migrations/0017_auto_20210504_1224.py b/evapp/migrations/0017_auto_20210504_1224.py deleted file mode 100644 index d5d96f9..0000000 --- a/evapp/migrations/0017_auto_20210504_1224.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.4 on 2021-05-04 12:24 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0016_auto_20210504_1040'), - ] - - operations = [ - migrations.AlterField( - model_name='employee', - name='os', - field=models.CharField(choices=[('UBU', 'Ubuntu (Standard)'), ('WIN', 'Windows (bitte Begründung angeben)')], default='UBU', max_length=3, verbose_name='Betriebssystem'), - ), - ] diff --git a/evapp/migrations/0018_auto_20210504_1251.py b/evapp/migrations/0018_auto_20210504_1251.py deleted file mode 100644 index 649fc17..0000000 --- a/evapp/migrations/0018_auto_20210504_1251.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.4 on 2021-05-04 12:51 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0017_auto_20210504_1224'), - ] - - operations = [ - migrations.AlterField( - model_name='employee', - name='usermail', - field=models.EmailField(default='bestechefin@wikimedia.de', max_length=50, verbose_name='Deine Mailadresse (Ansprechpartner_in)'), - ), - ] diff --git a/evapp/migrations/0019_auto_20210504_1333.py b/evapp/migrations/0019_auto_20210504_1333.py deleted file mode 100644 index ad316d2..0000000 --- a/evapp/migrations/0019_auto_20210504_1333.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.1.4 on 2021-05-04 13:33 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0018_auto_20210504_1251'), - ] - - operations = [ - migrations.RemoveField( - model_name='employee', - name='laptop', - ), - migrations.AlterField( - model_name='employee', - name='vendor', - field=models.CharField(choices=[('STANDARD', 'Dell Latitude'), ('LENOVO', 'Lenovo Thinkpad'), ('MAC', 'Mac (nur für Grafiker_innen)')], default='STANDARD', max_length=8, verbose_name='Hersteller'), - ), - ] diff --git a/evapp/migrations/0020_merge_20210511_1102.py b/evapp/migrations/0020_merge_20210511_1102.py deleted file mode 100644 index 77a8b3d..0000000 --- a/evapp/migrations/0020_merge_20210511_1102.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.1.6 on 2021-05-11 11:02 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0019_auto_20210504_1333'), - ('evapp', '0009_auto_20210303_1115'), - ] - - operations = [ - ] diff --git a/evapp/migrations/0020_merge_20210517_0937.py b/evapp/migrations/0020_merge_20210517_0937.py deleted file mode 100644 index 6e84158..0000000 --- a/evapp/migrations/0020_merge_20210517_0937.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.1.4 on 2021-05-17 09:37 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0019_auto_20210504_1333'), - ('evapp', '0009_auto_20210303_1115'), - ] - - operations = [ - ] diff --git a/evapp/migrations/0021_auto_20210517_1010.py b/evapp/migrations/0021_auto_20210517_1010.py deleted file mode 100644 index 2586b7f..0000000 --- a/evapp/migrations/0021_auto_20210517_1010.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.1.4 on 2021-05-17 10:10 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0020_merge_20210517_0937'), - ] - - operations = [ - migrations.RemoveField( - model_name='employee', - name='email', - ), - migrations.RemoveField( - model_name='employee', - name='laptop', - ), - migrations.RemoveField( - model_name='employee', - name='usermail', - ), - ] diff --git a/evapp/migrations/0022_merge_20210517_1058.py b/evapp/migrations/0022_merge_20210517_1058.py deleted file mode 100644 index 476c71b..0000000 --- a/evapp/migrations/0022_merge_20210517_1058.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.1.6 on 2021-05-17 10:58 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0021_auto_20210517_1010'), - ('evapp', '0020_merge_20210511_1102'), - ] - - operations = [ - ] diff --git a/evapp/migrations/0023_auto_20210518_0856.py b/evapp/migrations/0023_auto_20210518_0856.py deleted file mode 100644 index 4147a97..0000000 --- a/evapp/migrations/0023_auto_20210518_0856.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.4 on 2021-05-18 08:56 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0022_merge_20210517_1058'), - ] - - operations = [ - migrations.AlterField( - model_name='employee', - name='os', - field=models.CharField(choices=[('UBU', 'Ubuntu (Standard)'), ('WIN', 'Windows (bitte Begründung angeben)'), ('MOS', 'Mac OS (nur wenn Mac gewählt)')], default='UBU', max_length=3, verbose_name='Betriebssystem'), - ), - ] diff --git a/evapp/migrations/0024_auto_20210526_1259.py b/evapp/migrations/0024_auto_20210526_1259.py deleted file mode 100644 index 65c9445..0000000 --- a/evapp/migrations/0024_auto_20210526_1259.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 3.1.4 on 2021-05-26 12:59 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0023_auto_20210518_0856'), - ] - - operations = [ - migrations.RemoveField( - model_name='employee', - name='intern', - ), - migrations.RemoveField( - model_name='employee', - name='sim', - ), - migrations.AlterField( - model_name='employee', - name='language', - field=models.CharField(choices=[('GER', 'Deutsch'), ('ENG', 'English')], default='GER', max_length=3, verbose_name='Sprache'), - ), - migrations.AlterField( - model_name='employee', - name='mobile', - field=models.BooleanField(default=False, max_length=6, verbose_name='Diensttelefon (Handy)'), - ), - ] diff --git a/evapp/migrations/0025_auto_20210909_0954.py b/evapp/migrations/0025_auto_20210909_0954.py deleted file mode 100644 index 294830d..0000000 --- a/evapp/migrations/0025_auto_20210909_0954.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.4 on 2021-09-09 09:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('evapp', '0024_auto_20210526_1259'), - ] - - operations = [ - migrations.AlterField( - model_name='employee', - name='remote', - field=models.BooleanField(default=True, verbose_name='Braucht Arbeitsplatz in der Geschäftsstelle?'), - ), - ] diff --git a/evapp/tests.py b/evapp/tests.py index 7ce503c..fd1a993 100644 --- a/evapp/tests.py +++ b/evapp/tests.py @@ -1,3 +1,37 @@ from django.test import TestCase +# import unittest +from django.test import Client -# Create your tests here. +from django.contrib.auth.models import User +#from django.urls import reverse + +# class LoginTestCase(unittest.TestCase): +# def setUp(self): +# self.client = Client() +# self.user = User.objects.create_user('vladimir', 'vladimir@reiherzehe.com', 'reiherzehe') +# +# def testLogin(self): +# self.client.login(username='vladimir', password='reiherzehe') +# response = self.client.get('accounts/') +# self.assertEqual(response.status_code, 200) + +class SimpleTest(TestCase): + def setUp(self): + #User.objects.create_superuser('testuser', 'nomail@nomail.com', 'testpasswd') + + # Every test needs a client. + self.client = Client() + + def test_details(self): + + # Issue a GET request. + response = self.client.get('/') + + # Check that the response is 200 OK. + self.assertEqual(response.status_code, 302) + # print(response.url) + # + response2 = self.client.get(response.url) + # # print(response2.content) + # + self.assertContains( response2, 'Bitte via Wolke einloggen:', status_code=200)