WMDE
/
eva
forked from tohe/eva
7
1
Fork 0
Code Pull Requests Activity

Compare commits

base: WMDE:master
Branches Tags
WMDE:master
WMDE:pdf_generator
WMDE:fix_mailings
WMDE:chloesBranch
WMDE:offboarding
WMDE:simpleauth
tohe:master
tohe:offboarding
tohe:simpleauth
..
compare: WMDE:fix_mailings
Branches Tags
WMDE:pdf_generator
WMDE:master
WMDE:fix_mailings
WMDE:chloesBranch
WMDE:offboarding
WMDE:simpleauth
tohe:master
tohe:offboarding
tohe:simpleauth

1 Commits
master ... fix_mailin

Author SHA1 Message Date
Marike Voßbeck 1b340405d3 changed mail to buchhaltung and for central 2026-03-11 16:47:49 +01:00
12 changed files with 4 additions and 240 deletions
Show Stats Expand all files Collapse all files

2
austritt/forms.py
View File

@ -47,7 +47,7 @@ class ITForm(EvaForm):
class RestForm(EvaForm):
class Meta:
model = Employee
fields = ['credit_card', 'transponder_id', 'bahncard', 'website', 'miscellaneous']
fields = ['credit_card', 'transponder_id', 'bahncard', 'website']
class DummyForm(ModelForm):
class Meta:

53
austritt/migrations/0012_remove_employee_lastdate_working_employee_bahncard_and_more.py
View File

@ -1,53 +0,0 @@
# Generated by Django 5.2.8 on 2026-03-03 14:36
import multiselectfield.db.fields
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('austritt', '0011_alter_employee_credit_card_alter_employee_documents_and_more'),
]
operations = [
migrations.RemoveField(
model_name='employee',
name='lastdate_working',
),
migrations.AddField(
model_name='employee',
name='bahncard',
field=models.CharField(choices=[('NEIN', 'Nein'), ('JA', 'Ja')], default='NEIN', max_length=5, verbose_name='Bahncard-Abo vorhanden?'),
),
migrations.AddField(
model_name='employee',
name='hardware',
field=multiselectfield.db.fields.MultiSelectField(blank=True, choices=[('KEYBOARD', 'Tastatur'), ('MOUSE', 'Maus'), ('MONITOR', 'Monitor'), ('HEADSET', 'Headset'), ('2FA', '2FA Stick')], max_length=40, null=True, verbose_name='Zusätzliche Hardware vorhanden?'),
),
migrations.AddField(
model_name='employee',
name='pension',
field=models.CharField(choices=[('NEIN', 'Nein'), ('JA', 'Ja')], default='NEIN', max_length=5, verbose_name='Ist betriebliche Altersvorsorge (BAV) vorhanden?'),
),
migrations.AddField(
model_name='employee',
name='website',
field=models.BooleanField(default=False, verbose_name='Müssen Dinge von der Webseite gelöscht werden?'),
),
migrations.AlterField(
model_name='employee',
name='holiday',
field=models.CharField(choices=[('NEIN', 'Nein'), ('JA', 'Ja')], max_length=5, verbose_name='Sollen restliche Urlaubstage ausgezahlt werden?'),
),
migrations.AlterField(
model_name='employee',
name='overtime',
field=models.CharField(choices=[('NEIN', 'Nein'), ('JA', 'Ja')], max_length=5, verbose_name='Sollen restliche Überstunden ausgezahlt werden?'),
),
migrations.AlterField(
model_name='employee',
name='transponder_id',
field=models.CharField(blank=True, max_length=6, verbose_name='Transponder ID (Laut Personio)'),
),
]

33
austritt/migrations/0013_alter_employee_bahncard_alter_employee_pension_and_more.py
View File

