Feature/stepper refinement

proposals/forms.py

@@ -881,9 +881,6 @@ class Meta:
 
     _soft_validation_fields = ["translated_forms", "translated_forms_languages"]
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
     def clean(self):
         cleaned_data = super(TranslatedConsentForms, self).clean()
 

proposals/templates/proposals/proposal_form.html

@@ -7,6 +7,14 @@
     {% trans "Algemene informatie over de aanvraag" %} - {{ block.super }}
 {% endblock %}
 
+{% block stepper %}
+    {% if create %}
+        <!--No stepper on creation-->
+    {% else %}
+        {% include stepper %}
+    {% endif %}
+{% endblock %}
+
 {% block html_head %}
     {{ block.super }}
     <script>

proposals/utils/checkers.py

@@ -2,6 +2,7 @@
 from django.urls import reverse
 
 from proposals import forms as proposal_forms
+from proposals.models import Wmo
 from studies import forms as study_forms
 from interventions import forms as intervention_forms
 from observations import forms as observation_forms
@@ -26,14 +27,19 @@ class ProposalTypeChecker(
 ):
 
     def check(self):
-        # TODO: check stepper.proposal_type_hint
-        # and proposal.is_pre_approved etc. for non-standard layouts
-        return self.regular_proposal()
-
-    def regular_proposal(self):
-        from .stepper import RegularProposalLayout
+        """Each proposal type receives a specific create checker and layout"""
+        from .stepper import (
+            RegularProposalLayout,
+            PreApprProposalLayout,
+            PreAssProposalLayout,
+        )
 
-        self.stepper.layout = RegularProposalLayout
+        if self.proposal.is_pre_approved:
+            self.stepper.layout = PreApprProposalLayout
+        elif self.proposal.is_pre_assessment:
+            self.stepper.layout = PreAssProposalLayout
+        else:
+            self.stepper.layout = RegularProposalLayout
         return [ProposalCreateChecker]
 
 
