From b184564c839559690b0209b697fc696132acc90d Mon Sep 17 00:00:00 2001 From: chol Date: Tue, 24 Oct 2023 16:25:48 +0200 Subject: [PATCH] added fields landline and add_to_wikimediade --- evapp/forms.py | 6 +++--- evapp/migrations/0001_initial.py | 2 ++ evapp/models.py | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/evapp/forms.py b/evapp/forms.py index 0bf81ec..0d08b42 100644 --- a/evapp/forms.py +++ b/evapp/forms.py @@ -29,7 +29,7 @@ class PersonalForm(EvaForm): class Meta: model = Employee - fields = ['firstname', 'lastname', 'department', 'team', ] + fields = ['firstname', 'lastname', 'department', 'team', 'add_to_wikimediade',] class WorkingForm(EvaForm): @@ -57,8 +57,8 @@ class ITForm(EvaForm): class Meta: model = Employee fields = [ - 'vendor', 'os', 'keyboard', 'screen', 'mobile', 'comment', - 'language', 'accounts', 'lists', 'rebu2go' ] + 'vendor', 'os', 'keyboard', 'screen', 'mobile', 'landline', + 'comment', 'language', 'accounts', 'lists', 'rebu2go' ] class OfficeForm(EvaForm): class Meta: diff --git a/evapp/migrations/0001_initial.py b/evapp/migrations/0001_initial.py index 74206eb..0edd3be 100644 --- a/evapp/migrations/0001_initial.py +++ b/evapp/migrations/0001_initial.py @@ -20,6 +20,7 @@ class Migration(migrations.Migration): ('lastname', models.CharField(max_length=50, verbose_name='Nachname')), ('department', models.CharField(choices=[('PROG', 'Programme'), ('SOFT', 'Softwareentwicklung'), ('CENT', 'Central'), ('VOR', 'Vorstand')], max_length=5, verbose_name='Bereich')), ('team', models.CharField(blank=True, max_length=20, null=True)), + ('add_to_wikimediade', models.BooleanField(default=False, verbose_name='Soll auf wikimedia.de irgendwo stehen?')), ('firstdate_employment', models.DateField(null=True, verbose_name='Erster Arbeitstag')), ('firstdate_presence', models.DateField(null=True, verbose_name='Erster Tag der Anwesenheit in der Geschäftsstelle')), ('jobdescription_german', models.CharField(max_length=100, null=True, verbose_name='Stellenbezeichnung(deutsch)')), @@ -30,6 +31,7 @@ class Migration(migrations.Migration): ('os', models.CharField(choices=[('UBU', 'Ubuntu (Standard)'), ('WIN', 'Windows (bitte Begründung angeben)'), ('MOS', 'Mac OS (nur wenn Mac gewählt)')], default='UBU', max_length=3, verbose_name='Betriebssystem')), ('screen', models.BooleanField(default=False, verbose_name='Zusätzlicher Monitor? Einer ist standard.')), ('mobile', models.BooleanField(default=False, max_length=6, verbose_name='Diensttelefon (Handy)')), + ('landline', models.BooleanField(default=False, verbose_name='Festnetznummer (Sipgate)')), ('keyboard', models.CharField(choices=[('DE', 'Deutsch'), ('US', 'USA'), ('OT', 'Anderes (Bitte unten angeben)')], default='DE', max_length=2, verbose_name='Tastaturlayout')), ('comment', models.TextField(blank=True, max_length=500, null=True, verbose_name='zusätzliche IT-Anforderungen')), ('language', models.CharField(choices=[('GER', 'Deutsch'), ('ENG', 'English')], default='GER', max_length=3, verbose_name='Sprache')), diff --git a/evapp/models.py b/evapp/models.py index 3096b28..ffa6554 100644 --- a/evapp/models.py +++ b/evapp/models.py @@ -52,6 +52,7 @@ class Employee(models.Model): # intern = models.BooleanField(verbose_name='Interne_r Mitarbeiter_in?', default=True) department = models.CharField(max_length=5, choices=DEPARTMENT_CHOICES.items(), verbose_name=_('Bereich')) team = models.CharField(max_length=50, null=True, blank=True) # TODO? better with choices? + add_to_wikimediade = models.BooleanField(default = False, verbose_name=_('Soll auf wikimedia.de irgendwo stehen?')) # general work related stuff firstdate_employment = models.DateField(null=True, verbose_name=_("Erster Arbeitstag")) @@ -66,6 +67,7 @@ class Employee(models.Model): os = models.CharField(max_length=3, choices=OS_CHOICES.items(), default='UBU', 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 (Sipgate)')) # sim = models.BooleanField(default=False, verbose_name="Mobilfunkvertrag") keyboard = models.CharField(max_length=2, choices=KEYBOARD_CHOICES.items(), default='DE', verbose_name=_("Tastaturlayout")) comment = models.TextField(max_length=500, null=True, blank=True, verbose_name=_("zusätzliche IT-Anforderungen"))