From b6c7df541f64464ac51847ca9c14953f63aa7c73 Mon Sep 17 00:00:00 2001 From: Benni Baermann Date: Tue, 4 May 2021 10:44:00 +0200 Subject: [PATCH] some fields changed/removed, "Weiter" is "Abschicken" in last step now --- TODO | 2 ++ eva/settings_development.py | 2 +- evapp/forms.py | 2 +- evapp/migrations/0014_auto_20210504_0842.py | 38 +++++++++++++++++++++ evapp/models.py | 6 ++-- evapp/templates/evapp/employee_form.html | 6 +++- 6 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 evapp/migrations/0014_auto_20210504_0842.py diff --git a/TODO b/TODO index d3e74b2..fd2a992 100644 --- a/TODO +++ b/TODO @@ -3,3 +3,5 @@ - in mail ändern "Deine mailadresse" in "ansprechpartner_in" - true/false übersetzen in dataloop + +- automatic generation of MA mail diff --git a/eva/settings_development.py b/eva/settings_development.py index fd2ba07..a18436b 100644 --- a/eva/settings_development.py +++ b/eva/settings_development.py @@ -25,7 +25,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' SECRET_KEY = 'g%+i6+gkwt3zz@+k-5x1dtstuw4)&qd$lxd^bt2oswy5e1#dul' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True # send mails only to debug mode adress even if in production MAILTEST = True diff --git a/evapp/forms.py b/evapp/forms.py index 6fc3a0f..46aae25 100644 --- a/evapp/forms.py +++ b/evapp/forms.py @@ -50,7 +50,7 @@ class ITForm(EvaForm): class Meta: model = Employee fields = [ - 'laptop', 'vendor', 'os', 'screen', 'mobile', 'sim', 'sim2', 'landline', 'comment', + 'laptop', 'vendor', 'os', 'screen', 'mobile', 'sim', 'landline', 'comment', 'language', 'accounts', 'lists', 'rebu2go' ] class OfficeForm(EvaForm): diff --git a/evapp/migrations/0014_auto_20210504_0842.py b/evapp/migrations/0014_auto_20210504_0842.py new file mode 100644 index 0000000..b582d2b --- /dev/null +++ b/evapp/migrations/0014_auto_20210504_0842.py @@ -0,0 +1,38 @@ +# 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/models.py b/evapp/models.py index a86c75e..553eec1 100644 --- a/evapp/models.py +++ b/evapp/models.py @@ -64,12 +64,12 @@ class Employee(models.Model): # IT related stuff laptop = models.CharField(max_length=2, choices=LAPTOP_CHOICES.items(), default='14') - vendor = models.CharField(max_length=8, choices=VENDOR_CHOICES.items(), default='STANDARD') + vendor = models.CharField(max_length=8, choices=VENDOR_CHOICES.items(), default='STANDARD', verbose_name='Hersteller') os = models.CharField(max_length=3, choices=OS_CHOICES.items(), default='UBU') screen = models.BooleanField(default=False, verbose_name='Zusätzlicher Monitor? Einer ist standard.') - mobile = models.BooleanField(max_length=6, default=False) + mobile = models.BooleanField(max_length=6, default=False, verbose_name='Handy benötigt?') sim = models.BooleanField(default=False, verbose_name="Mobilfunkvertrag") - sim2 = models.BooleanField(default=False, verbose_name="Zweite Sim (für Laptop zB)") # do we still need this? + # sim2 = models.BooleanField(default=False, verbose_name="Zweite Sim (für Laptop zB)") # do we still need this? landline = models.BooleanField(default=True, verbose_name="Festnetztelefon") # do we still need this? # TODO: tastaturlayout DE/US comment = models.TextField(max_length=500, null=True, blank=True, verbose_name="zusätzliche IT-Anforderungen") diff --git a/evapp/templates/evapp/employee_form.html b/evapp/templates/evapp/employee_form.html index 9b02e6a..1970fe8 100644 --- a/evapp/templates/evapp/employee_form.html +++ b/evapp/templates/evapp/employee_form.html @@ -82,7 +82,11 @@ {% if wizard.steps.prev %} {% endif %} - + {% if datatable == True %} + + {% else %} + + {% endif %}