Compare commits
No commits in common. "34cbf0f550de84cf806a0efef62985b5ab3896be" and "531ffa95fe1b981952ebe58d0970ae12541a1a23" have entirely different histories.
34cbf0f550
...
531ffa95fe
|
@ -42,7 +42,7 @@ class WorkingForm(EvaForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Employee
|
model = Employee
|
||||||
fields = ['firstdate_employment', 'firstdate_presence', 'jobdescription_german',
|
fields = ['firstdate_employment', 'firstdate_presence', 'jobdescription_german',
|
||||||
'jobdescription_english', 'remote', 'desk', 'bvg']
|
'jobdescription_english', 'remote', 'desk',]
|
||||||
widgets = {'firstdate_employment': DateInput(attrs={'type': 'date'}),
|
widgets = {'firstdate_employment': DateInput(attrs={'type': 'date'}),
|
||||||
'firstdate_presence': DateInput(attrs={'type': 'date'}),}
|
'firstdate_presence': DateInput(attrs={'type': 'date'}),}
|
||||||
|
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
# Generated by Django 3.1.4 on 2021-03-30 08:25
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('evapp', '0011_auto_20210329_1254'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='employee',
|
|
||||||
name='bvg',
|
|
||||||
field=models.BooleanField(default=True, verbose_name='Bekommt eine BVG-Karte, weil in Berlin tätig'),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -62,8 +62,7 @@ class Employee(models.Model):
|
||||||
jobdescription_english = models.CharField(null=True, max_length=100, verbose_name="Job description(english)")
|
jobdescription_english = models.CharField(null=True, max_length=100, verbose_name="Job description(english)")
|
||||||
remote = models.BooleanField(verbose_name='Braucht keinen Arbeitsplatz weil Home-Office', default=False)
|
remote = models.BooleanField(verbose_name='Braucht keinen Arbeitsplatz weil Home-Office', default=False)
|
||||||
desk = models.CharField(max_length=100, null=True, blank=True, verbose_name="Wo soll der Arbeitsplatz sein?")
|
desk = models.CharField(max_length=100, null=True, blank=True, verbose_name="Wo soll der Arbeitsplatz sein?")
|
||||||
bvg = models.BooleanField(verbose_name='Bekommt eine BVG-Karte, weil in Berlin tätig', default=True)
|
|
||||||
|
|
||||||
# IT related stuff
|
# IT related stuff
|
||||||
laptop = models.CharField(max_length=2, choices=LAPTOP_CHOICES.items(), default='14')
|
laptop = models.CharField(max_length=2, choices=LAPTOP_CHOICES.items(), default='14')
|
||||||
vendor = models.CharField(max_length=8, choices=VENDOR_CHOICES.items(), default='STANDARD')
|
vendor = models.CharField(max_length=8, choices=VENDOR_CHOICES.items(), default='STANDARD')
|
||||||
|
|
|
@ -37,7 +37,7 @@ MAILS = {
|
||||||
'HR': {
|
'HR': {
|
||||||
'MAIL': 'hr@wikimedia.de',
|
'MAIL': 'hr@wikimedia.de',
|
||||||
'DATA': [
|
'DATA': [
|
||||||
'department', 'team', 'language', 'eva',
|
'department', 'team', 'language',
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
'DIRECTORAT': {
|
'DIRECTORAT': {
|
||||||
|
|
Loading…
Reference in New Issue