Compare commits
2 Commits
361b6b497c
...
ff1aef386f
Author | SHA1 | Date |
---|---|---|
Benni Bärmann | ff1aef386f | |
Benni Bärmann | ad93ab5df1 |
5
TODO
5
TODO
|
@ -1,11 +1,6 @@
|
||||||
* switch to django 4
|
* switch to django 4
|
||||||
|
|
||||||
|
|
||||||
from https://otrs.wikimedia.de/otrs/index.pl?Action=AgentTicketZoom;TicketID=754407:
|
|
||||||
|
|
||||||
* Team field should be longer
|
|
||||||
|
|
||||||
|
|
||||||
minor stuff:
|
minor stuff:
|
||||||
|
|
||||||
* remove dot before "Nextcloud" at login page.
|
* remove dot before "Nextcloud" at login page.
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
# Generated by Django 3.1.4 on 2022-02-08 09:55
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('evapp', '0002_auto_20210914_1055'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='employee',
|
||||||
|
name='department',
|
||||||
|
field=models.CharField(choices=[('PROG', 'Programme'), ('SOFT', 'Softwareentwicklung'), ('CENT', 'Central'), ('KOMEV', 'Kommunikation und Events'), ('VOR', 'Vorstand')], max_length=5, verbose_name='Bereich'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='employee',
|
||||||
|
name='team',
|
||||||
|
field=models.CharField(blank=True, max_length=50, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='employee',
|
||||||
|
name='works_in_gs',
|
||||||
|
field=models.BooleanField(default=True, verbose_name='Braucht Arbeitsplatz in der Geschäftsstelle?)'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -51,7 +51,7 @@ class Employee(models.Model):
|
||||||
lastname = models.CharField(max_length=50, verbose_name=_("Nachname"))
|
lastname = models.CharField(max_length=50, verbose_name=_("Nachname"))
|
||||||
# intern = models.BooleanField(verbose_name='Interne_r Mitarbeiter_in?', default=True)
|
# intern = models.BooleanField(verbose_name='Interne_r Mitarbeiter_in?', default=True)
|
||||||
department = models.CharField(max_length=5, choices=DEPARTMENT_CHOICES.items(), verbose_name=_('Bereich'))
|
department = models.CharField(max_length=5, choices=DEPARTMENT_CHOICES.items(), verbose_name=_('Bereich'))
|
||||||
team = models.CharField(max_length=20, null=True, blank=True) # TODO? better with choices?
|
team = models.CharField(max_length=50, null=True, blank=True) # TODO? better with choices?
|
||||||
|
|
||||||
# general work related stuff
|
# general work related stuff
|
||||||
firstdate_employment = models.DateField(null=True, verbose_name=_("Erster Arbeitstag"))
|
firstdate_employment = models.DateField(null=True, verbose_name=_("Erster Arbeitstag"))
|
||||||
|
|
|
@ -62,7 +62,8 @@ class LoginTestCase(TestCase):
|
||||||
'0-firstname': 'Ara',
|
'0-firstname': 'Ara',
|
||||||
'0-lastname': 'Seva',
|
'0-lastname': 'Seva',
|
||||||
'0-department': 'CENT',
|
'0-department': 'CENT',
|
||||||
'0-choice': 'IN'
|
'0-team': 'Community Communications',
|
||||||
|
'0-choice': 'IN',
|
||||||
}, WorkingForm)
|
}, WorkingForm)
|
||||||
|
|
||||||
response = self._postform({
|
response = self._postform({
|
||||||
|
|
Loading…
Reference in New Issue