From 476def48267198dc413bcfdda0e4a751cb92c3f7 Mon Sep 17 00:00:00 2001 From: Benni Baermann Date: Thu, 14 Oct 2021 12:22:30 +0200 Subject: [PATCH] added department "kommunikation und events" --- README.md | 2 ++ TODO | 2 ++ eva/settings_development.py | 4 +++- evapp/models.py | 1 + evapp/tests.py | 5 +++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0d1d0cd..24b8998 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ environment managing tool - clone this repository +- ln -sr eva/settings_development.py eva/settings.py + - initialise your database with python manage.py migrate diff --git a/TODO b/TODO index 03b33fd..b0dcaa2 100644 --- a/TODO +++ b/TODO @@ -1 +1,3 @@ * remove dot before "Nextcloud" at login page. + +* add Testmode warning at login screen diff --git a/eva/settings_development.py b/eva/settings_development.py index 473fc74..cdcd234 100644 --- a/eva/settings_development.py +++ b/eva/settings_development.py @@ -139,7 +139,9 @@ STATIC_URL = '/static/' # settings needed for allauth SOCIALACCOUNT_PROVIDERS = { 'nextcloud': { - 'SERVER': 'https://wolke.wikimedia.de/', + 'SERVER': 'https://develwolke.wikimedia.de/', + #'SERVER': 'https://wolke.wikimedia.de', + #'SERVER': 'https://cloud.bucky.uber.space/' } } diff --git a/evapp/models.py b/evapp/models.py index 79bda50..ac36557 100644 --- a/evapp/models.py +++ b/evapp/models.py @@ -9,6 +9,7 @@ from multiselectfield import MultiSelectField DEPARTMENT_CHOICES = {'PROG': 'Programme', 'SOFT': 'Softwareentwicklung', 'CENT': 'Central', + 'KOMEV': 'Kommunikation und Events', 'VOR': 'Vorstand',} VENDOR_CHOICES = {'STANDARD': 'Dell Latitude', diff --git a/evapp/tests.py b/evapp/tests.py index a0fc6c5..70a0408 100644 --- a/evapp/tests.py +++ b/evapp/tests.py @@ -26,6 +26,7 @@ class LoginTestCase(TestCase): self.assertNotContains(self.response, "WARNUNG! Test-MODUS aktiviert. Es werden keine Mails verschickt!", status_code=200) def _postform(self, data, expected_form): + '''helper function to manage the Wizzard''' response = self.client.post('/', data, follow=True) # print(type(response)) self.assertEqual(200, self.response.status_code) @@ -40,6 +41,10 @@ class LoginTestCase(TestCase): ) return response + def test_department(self): + self.assertContains(self.response, 'Programme', status_code=200) + self.assertContains(self.response, 'Kommunikation und Events', status_code=200) + def testWizzard(self): ''' this test goes through the whole process of the EvaFormView from start to end '''