From e5d792d8d3688b25aa794edee31fd87147888a64 Mon Sep 17 00:00:00 2001
From: Julian Hahn <julian.hahn@wikimedia.de>
Date: Tue, 3 Mar 2026 16:09:30 +0100
Subject: [PATCH] added fixes for site-count in ver. and JANEIN choices

---
 austritt/models.py    | 6 +++---
 austritt/views.py     | 2 +-
 veraenderung/forms.py | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/austritt/models.py b/austritt/models.py
index 82b84d0..2390ca0 100644
--- a/austritt/models.py
+++ b/austritt/models.py
@@ -70,7 +70,7 @@ class Employee(models.Model):
     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?"))
     mobile = models.CharField(max_length=5, choices=JANEIN_CHOICES.items(), verbose_name=_('Diensttelefon (Handy) vorhanden?'))
-    sim = models.BooleanField(default=False, verbose_name="Mobilfunkvertrag vorhanden?")
+    sim = models.CharField(max_length=5, default="NEIN", null=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
@@ -78,7 +78,7 @@ class Employee(models.Model):
 
     # 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", choices=JANEIN_CHOICES.items(), verbose_name="Bahncard-Abo vorhanden?")
+    bahncard = models.CharField(max_length=5, default="NEIN", null=True, choices=JANEIN_CHOICES.items(), verbose_name="Bahncard-Abo vorhanden?")
 
     # kom related stuff
-    website = models.BooleanField(default=False, verbose_name="Müssen Dinge von der Webseite gelöscht werden?")
\ No newline at end of file
+    website = models.CharField(max_length=5, default="NEIN", null=True, choices=JANEIN_CHOICES.items(), verbose_name="Müssen Dinge von der Webseite gelöscht werden?")
\ No newline at end of file
diff --git a/austritt/views.py b/austritt/views.py
index 2787e65..1b533b6 100644
--- a/austritt/views.py
+++ b/austritt/views.py
@@ -89,7 +89,7 @@ class EvaFormView(LoginRequiredMixin, CookieWizardView):
                         'TESTMODE': testmode})
 
         # deliver context for forms if we are in the last step
-        if (self.steps.step1 == 5 or (self.choice != 'IN' and self.steps.step1 == 5)):
+        if (self.steps.step1 == 4 or (self.choice != 'IN' and self.steps.step1 == 4)):
             context.update({'data': self.beautify_data(self.get_all_cleaned_data()),
                             'datatable': True,})
         return context
diff --git a/veraenderung/forms.py b/veraenderung/forms.py
index 4026110..1d9b507 100644
--- a/veraenderung/forms.py
+++ b/veraenderung/forms.py
@@ -42,8 +42,7 @@ class WorkingForm(EvaForm):
     class Meta:
         model = Employee
         fields = ['firstdate_employment', 'jobdescription_german',]
-        widgets = {'firstdate_employment': DateInput(attrs={'type': 'date'}),
-                   'firstdate_presence': DateInput(attrs={'type': 'date'}),}
+        widgets = {'firstdate_employment': DateInput(attrs={'type': 'date'}),}
 
 class ITForm(EvaForm):