some fields changed/removed, "Weiter" is "Abschicken" in last step now
This commit is contained in:
parent
2de30fdd1b
commit
b6c7df541f
2
TODO
2
TODO
|
@ -3,3 +3,5 @@
|
||||||
- in mail ändern "Deine mailadresse" in "ansprechpartner_in"
|
- in mail ändern "Deine mailadresse" in "ansprechpartner_in"
|
||||||
|
|
||||||
- true/false übersetzen in dataloop
|
- true/false übersetzen in dataloop
|
||||||
|
|
||||||
|
- automatic generation of MA mail
|
||||||
|
|
|
@ -25,7 +25,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
|
||||||
SECRET_KEY = 'g%+i6+gkwt3zz@+k-5x1dtstuw4)&qd$lxd^bt2oswy5e1#dul'
|
SECRET_KEY = 'g%+i6+gkwt3zz@+k-5x1dtstuw4)&qd$lxd^bt2oswy5e1#dul'
|
||||||
|
|
||||||
# SECURITY WARNING: don't run with debug turned on in production!
|
# 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
|
# send mails only to debug mode adress even if in production
|
||||||
MAILTEST = True
|
MAILTEST = True
|
||||||
|
|
|
@ -50,7 +50,7 @@ class ITForm(EvaForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Employee
|
model = Employee
|
||||||
fields = [
|
fields = [
|
||||||
'laptop', 'vendor', 'os', 'screen', 'mobile', 'sim', 'sim2', 'landline', 'comment',
|
'laptop', 'vendor', 'os', 'screen', 'mobile', 'sim', 'landline', 'comment',
|
||||||
'language', 'accounts', 'lists', 'rebu2go' ]
|
'language', 'accounts', 'lists', 'rebu2go' ]
|
||||||
|
|
||||||
class OfficeForm(EvaForm):
|
class OfficeForm(EvaForm):
|
||||||
|
|
|
@ -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'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -64,12 +64,12 @@ class Employee(models.Model):
|
||||||
|
|
||||||
# IT related stuff
|
# IT related stuff
|
||||||
laptop = models.CharField(max_length=2, choices=LAPTOP_CHOICES.items(), default='14')
|
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')
|
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.')
|
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")
|
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?
|
landline = models.BooleanField(default=True, verbose_name="Festnetztelefon") # do we still need this?
|
||||||
# TODO: tastaturlayout DE/US
|
# TODO: tastaturlayout DE/US
|
||||||
comment = models.TextField(max_length=500, null=True, blank=True, verbose_name="zusätzliche IT-Anforderungen")
|
comment = models.TextField(max_length=500, null=True, blank=True, verbose_name="zusätzliche IT-Anforderungen")
|
||||||
|
|
|
@ -82,7 +82,11 @@
|
||||||
{% if wizard.steps.prev %}
|
{% if wizard.steps.prev %}
|
||||||
<button formnovalidate="formnovalidate" name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}">Zurück</button>
|
<button formnovalidate="formnovalidate" name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}">Zurück</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if datatable == True %}
|
||||||
|
<button type="submit" value="{% trans "Weiter" %}">Abschicken</button>
|
||||||
|
{% else %}
|
||||||
<button type="submit" value="{% trans "Weiter" %}">Weiter</button>
|
<button type="submit" value="{% trans "Weiter" %}">Weiter</button>
|
||||||
|
{% endif %}
|
||||||
</form>
|
</form>
|
||||||
<p>
|
<p>
|
||||||
</center>
|
</center>
|
||||||
|
|
Loading…
Reference in New Issue