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

added sim & sim2, configured mails in settings

This commit is contained in:
Benni Bärmann 2021-03-29 14:56:06 +02:00
parent 860a954ea0
commit 531ffa95fe
5 changed files with 67 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@ -6,8 +6,7 @@ evapp/settings auf die richtigen adressen setzen
Accounts klären Accounts klären
Bemerkung like "E - VA soon" auf die webseite
link ins mailtemplate (seite im wiki erstellen -> alexander) link ins mailtemplate (seite im wiki erstellen -> alexander)
welche mails gehen an wen. liste an alexander
whitenoise/gunicorn in production whitenoise/gunicorn in production

2
evapp/forms.py
View File

@ -50,7 +50,7 @@ class ITForm(EvaForm):
class Meta: class Meta:
model = Employee model = Employee
fields = [ fields = [
'laptop', 'vendor', 'os', 'screen', 'mobile', 'landline', 'comment', 'laptop', 'vendor', 'os', 'screen', 'mobile', 'sim', 'sim2', 'landline', 'comment',
'language', 'accounts', 'lists', 'rebu2go' ] 'language', 'accounts', 'lists', 'rebu2go' ]
class OfficeForm(EvaForm): class OfficeForm(EvaForm):

23
evapp/migrations/0011_auto_20210329_1254.py Normal file
View File

@ -0,0 +1,23 @@
# Generated by Django 3.1.4 on 2021-03-29 12:54
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('evapp', '0010_auto_20210325_0813'),
]
operations = [
migrations.AddField(
model_name='employee',
name='sim',
field=models.BooleanField(default=False, verbose_name='Mobilfunkvertrag'),
),
migrations.AddField(
model_name='employee',
name='sim2',
field=models.BooleanField(default=False, verbose_name='Zweite Sim (für Laptop zB)'),
),
]

2
evapp/models.py
View File

@ -69,6 +69,8 @@ class Employee(models.Model):
os = models.CharField(max_length=3, choices=OS_CHOICES.items(), default='UBU') os = models.CharField(max_length=3, choices=OS_CHOICES.items(), default='UBU')
screen = models.BooleanField(default=False, verbose_name='Zusätzlicher Monitor? Einer ist standard.') screen = models.BooleanField(default=False, verbose_name='Zusätzlicher Monitor? Einer ist standard.')
mobile = models.CharField(max_length=6, default='NO') mobile = models.CharField(max_length=6, default='NO')
sim = models.BooleanField(default=False, verbose_name="Mobilfunkvertrag")
sim2 = models.BooleanField(default=False, verbose_name="Zweite Sim (für Laptop zB)")
landline = models.BooleanField(default=True, verbose_name="Festnetztelefon") landline = models.BooleanField(default=True, verbose_name="Festnetztelefon")
comment = models.TextField(max_length=500, null=True, blank=True, verbose_name="zusätzliche IT-Anforderungen") comment = models.TextField(max_length=500, null=True, blank=True, verbose_name="zusätzliche IT-Anforderungen")
language = models.CharField(max_length=3, choices=LANG_CHOICES.items(), default="GER") language = models.CharField(max_length=3, choices=LANG_CHOICES.items(), default="GER")

50
evapp/settings.py
View File

@ -5,18 +5,46 @@ ONLY_ONBOARDING = True
EVA_MAIL = 'benni.baermann@wikimedia.de' EVA_MAIL = 'benni.baermann@wikimedia.de'
# these Fields should be included in every mail # these Fields should be included in every mail
BASIC_DATA = ['firstname', 'lastname'] BASIC_DATA = ['usermail', 'firstname', 'lastname', 'firstdate_employment', 'firstdate_presence',]
# for every department: 'MAIL' => mail adress, 'DATA': additional fields to include # for every department: 'MAIL' => mail adress, 'DATA': additional fields to include
MAILS = {'IT': { MAILS = {
'IT': {
'MAIL': 'it@wikimedia.de', 'MAIL': 'it@wikimedia.de',
'DATA': ['laptop', 'os', 'email'], 'DATA': [
}, 'laptop', 'os', 'comment', 'email', 'landline', 'lists', 'mobile',
'OFFICE': { 'department', 'accounts', 'language', 'screen', 'remote', 'desk',
'MAIL': 'office@wikimedia.de', ],
'DATA': ['transponder',], },
}, 'OFFICE': {
'ACCOUNTING': {'MAIL': 'accounting@wikimedia.de', 'MAIL': 'office@wikimedia.de',
'DATA': ['rebu2go',], 'DATA': [
} 'transponder', 'special', 'post_office_box', 'sim', 'sim2',
'remote', 'desk',
],
},
'ACCOUNTING': {
'MAIL': 'accounting@wikimedia.de',
'DATA': ['rebu2go',],
},
'KOMM': {
'MAIL': 'kom@wikimedia.de',
'DATA': [
'department', 'team',
'jobdescription_german', 'jobdescription_english',
],
},
'HR': {
'MAIL': 'hr@wikimedia.de',
'DATA': [
'department', 'team', 'language',
]
},
'DIRECTORAT': {
'MAIL': 'vorstand@wikmedia.de',
'DATA': [
'team', 'department', 'language',
]
}
} }