From 425f0afd630f884f1c423cac3456311ad6e22b3b Mon Sep 17 00:00:00 2001 From: Julian Hahn Date: Tue, 3 Mar 2026 16:34:11 +0100 Subject: [PATCH] changed default values and email recipients --- austritt/models.py | 8 ++++---- austritt/settings.py | 14 ++++++++++---- veraenderung/forms.py | 1 + veraenderung/models.py | 14 +++++++------- veraenderung/settings.py | 2 ++ veraenderung/views.py | 2 +- 6 files changed, 25 insertions(+), 16 deletions(-) diff --git a/austritt/models.py b/austritt/models.py index 2390ca0..4d906db 100644 --- a/austritt/models.py +++ b/austritt/models.py @@ -70,15 +70,15 @@ 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.CharField(max_length=5, default="NEIN", null=True, choices=JANEIN_CHOICES.items(), verbose_name="Mobilfunkvertrag 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?") - bahncard = models.CharField(max_length=5, default="NEIN", null=True, choices=JANEIN_CHOICES.items(), verbose_name="Bahncard-Abo 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", null=True, choices=JANEIN_CHOICES.items(), 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", blank=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/settings.py b/austritt/settings.py index 14673a2..fbacf0d 100644 --- a/austritt/settings.py +++ b/austritt/settings.py @@ -23,6 +23,7 @@ MAILS = { 'documents', 'documentowner', 'mobile', + 'sim', 'special_logins', 'hardware', ], @@ -53,6 +54,7 @@ MAILS = { 'holiday', 'pension', 'laptop_id', + 'hardware', 'mobile', 'sim', 'credit_card' @@ -69,8 +71,6 @@ MAILS = { 'SUBMITTER': { 'MAIL': 'submitter@wikimedia.de', 'DATA': [ - 'overtime', - 'holiday', 'laptop_id', 'email', 'forward', @@ -79,9 +79,15 @@ MAILS = { 'documentowner', 'mobile', 'sim', - 'credit_card' - 'transponder_id', 'special_logins', + 'hardware', + 'transponder_id', + 'website', + 'overtime', + 'holiday', + 'pension', + 'credit_card', + 'bahncard', ] } } diff --git a/veraenderung/forms.py b/veraenderung/forms.py index 1d9b507..b032431 100644 --- a/veraenderung/forms.py +++ b/veraenderung/forms.py @@ -56,6 +56,7 @@ class ITForm(EvaForm): 'mobile', 'landline', 'comment', + 'onboarding', 'language', 'accounts', 'lists', diff --git a/veraenderung/models.py b/veraenderung/models.py index 263ec44..b4153d5 100644 --- a/veraenderung/models.py +++ b/veraenderung/models.py @@ -38,7 +38,7 @@ ACCOUNT_CHOICES = {'OTRSWMDE': 'OTRS Ticketsystem', 'FORUM': 'forum.wikimedia.de', } -TRANSPONDER_CHOICES = {'NORM': _('Allgemeiner Transponder'), +TRANSPONDER_CHOICES = {'NORM': _('Transponder wird beibehalten'), 'SPECIAL': _('Besondere Schließungen (bitte angeben)'), 'NOTRANS': _('Kein Transponder'),} @@ -63,17 +63,17 @@ class Employee(models.Model): jobdescription_german = models.CharField(null=True, max_length=100, verbose_name="Neue Stellenbezeichnung(deutsch)") # IT related stuff - laptop = models.CharField(max_length=8, choices=JANEIN_CHOICES.items(), default='NEIN', verbose_name=_('Wird ein neuer Laptop gebraucht?')) + laptop = models.CharField(max_length=8, choices=JANEIN_CHOICES.items(), default='NEIN', blank=True, verbose_name=_('Wird ein neuer Laptop gebraucht?')) framework = models.CharField(max_length=300, null=True, blank=True, verbose_name=_("Wenn ja, soll er vom Standard des Frameworks (Laptop) abweichen, und wenn ja, warum?")) - os = models.CharField(max_length=3, null=True, choices=OS_CHOICES.items(), default='FED', verbose_name=_('Betriebssystem')) + os = models.CharField(max_length=3, null=True, choices=OS_CHOICES.items(), blank=True, default='FED', verbose_name=_('Betriebssystem')) #screen = models.BooleanField(default=False, verbose_name=_('Zusätzlicher Monitor? Einer ist standard.')) mobile = models.BooleanField(max_length=6, default=False, verbose_name=_('Diensttelefon (Handy)')) landline = models.BooleanField(default = False, verbose_name=_('Festnetznummer (3CX)')) # sim = models.BooleanField(default=False, verbose_name="Mobilfunkvertrag") - keyboard = models.CharField(max_length=2, null=True, choices=KEYBOARD_CHOICES.items(), default='DE', verbose_name=_("Tastaturlayout")) + keyboard = models.CharField(max_length=2, null=True, choices=KEYBOARD_CHOICES.items(), blank=True, default='DE', verbose_name=_("Tastaturlayout")) comment = models.TextField(max_length=500, null=True, blank=True, verbose_name=_("zusätzliche IT-Anforderungen")) - onboarding = models.CharField(max_length=8, choices=JANEIN_CHOICES.items(), default='NEIN', verbose_name=_('Wird wieder ein Onboarding gebraucht?')) - language = models.CharField(max_length=3, choices=LANG_CHOICES.items(), default="GER", verbose_name=_("Sprache für Onboarding")) + onboarding = models.CharField(max_length=8, choices=JANEIN_CHOICES.items(), verbose_name=_('Wird wieder ein Onboarding gebraucht?')) + language = models.CharField(max_length=3, choices=LANG_CHOICES.items(), blank=True, default="GER", verbose_name=_("Sprache für Onboarding")) accounts = models.TextField(max_length=500, null=True, blank=True, verbose_name=_("Zusätzliche benötigte neue Zugänge")) lists = models.CharField(max_length=100, null=True, blank=True, verbose_name=_("Zusätzliche neue Mailinglisten")) oldaccounts = models.TextField(max_length=500, null=True, blank=True, verbose_name=_("Nicht mehr benötigte alte Zugänge")) @@ -81,6 +81,6 @@ class Employee(models.Model): rebu2go = models.BooleanField(verbose_name=_("Rebu2Go-Zugang benötigt?"), default=False) # office related stuff - transponder = models.CharField(max_length=7, choices=TRANSPONDER_CHOICES.items(), default='NORM') + transponder = models.CharField(max_length=7, choices=TRANSPONDER_CHOICES.items(), blank=True, default='NORM') special = models.TextField(max_length=500, null=True, blank=True, verbose_name=_("Besondere Schließungen hier eintragen (auch bereits vergebene)")) post_office_box = models.BooleanField(default=True, verbose_name=_('Postfach am Empfang benötigt?')) diff --git a/veraenderung/settings.py b/veraenderung/settings.py index b3b7fcf..8f17d94 100644 --- a/veraenderung/settings.py +++ b/veraenderung/settings.py @@ -29,6 +29,7 @@ MAILS = { 'oldaccounts', 'oldlists', 'department', + 'onboarding', 'language', ], }, @@ -78,6 +79,7 @@ MAILS = { 'landline', 'keyboard', 'comment', + 'onboarding', 'language', 'accounts', 'lists', diff --git a/veraenderung/views.py b/veraenderung/views.py index f1c80e1..3c0e759 100644 --- a/veraenderung/views.py +++ b/veraenderung/views.py @@ -46,7 +46,7 @@ def change_process(wizard): class EvaFormView(LoginRequiredMixin, CookieWizardView): template_name = 'veraenderung/employee_form.html' - form_list = [PersonalForm, WorkingForm, ITForm, OfficeForm, WorkingForm, DummyForm] + form_list = [PersonalForm, WorkingForm, ITForm, OfficeForm, DummyForm, DummyForm] instance = None choice = 'IN'