inserted miscellaneous field on rest form

austritt/forms.py

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

austritt/migrations/0012_remove_employee_lastdate_working_employee_bahncard_and_more.py

@@ -0,0 +1,53 @@
+# 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)'),
+        ),
+    ]

austritt/migrations/0013_alter_employee_bahncard_alter_employee_pension_and_more.py

@@ -0,0 +1,33 @@
+# 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?'),
+        ),
+    ]

austritt/migrations/0014_alter_employee_website.py

@@ -0,0 +1,18 @@
+# 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?'),
+        ),
+    ]

austritt/migrations/0015_alter_employee_bahncard_alter_employee_sim_and_more.py

@@ -0,0 +1,28 @@
+# 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)'),
+        ),
+    ]

austritt/migrations/0016_alter_employee_documentowner_and_more.py

@@ -0,0 +1,23 @@
+# 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)'),
+        ),
+    ]

austritt/models.py

@@ -68,17 +68,21 @@ 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, blank=True, verbose_name=_("An wen sollen die Dokumente übertragen werden?"))
+    documentowner = models.CharField(max_length=300, null=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, verbose_name=_("Transponder ID (Laut Personio)"))
+    transponder_id = models.CharField(max_length=6, blank=True, verbose_name=_("Transponder ID (Laut Personio)"))
 
     # finance related stuff
     credit_card = models.CharField(max_length=5, choices=JANEIN_CHOICES.items(), verbose_name="Kreditkarte vorhanden?")
     bahncard = models.CharField(max_length=5, default="NEIN", blank=True, choices=JANEIN_CHOICES.items(), verbose_name="Bahncard-Abo vorhanden?")
 
     # 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?")
+    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"))

austritt/settings.py

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

eintritt/settings.py

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

veraenderung/migrations/0011_remove_employee_jobdescription_english.py

@@ -0,0 +1,17 @@
+# 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',
+        ),
+    ]

veraenderung/migrations/0012_alter_employee_keyboard_alter_employee_language_and_more.py

@@ -0,0 +1,43 @@
+# 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),
+        ),
+    ]

veraenderung/settings.py

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