diff --git a/evapp/forms.py b/evapp/forms.py index 0bf81ec..00f016f 100644 --- a/evapp/forms.py +++ b/evapp/forms.py @@ -23,9 +23,8 @@ class EvaForm(ModelForm): TYPE_CHOICES = {'IN': 'Eintritt', 'CHANGE': 'Veränderung', 'OUT': 'Austritt'} class PersonalForm(EvaForm): - # TODO: comment this back in to use implementation of change or exit process - # choice = ChoiceField(choices=TYPE_CHOICES.items(), widget=RadioSelect, - # label='Welcher Prozess soll angestoßen werden?') + choice = ChoiceField(choices=TYPE_CHOICES.items(), widget=RadioSelect, + label='Welcher Prozess soll angestoßen werden?') class Meta: model = Employee diff --git a/evapp/migrations/0003_auto_20211110_0832.py b/evapp/migrations/0003_auto_20211110_0832.py new file mode 100644 index 0000000..c4fc14c --- /dev/null +++ b/evapp/migrations/0003_auto_20211110_0832.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.4 on 2021-11-10 08:32 + +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'), + ), + ] diff --git a/evapp/settings.py b/evapp/settings.py index e50e70c..9541aa8 100644 --- a/evapp/settings.py +++ b/evapp/settings.py @@ -1,5 +1,5 @@ # temporary setting while change and exit is not yet fully implemented -ONLY_ONBOARDING = True +ONLY_ONBOARDING = False # sender mail adress also used for MAILTEST mode EVA_MAIL = 'it-support@wikimedia.de' diff --git a/evapp/tests.py b/evapp/tests.py index 70a0408..27db2e9 100644 --- a/evapp/tests.py +++ b/evapp/tests.py @@ -55,6 +55,7 @@ class LoginTestCase(TestCase): '0-firstname': 'Ara', '0-lastname': 'Seva', '0-department': 'CENT', + '0-choice': 'IN' }, WorkingForm) response = self._postform({