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

added fixes for site-count in ver. and JANEIN choices

This commit is contained in:
Julian Hahn 2026-03-03 16:09:30 +01:00
parent 8fe3395ff7
commit e5d792d8d3
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
austritt/models.py
View File

@ -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)')) 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, 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?')) 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?")) hardware = MultiSelectField(choices=HARDWARE_CHOICES.items(), max_length=40, null=True, blank=True, verbose_name=_("Zusätzliche Hardware vorhanden?"))
# office related stuff # office related stuff
@ -78,7 +78,7 @@ class Employee(models.Model):
# finance related stuff # finance related stuff
credit_card = models.CharField(max_length=5, choices=JANEIN_CHOICES.items(), verbose_name="Kreditkarte vorhanden?") 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 # kom related stuff
website = models.BooleanField(default=False, verbose_name="Müssen Dinge von der Webseite gelöscht werden?") 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?")

2
austritt/views.py
View File

@ -89,7 +89,7 @@ class EvaFormView(LoginRequiredMixin, CookieWizardView):
'TESTMODE': testmode}) 'TESTMODE': testmode})
# deliver context for forms if we are in the last step # 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()), context.update({'data': self.beautify_data(self.get_all_cleaned_data()),
'datatable': True,}) 'datatable': True,})
return context return context

3
veraenderung/forms.py
View File

@ -42,8 +42,7 @@ class WorkingForm(EvaForm):
class Meta: class Meta:
model = Employee model = Employee
fields = ['firstdate_employment', 'jobdescription_german',] fields = ['firstdate_employment', 'jobdescription_german',]
widgets = {'firstdate_employment': DateInput(attrs={'type': 'date'}), widgets = {'firstdate_employment': DateInput(attrs={'type': 'date'}),}
'firstdate_presence': DateInput(attrs={'type': 'date'}),}
class ITForm(EvaForm): class ITForm(EvaForm):