@ -1,33 +0,0 @@
# Generated by Django 5.2.8 on 2026-03-03 15:10
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('austritt', '0012_remove_employee_lastdate_working_employee_bahncard_and_more'),
]
operations = [
migrations.AlterField(
model_name='employee',
name='bahncard',
field=models.CharField(choices=[('NEIN', 'Nein'), ('JA', 'Ja')], default='NEIN', max_length=5, null=True, verbose_name='Bahncard-Abo vorhanden?'),
),
migrations.AlterField(
model_name='employee',
name='pension',
field=models.CharField(choices=[('NEIN', 'Nein'), ('JA', 'Ja')], max_length=5, verbose_name='Ist betriebliche Altersvorsorge (BAV) vorhanden?'),
),
migrations.AlterField(
model_name='employee',
name='sim',
field=models.CharField(choices=[('NEIN', 'Nein'), ('JA', 'Ja')], default='NEIN', max_length=5, null=True, verbose_name='Mobilfunkvertrag vorhanden?'),
),
migrations.AlterField(
model_name='employee',
name='website',
field=models.CharField(choices=[('NEIN', 'Nein'), ('JA', 'Ja')], default='NEIN', max_length=5, null=True, verbose_name='Müssen Dinge von der Webseite gelöscht werden?'),
),
]

18
austritt/migrations/0014_alter_employee_website.py
View File

@ -1,18 +0,0 @@
# Generated by Django 5.2.8 on 2026-03-03 15:22
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('austritt', '0013_alter_employee_bahncard_alter_employee_pension_and_more'),
]
operations = [
migrations.AlterField(
model_name='employee',
name='website',
field=models.CharField(blank=True, choices=[('NEIN', 'Nein'), ('JA', 'Ja')], default='NEIN', max_length=5, verbose_name='Müssen Dinge von der Webseite gelöscht werden?'),
),
]

28
austritt/migrations/0015_alter_employee_bahncard_alter_employee_sim_and_more.py
View File

@ -1,28 +0,0 @@
# Generated by Django 5.2.8 on 2026-03-03 15:34
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('austritt', '0014_alter_employee_website'),
]
operations = [
migrations.AlterField(
model_name='employee',
name='bahncard',
field=models.CharField(blank=True, choices=[('NEIN', 'Nein'), ('JA', 'Ja')], default='NEIN', max_length=5, verbose_name='Bahncard-Abo vorhanden?'),
),
migrations.AlterField(
model_name='employee',
name='sim',
field=models.CharField(blank=True, choices=[('NEIN', 'Nein'), ('JA', 'Ja')], default='NEIN', max_length=5, verbose_name='Mobilfunkvertrag vorhanden?'),
),
migrations.AlterField(
model_name='employee',
name='transponder_id',
field=models.CharField(max_length=6, verbose_name='Transponder ID (Laut Personio)'),
),
]

23
austritt/migrations/0016_alter_employee_documentowner_and_more.py
View File

@ -1,23 +0,0 @@
# Generated by Django 5.2.8 on 2026-03-12 09:24
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('austritt', '0015_alter_employee_bahncard_alter_employee_sim_and_more'),
]
operations = [
migrations.AlterField(
model_name='employee',
name='documentowner',
field=models.CharField(max_length=300, null=True, verbose_name='An wen sollen die Dokumente übertragen werden?'),
),
migrations.AlterField(
model_name='employee',
name='transponder_id',
field=models.CharField(blank=True, max_length=6, verbose_name='Transponder ID (Laut Personio)'),
),
]

8
austritt/models.py
View File

@ -68,13 +68,13 @@ class Employee(models.Model):
forward = models.CharField(max_length=5, choices=JANEIN_CHOICES.items(), verbose_name=_('Soll die Email umgeleitet werden anstatt sie zu deaktivieren?'))
forwardemail = models.CharField(max_length=300, null=True, blank=True, verbose_name=_("An welche Email soll umgeleitet werden?"))
documents = models.CharField(max_length=5, choices=JANEIN_CHOICES.items(), verbose_name=_('Sollen Google Drive Dokumente übertragen werden? (Sonst werden sie gelöscht)'))
documentowner = models.CharField(max_length=300, null=True, verbose_name=_("An wen sollen die Dokumente übertragen werden?"))
documentowner = models.CharField(max_length=300, null=True, blank=True, verbose_name=_("An wen sollen die Dokumente übertragen werden?"))
mobile = models.CharField(max_length=5, choices=JANEIN_CHOICES.items(), verbose_name=_('Diensttelefon (Handy) vorhanden?'))
sim = models.CharField(max_length=5, default="NEIN", blank=True, choices=JANEIN_CHOICES.items(), verbose_name="Mobilfunkvertrag vorhanden?")
hardware = MultiSelectField(choices=HARDWARE_CHOICES.items(), max_length=40, null=True, blank=True, verbose_name=_("Zusätzliche Hardware vorhanden?"))
# office related stuff
transponder_id = models.CharField(max_length=6, blank=True, verbose_name=_("Transponder ID (Laut Personio)"))
transponder_id = models.CharField(max_length=6, verbose_name=_("Transponder ID (Laut Personio)"))
# finance related stuff
credit_card = models.CharField(max_length=5, choices=JANEIN_CHOICES.items(), verbose_name="Kreditkarte vorhanden?")
@ -82,7 +82,3 @@ class Employee(models.Model):
# kom related stuff
website = models.CharField(max_length=5, default="NEIN", blank=True, choices=JANEIN_CHOICES.items(), verbose_name="Müssen Dinge von der Webseite gelöscht werden?")
# rest text field
miscellaneous = models.TextField(max_length=500, null=True, blank=True, verbose_name=_("Sonstiges"))