@@ -51,56 +57,21 @@ class ProposalCreateChecker(
     form_class = proposal_forms.ProposalForm
 
     def get_url(self):
-        if self.proposal.pk:
-            return reverse(
-                "proposals:update",
-                args=[self.proposal.pk],
-            )
         return reverse(
-            "proposals:create",
+            "proposals:update",
+            args=[self.proposal.pk],
         )
 
     def check(self):
         self.parent = BasicDetailsItem(self.stepper)
         self.stepper.items.append(self.parent)
-        if self.proposal.pk:
-            return self.proposal_exists()
-        return self.new_proposal()
-
-    def new_proposal(self):
-        self.stepper.items.append(self.make_stepper_item())
-        placeholders = [
-            PlaceholderItem(
-                self.stepper,
-                title=_("Onderzoeker"),
-                parent=self.parent,
-            ),
-            PlaceholderItem(
-                self.stepper,
-                title=_("Andere onderzoekers"),
-                parent=self.parent,
-            ),
-            PlaceholderItem(
-                self.stepper,
-                title=_("Financiering"),
-                parent=self.parent,
-            ),
-            PlaceholderItem(
-                self.stepper,
-                title=_("Onderzoeksdoel"),
-                parent=self.parent,
-            ),
-        ]
-        self.stepper.items += placeholders
-        return []
-
-    def proposal_exists(self):
         stepper_item = ModelFormItem(
             self.stepper,
             title=self.title,
             parent=self.parent,
             form_object=self.proposal,
             form_class=self.form_class,
+            form_kwargs={},
             url_func=self.get_url,
         )
         self.stepper.items.append(
@@ -139,6 +110,13 @@ class OtherResearchersChecker(
 
     def check(self):
         self.stepper.items.append(self.make_stepper_item())
+        if self.proposal.is_pre_assessment:
+            return [
+                GoalChecker(
+                    self.stepper,
+                    parent=self.parent,
+                )
+            ]
         return [
             FundingChecker(
                 self.stepper,
@@ -183,6 +161,13 @@ class GoalChecker(
 
     def check(self):
         self.stepper.items.append(self.make_stepper_item())
+        if self.proposal.is_pre_approved:
+            return [
+                PreApprovedChecker(
+                    self.stepper,
+                    parent=self.parent,
+                )
+            ]
         return [WMOChecker]
 
     def get_url(self):
@@ -192,79 +177,132 @@ def get_url(self):
         )
 
 
-class WMOItem(
-    StepperItem,
+class PreApprovedChecker(
+    ModelFormChecker,
 ):
+
+    title = _("Eerdere toetsing")
+    form_class = proposal_forms.PreApprovedForm
+
+    def check(self):
+        self.stepper.items.append(self.make_stepper_item())
+        return [SubmitChecker]
+
+    def get_url(self):
+        return reverse(
+            "proposals:pre_approved",
+            args=(self.proposal.pk,),
+        )
+
+
+class WMOChecker(ModelFormChecker):
+
+    title = "WMO"
+    form_class = proposal_forms.WmoForm
     location = "wmo"
-    title = _("WMO")
 
-    def __init__(
+    def check(
         self,
-        *args,
-        **kwargs,
     ):
-        super().__init__(*args, **kwargs)
-        self.proposal = self.stepper.proposal
-        self.wmo = self.get_wmo()
+        self.item = self.make_stepper_item()
+        self.stepper.items.append(
+            self.item,
+        )
+        if self.object_exists():
+            return self.check_wmo()
+        else:
+            return []
 
-    def get_wmo(
+    def check_wmo(
         self,
     ):
-        if hasattr(
-            self.proposal,
-            "wmo",
-        ):
-            return self.proposal.wmo
-        return None
+        """
+        This method should check the correctness of the
+        WMO object.
+        """
+        if self.proposal.wmo.status != Wmo.WMOStatuses.NO_WMO:
+            return [
+                WMOApplicationChecker(
+                    self.stepper,
+                    parent=self.item,
+                )
+            ]
+        if self.proposal.is_pre_assessment:
+            return [SubmitChecker]
+        return [TrajectoriesChecker]
 
-    def get_url(
-        self,
-    ):
-        if self.wmo:
-            return reverse(
-                "proposals:wmo_update",
-                args=[self.wmo.pk],
-            )
+    def get_url(self):
+        if self.object_exists():
+            return self.get_update_url()
         else:
-            return reverse(
-                "proposals:wmo_create",
-                args=[self.proposal.pk],
-            )
+            return self.get_create_url()
 
-    def wmo_exists(
+    def object_exists(
         self,
     ):
         return hasattr(
             self.proposal,
             "wmo",
         )
 
+    def get_create_url(
+        self,
+    ):
+        if self.proposal.is_pre_assessment:
+            url = "proposals:wmo_create_pre"
+        else:
+            url = "proposals:wmo_create"
+        return reverse(
+            url,
+            args=[self.proposal.pk],
+        )
 
-class WMOChecker(
-    Checker,
-):
-
-    def check(
+    def get_update_url(
         self,
     ):
-        self.item = WMOItem(self.stepper)
-        self.stepper.items.append(self.item)
-        if self.item.wmo:
-            return self.check_wmo()
+        if self.proposal.is_pre_assessment:
+            url = "proposals:wmo_update_pre"
         else:
-            return []
+            url = "proposals:wmo_update"
+        return reverse(
+            url,
+            args=[self.proposal.wmo.pk],
+        )
 
-    def check_wmo(
+    def get_form_object(
         self,
     ):
-        """
-        This method should check the correctness of the
-        WMO object.
-        """
-        # Just assume any WMO is correct as long as it exists
-        if self.item.wmo:
-            return [TrajectoriesChecker]
-        return []  # TODO next item
+        if self.object_exists():
+            return self.proposal.wmo
+        else:
+            return None
+
+
+class WMOApplicationChecker(ModelFormChecker):
+
+    title = _("WMO applicatie")
+    form_class = proposal_forms.WmoApplicationForm
+
+    def check(self):
+        self.stepper.items.append(self.make_stepper_item())
+        if self.proposal.wmo.status == Wmo.WMOStatuses.WAITING:
+            return []
+        if self.proposal.is_pre_assessment:
+            return [SubmitChecker]
+        return [TrajectoriesChecker]
+
+    def get_url(self):
+        if self.proposal.is_pre_assessment:
+            pre_suffix = "_pre"
+        else:
+            pre_suffix = ""
+        return reverse(
+            f"proposals:wmo_application{pre_suffix}",
+            args=(self.proposal.wmo.pk,),
+        )
+
+    def get_form_object(self):
+        return self.proposal.wmo
 
 
 class TrajectoriesChecker(
@@ -314,6 +352,11 @@ def get_url(
             args=[self.proposal.pk],
         )
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["proposal"] = self.proposal
+        return kwargs
+
 
 class StudyChecker(
     Checker,
@@ -419,6 +462,14 @@ def get_url(
             ],
         )
 
+    def get_form_object(self):
+        return self.study
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["proposal"] = self.proposal
+        return kwargs
+
 
 class DesignChecker(
     ModelFormChecker,
@@ -481,6 +532,9 @@ def get_url(
             ],
         )
 
+    def get_form_object(self):
+        return self.study
+
 
 class InterventionChecker(
     UpdateOrCreateChecker,
@@ -517,6 +571,11 @@ def get_form_object(
     ):
         return self.study.intervention
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["study"] = self.study
+        return kwargs
+
     def get_create_url(
         self,
     ):
@@ -586,6 +645,11 @@ def get_form_object(
     ):
         return self.study.observation
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["study"] = self.study
+        return kwargs
+
 
 class SessionsChecker(
     ModelFormChecker,
@@ -826,3 +890,9 @@ def get_url(
                 self.stepper.proposal.pk,
             ],
         )
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["proposal"] = self.proposal
+        kwargs["request"] = self.stepper.request
+        return kwargs