"primaerdozent" and related test are removed

d120 · Jul 27, 2024 · ba79e0c · ba79e0c
1 parent af8d7e8
commit ba79e0c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 27 deletions.
diff --git a/src/feedback/tests/test_views_veranstalter.py b/src/feedback/tests/test_views_veranstalter.py
@@ -103,16 +103,11 @@ def test_post_bestellung(self):
             "digitale_eval-digitale_eval_type": "T",
         })
 
-        self.assertTemplateUsed(response_second_step, "formtools/wizard/primaerdozent.html")
-
-        response_third_step = c.post('/veranstalter/bestellung', {
-            "veranstalter_wizard-current_step": "primaerdozent",
-            "primaerdozent-primaerdozent": self.p.id
-        })
+        # "primaerdozent" is removed
 
         # "verantwortlicher_address" is removed
 
-        self.assertTemplateUsed(response_third_step, "formtools/wizard/freiefragen.html")
+        self.assertTemplateUsed(response_second_step, "formtools/wizard/freiefragen.html")
 
         response_fifth_step = c.post('/veranstalter/bestellung', {
             "veranstalter_wizard-current_step": "freie_fragen",
@@ -141,7 +136,7 @@ def test_post_bestellung(self):
         self.assertTemplateUsed(response_eight_step, "formtools/wizard/bestellung_done.html")
 
         self.assertTrue(self.v.evaluieren)
-        self.assertEqual(self.v.primaerdozent, self.p)
+        # step "primaerdozent" removed
         self.assertEqual(Tutor.objects.count(), 0) # step "tutoren" removed
         self.assertEqual(self.p.email, "[email protected]") # step "verantwortlicher_address" removed
         self.assertEqual(self.v.anzahl, 22)
@@ -255,7 +250,7 @@ def test_post_bestellung_ein_ergebnis_empfaenger(self):
 
         self.assertTemplateUsed(response_eight_step, "formtools/wizard/bestellung_done.html")
         self.assertTrue(self.v.evaluieren)
-        self.assertEqual(self.v.primaerdozent, self.p2)
+        # step "primaerdozent" removed
         self.assertEqual(Tutor.objects.count(), 0) # step "tutoren" removed
         self.assertEqual(self.p.email, "[email protected]") # step "verantwortlicher_address" removed
 
@@ -324,10 +319,7 @@ def test_status_changes(self):
             "digitale_eval-digitale_eval_type": "T",
         })
 
-        c.post('/veranstalter/bestellung', {
-            "veranstalter_wizard-current_step": "primaerdozent",
-            "primaerdozent-primaerdozent": self.p.id
-        })
+        # "primaerdozent" is removed
 
         # "verantwortlicher_address" is removed
 

diff --git a/src/feedback/views/veranstalter.py b/src/feedback/views/veranstalter.py
@@ -84,7 +84,6 @@ def veranstalter_dashboard(request):
     "evaluation": "formtools/wizard/evaluation.html",
     "basisdaten": "formtools/wizard/basisdaten.html",
     "digitale_eval": "formtools/wizard/digitale_evaluation.html",
-    "primaerdozent": "formtools/wizard/primaerdozent.html",
     "freie_fragen": "formtools/wizard/freiefragen.html",
     "veroeffentlichen": "formtools/wizard/veroeffentlichen.html",
     "zusammenfassung": "formtools/wizard/zusammenfassung.html"
@@ -95,7 +94,6 @@ def veranstalter_dashboard(request):
     "evaluation": "Evaluation",
     "basisdaten": "Basisdaten",
     "digitale_eval": "Digitale Evaluation",
-    "primaerdozent": "Primärdozent",
     "freie_fragen": "Freie Fragen",
     "veroeffentlichen": "Veroeffentlichen",
     "zusammenfassung": "Zusammenfassung"
@@ -166,7 +164,6 @@ class VeranstalterWizard(SessionWizardView):
         ('evaluation', VeranstaltungEvaluationForm),
         ('basisdaten', VeranstaltungBasisdatenForm),
         ('digitale_eval', VeranstaltungDigitaleEvaluationForm),
-        ('primaerdozent', VeranstaltungPrimaerDozentForm),
         ('freie_fragen', VeranstaltungFreieFragen),
         ('veroeffentlichen', VeranstaltungVeroeffentlichung),
         ('zusammenfassung', forms.Form)
@@ -175,7 +172,6 @@ class VeranstalterWizard(SessionWizardView):
     condition_dict = {
         'basisdaten': perform_evalution,
         'digitale_eval': show_digital_eval_form,
-        'primaerdozent': show_primaerdozent_form,
         'freie_fragen': perform_evalution,
         'veroeffentlichen': perform_evalution,
     }
@@ -304,16 +300,6 @@ def get_template_names(self):
     def done(self, form_list, **kwargs):
         cleaned_data = self.get_cleaned_basisdaten()
         ergebnis_empfaenger = cleaned_data.get('ergebnis_empfaenger', None)
-        if not any(isinstance(x, VeranstaltungPrimaerDozentForm) for x in form_list):
-            # preselect Primärdozent
-            if ergebnis_empfaenger is not None:
-                form_primar = VeranstaltungPrimaerDozentForm(is_dynamic_form=True,
-                                                             data={'primaerdozent': ergebnis_empfaenger[0].id},
-                                                             instance=self.get_instance())
-                form_primar.is_valid()
-                # TODO: Python3 does not allow append() on dict() anymore
-                # form_list.append(form_primar)
-                list(form_list).append(form_primar)
 
         instance = self.get_instance()