1
austritt/settings.py
View File

@ -88,7 +88,6 @@ MAILS = {
'pension',
'credit_card',
'bahncard',
'miscellaneous',
]
}
}

8
eintritt/settings.py
View File

@ -54,14 +54,6 @@ MAILS = {
'mobile',
]
},
'TEAMOS': {
'MAIL': 'team-os@wikimedia.de',
'DATA': [
'department',
'team',
'language'
],
},
'SUBMITTER': {
'MAIL': 'submitter@wikimedia.de',
'DATA': [

17
veraenderung/migrations/0011_remove_employee_jobdescription_english.py
View File

@ -1,17 +0,0 @@
# Generated by Django 5.2.8 on 2026-03-03 14:36
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('veraenderung', '0010_alter_employee_landline'),
]
operations = [
migrations.RemoveField(
model_name='employee',
name='jobdescription_english',
),
]

43
veraenderung/migrations/0012_alter_employee_keyboard_alter_employee_language_and_more.py
View File

@ -1,43 +0,0 @@
# Generated by Django 5.2.8 on 2026-03-03 15:34
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('veraenderung', '0011_remove_employee_jobdescription_english'),
]
operations = [
migrations.AlterField(
model_name='employee',
name='keyboard',
field=models.CharField(blank=True, choices=[('DE', 'Deutsch'), ('US', 'USA'), ('OT', 'Anderes (Bitte unten angeben)')], default='DE', max_length=2, null=True, verbose_name='Tastaturlayout'),
),
migrations.AlterField(
model_name='employee',
name='language',
field=models.CharField(blank=True, choices=[('GER', 'Deutsch'), ('ENG', 'English')], default='GER', max_length=3, verbose_name='Sprache für Onboarding'),
),
migrations.AlterField(
model_name='employee',
name='laptop',
field=models.CharField(blank=True, choices=[('NEIN', 'Nein'), ('JA', 'Ja')], default='NEIN', max_length=8, verbose_name='Wird ein neuer Laptop gebraucht?'),
),
migrations.AlterField(
model_name='employee',
name='onboarding',
field=models.CharField(choices=[('NEIN', 'Nein'), ('JA', 'Ja')], max_length=8, verbose_name='Wird wieder ein Onboarding gebraucht?'),
),
migrations.AlterField(
model_name='employee',
name='os',
field=models.CharField(blank=True, choices=[('FED', 'Fedora (Standard)'), ('WIN', 'Windows (bitte Begründung angeben)'), ('MOS', 'Mac OS (nur wenn Mac gewählt)'), ('UBU', 'Ubuntu')], default='FED', max_length=3, null=True, verbose_name='Betriebssystem'),
),
migrations.AlterField(
model_name='employee',
name='transponder',
field=models.CharField(blank=True, choices=[('NORM', 'Transponder wird beibehalten'), ('SPECIAL', 'Besondere Schließungen (bitte angeben)'), ('NOTRANS', 'Kein Transponder')], default='NORM', max_length=7),
),
]

8
veraenderung/settings.py
View File

@ -64,14 +64,6 @@ MAILS = {
'mobile',
]
},
'TEAMOS': {
'MAIL': 'team-os@wikimedia.de',
'DATA': [
'department',
'team',
'language'
],
},
'SUBMITTER': {
'MAIL': 'submitter@wikimedia.de',
'DATA': [