From f6803fe1489a261c449554bc637941a620824048 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 11 Sep 2024 14:28:37 +0200
Subject: [PATCH 01/29] feat: remove stepper from creation & simplifiy

---
 .../templates/proposals/proposal_form.html    |  8 +++
 proposals/utils/checkers.py                   | 61 +++++--------------
 proposals/utils/stepper.py                    | 16 +++--
 proposals/views/proposal_views.py             |  7 ++-
 4 files changed, 37 insertions(+), 55 deletions(-)

diff --git a/proposals/templates/proposals/proposal_form.html b/proposals/templates/proposals/proposal_form.html
index 65cc51a0..fcb10960 100644
--- a/proposals/templates/proposals/proposal_form.html
+++ b/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>
diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index d0ba93ce..bdec740b 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -26,15 +26,18 @@ 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
-
-        self.stepper.layout = RegularProposalLayout
-        return [ProposalCreateChecker]
+        """Each proposal type receives a specific create checker and layout"""
+        from .stepper import RegularProposalLayout, PreApprProposalLayout, PreAssProposalLayout
+
+        if self.proposal.is_pre_approved:
+            self.stepper.layout = PreApprProposalLayout
+            return [PreApprProposalCreateChecker]
+        elif self.proposal.is_pre_assessment:
+            self.stepper.layout = PreAssProposalLayout
+            return [PreAssProposalCreateChecker]
+        else:
+            self.stepper.layout = RegularProposalLayout
+            return [ProposalCreateChecker]
 
 
 class BasicDetailsItem(
@@ -51,50 +54,14 @@ 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,
diff --git a/proposals/utils/stepper.py b/proposals/utils/stepper.py
index 723c69a2..0cf845b0 100644
--- a/proposals/utils/stepper.py
+++ b/proposals/utils/stepper.py
@@ -19,7 +19,6 @@ class Stepper(renderable):
     def __init__(
         self,
         proposal,
-        proposal_type_hint=None,
         request=None,
     ):
         self.proposal = proposal
@@ -29,10 +28,6 @@ def __init__(
         # The stepper keeps track of the request to determine
         # which item is current
         self.request = request
-        # The type can be provided by the view for the case in which
-        # the proposal has not yet been created but we need to determine
-        # its type, i.e. the ProposalCreateViews
-        self.proposal_type_hint = proposal_type_hint
         self.items = []
         self.check_all(self.starting_checkers)
 
@@ -161,3 +156,14 @@ def has_multiple_studies(
     ("data_management", _("Datamanagement")),
     ("submit", _("Indienen")),
 ]
+
+PreApprProposalLayout = [
+    ("create", _("Basisgegevens")),
+    ("submit", _("Indienen")),
+]
+
+PreAssProposalLayout = [
+    ("create", _("Basisgegevens")),
+    ("wmo", _("WMO")),
+    ("submit", _("Indienen")),    
+]
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index c528c93b..11f8824f 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -238,11 +238,11 @@ def get_redirect_url(self, *args, **kwargs):
 ##########################
 
 
-class ProposalCreate(ProposalMixin, AllowErrorsOnBackbuttonMixin, CreateView):
+class ProposalCreate(AllowErrorsOnBackbuttonMixin, CreateView):
     # Note: template_name is auto-generated to proposal_form.html
 
     success_message = _("Aanvraag %(title)s aangemaakt")
-    proposal_type_hint = "regular"
+    template_name = "proposals/proposal_form.html"
     form_class = ProposalForm
 
     def get_proposal(
@@ -270,6 +270,7 @@ def get_context_data(self, **kwargs):
         context = super(ProposalCreate, self).get_context_data(**kwargs)
         context["create"] = True
         context["no_back"] = True
+        context["is_practice"] = self.get_proposal().is_practice()
         return context
 
     def get_next_url(self):
@@ -277,7 +278,7 @@ def get_next_url(self):
 
 
 class ProposalUpdate(
-    ProposalMixin, ProposalContextMixin, AllowErrorsOnBackbuttonMixin, UpdateView
+    ProposalMixin, AllowErrorsOnBackbuttonMixin, UpdateView
 ):
     form_class = ProposalForm
 

From 2b67e0808f65147f335567781513f5ddc3a840da Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 11 Sep 2024 14:30:10 +0200
Subject: [PATCH 02/29] feat: preassessment flow

---
 proposals/utils/checkers.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index bdec740b..17fc8e96 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -106,6 +106,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,
@@ -187,14 +194,18 @@ def get_wmo(
     def get_url(
         self,
     ):
+        if self.proposal.is_pre_assessment:
+            pre_suffix = "_pre"
+        else:
+            pre_suffix = ""
         if self.wmo:
             return reverse(
-                "proposals:wmo_update",
+                f"proposals:wmo_update{pre_suffix}",
                 args=[self.wmo.pk],
             )
         else:
             return reverse(
-                "proposals:wmo_create",
+                f"proposals:wmo_create{pre_suffix}",
                 args=[self.proposal.pk],
             )
 
@@ -228,10 +239,11 @@ def check_wmo(
         This method should check the correctness of the
         WMO object.
         """
+        #TODO: implement WmoApplicationChecker
         # Just assume any WMO is correct as long as it exists
-        if self.item.wmo:
-            return [TrajectoriesChecker]
-        return []  # TODO next item
+        if self.proposal.is_pre_assessment:
+            return [SubmitChecker]
+        return [TrajectoriesChecker]
 
 
 class TrajectoriesChecker(

From 262a2f2fca320540a41e113501badfb9d57b0696 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 11 Sep 2024 14:30:55 +0200
Subject: [PATCH 03/29] fix: clean up some wmo funk

---
 proposals/utils/checkers.py       |  8 --------
 proposals/views/proposal_views.py |  2 +-
 proposals/views/wmo_views.py      | 10 ++++++----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index 17fc8e96..ee8b8966 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -209,14 +209,6 @@ def get_url(
                 args=[self.proposal.pk],
             )
 
-    def wmo_exists(
-        self,
-    ):
-        return hasattr(
-            self.proposal,
-            "wmo",
-        )
-
 
 class WMOChecker(
     Checker,
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 11f8824f..4b897dcb 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -457,7 +457,7 @@ def get_next_url(self):
         if proposal.is_pre_approved:
             return reverse("proposals:pre_approved", args=(self.object.pk,))
         elif hasattr(proposal, "wmo"):
-            return reverse(f"proposals:wmo_update{pre_suffix}", args=(proposal.pk,))
+            return reverse(f"proposals:wmo_update{pre_suffix}", args=(proposal.wmo.pk,))
         else:
             return reverse(f"proposals:wmo_create{pre_suffix}", args=(proposal.pk,))
 
diff --git a/proposals/views/wmo_views.py b/proposals/views/wmo_views.py
index 09861474..ccc9fd2a 100644
--- a/proposals/views/wmo_views.py
+++ b/proposals/views/wmo_views.py
@@ -86,8 +86,8 @@ def get_proposal(self):
 # Other actions on WMO
 ######################
 class WmoApplication(
-    UpdateView,
     StepperContextMixin,
+    UpdateView,
 ):
     model = Wmo
     form_class = WmoApplicationForm
@@ -96,7 +96,7 @@ class WmoApplication(
     def get_context_data(self, **kwargs):
         """Setting the Proposal on the context"""
         context = super(WmoApplication, self).get_context_data(**kwargs)
-        context["proposal"] = self.object.proposal
+        context["proposal"] = self.get_proposal()
         return context
 
     def get_next_url(self):
@@ -110,7 +110,9 @@ def get_next_url(self):
     def get_back_url(self):
         """Return to the Wmo overview"""
         return reverse("proposals:wmo_update", args=(self.object.pk,))
-
+    
+    def get_proposal(self):
+        return self.object.proposal
 
 class WmoCheck(generic.FormView):
     form_class = WmoCheckForm
@@ -131,7 +133,7 @@ def get_next_url(self):
 
     def get_back_url(self):
         """Different return URL for pre-assessment Proposals"""
-        return reverse("proposals:update", args=(self.object.proposal.pk,))
+        return reverse("proposals:research_goal", args=(self.object.proposal.pk,))
 
 
 class WmoCreatePreAssessment(PreAssessmentMixin, WmoCreate):

From 47fcb812d3becd95bf7df81156ef7cfc4ee5b281 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 11 Sep 2024 14:47:25 +0200
Subject: [PATCH 04/29] fix: bug in ProposalTypeChecker

---
 proposals/utils/checkers.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index ee8b8966..1a826a22 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -31,13 +31,11 @@ def check(self):
 
         if self.proposal.is_pre_approved:
             self.stepper.layout = PreApprProposalLayout
-            return [PreApprProposalCreateChecker]
         elif self.proposal.is_pre_assessment:
             self.stepper.layout = PreAssProposalLayout
-            return [PreAssProposalCreateChecker]
         else:
             self.stepper.layout = RegularProposalLayout
-            return [ProposalCreateChecker]
+        return [ProposalCreateChecker]
 
 
 class BasicDetailsItem(

From b843c223d5ea83ea78531dc42b9113bce0b422ea Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 11 Sep 2024 14:47:38 +0200
Subject: [PATCH 05/29] feat: PreApproved flow

---
 proposals/utils/checkers.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index 1a826a22..373f0613 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -155,6 +155,11 @@ 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):
@@ -163,6 +168,22 @@ def get_url(self):
             args=(self.proposal.pk,),
         )
 
+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 WMOItem(
     StepperItem,

From 18555b16752970d2d50fbfd6ffecfdb028ccadbb Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 11 Sep 2024 15:18:40 +0200
Subject: [PATCH 06/29] feat: WmoApplicationChecker

---
 proposals/utils/checkers.py | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index 373f0613..3604494e 100644
--- a/proposals/utils/checkers.py
+++ b/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
@@ -250,11 +251,36 @@ def check_wmo(
         This method should check the correctness of the
         WMO object.
         """
-        #TODO: implement WmoApplicationChecker
-        # Just assume any WMO is correct as long as it exists
+        if self.item.wmo.status != Wmo.WMOStatuses.NO_WMO:
+            return [WMOApplicationChecker(
+                self.stepper,
+                parent=self.item,
+            )]
+        if self.proposal.is_pre_assessment:
+            return [SubmitChecker]
+        return [TrajectoriesChecker]
+
+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):
+        return reverse(
+            "proposals:wmo_application",
+            args=(self.proposal.wmo.pk,),
+        )
+    
+    def get_form_object(self):
+        return self.proposal.wmo
 
 
 class TrajectoriesChecker(

From 30b94a97440d338cebddf35c5fe3a0dcedc4e61e Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 11 Sep 2024 15:34:39 +0200
Subject: [PATCH 07/29] feat: make wmostatus waiting block on preAss (?)

---
 proposals/views/wmo_views.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/proposals/views/wmo_views.py b/proposals/views/wmo_views.py
index ccc9fd2a..7d95addd 100644
--- a/proposals/views/wmo_views.py
+++ b/proposals/views/wmo_views.py
@@ -146,9 +146,12 @@ class WmoUpdatePreAssessment(PreAssessmentMixin, WmoUpdate):
 
 class WmoApplicationPreAssessment(PreAssessmentMixin, WmoApplication):
     def get_next_url(self):
-        """Different continue URL for pre-assessment Proposals"""
-        return reverse("proposals:submit_pre", args=(self.object.proposal.pk,))
-
+        """Continue to the definition of a Study if we have completed the Wmo application"""
+        wmo = self.object
+        if wmo.status == Wmo.WMOStatuses.WAITING:
+            return reverse("proposals:wmo_application", args=(wmo.pk,))
+        else:
+            return reverse("proposals:submit_pre", args=(wmo.proposal.pk,))
 
 ################
 # AJAX callbacks

From 6dc61aeb36c6a995d3fbfc19b31bbda43dd72469 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 11 Sep 2024 15:35:02 +0200
Subject: [PATCH 08/29] fix: fix on url for wmoapplicationchecker

---
 proposals/utils/checkers.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index 3604494e..9a71b5ad 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -274,8 +274,12 @@ def check(self):
         return [TrajectoriesChecker]
     
     def get_url(self):
+        if self.proposal.is_pre_assessment:
+            pre_suffix = "_pre"
+        else:
+            pre_suffix = ""
         return reverse(
-            "proposals:wmo_application",
+            f"proposals:wmo_application{pre_suffix}",
             args=(self.proposal.wmo.pk,),
         )
     

From 5bd7246925e0d464e87ac8de1a986d3e5660561e Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 12 Sep 2024 09:54:27 +0200
Subject: [PATCH 09/29] feat: simple workaround for disabled styling

---
 proposals/utils/stepper_helpers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proposals/utils/stepper_helpers.py b/proposals/utils/stepper_helpers.py
index 41811323..c1492b2e 100644
--- a/proposals/utils/stepper_helpers.py
+++ b/proposals/utils/stepper_helpers.py
@@ -67,7 +67,7 @@ def get_context_data(self, *args, **kwargs):
         return context
 
     def get_url(self):
-        return "#"
+        return ""
 
     def get_errors(self):
         return []
@@ -80,7 +80,7 @@ def css_classes(
             classes.append(
                 "active",
             )
-        if self.disabled:
+        if not self.get_url():
             classes.append(
                 "disabled",
             )

From 5e0b4055dde90584d1245e48abf831816c88890e Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 12 Sep 2024 16:22:45 +0200
Subject: [PATCH 10/29] fix: remove pointless init i found

---
 proposals/forms.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/proposals/forms.py b/proposals/forms.py
index 7a2305b9..00586d4c 100644
--- a/proposals/forms.py
+++ b/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()
 

From 446e38854df0743d07a2310aca405785ca5dda3d Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 12 Sep 2024 16:43:53 +0200
Subject: [PATCH 11/29] fix: remove other pointless init

---
 tasks/forms.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tasks/forms.py b/tasks/forms.py
index 9671e514..f8878f6f 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -115,9 +115,6 @@ class Meta:
             "feedback": BootstrapRadioSelect(choices=YES_NO),
         }
 
-    def __init__(self, *args, **kwargs):
-        super(TaskForm, self).__init__(*args, **kwargs)
-
     def get_soft_validation_fields(self):
         # All fields should be validated softly
         return self.fields.keys()

From 6ec1e40ec07b2d17523b0312c7f46503392876db Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 12 Sep 2024 16:49:51 +0200
Subject: [PATCH 12/29] feat: let stepper do validation

---
 proposals/utils/checkers.py          | 35 +++++++++++++-
 proposals/utils/stepper_helpers.py   | 17 ++++++-
 proposals/utils/validate_proposal.py | 71 ++++++----------------------
 proposals/views/proposal_views.py    |  2 +-
 studies/forms.py                     |  2 +
 5 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index 9a71b5ad..c5f951c9 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -67,6 +67,7 @@ def check(self):
             parent=self.parent,
             form_object=self.proposal,
             form_class=self.form_class,
+            form_kwargs = {},
             url_func=self.get_url,
         )
         self.stepper.items.append(
@@ -333,7 +334,11 @@ def get_url(
             "proposals:study_start",
             args=[self.proposal.pk],
         )
-
+    
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["proposal"] = self.proposal
+        return kwargs
 
 class StudyChecker(
     Checker,
@@ -438,7 +443,14 @@ def get_url(
                 self.study.pk,
             ],
         )
-
+    
+    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,
@@ -500,6 +512,9 @@ def get_url(
                 self.study.pk,
             ],
         )
+    
+    def get_form_object(self):
+        return self.study
 
 
 class InterventionChecker(
@@ -536,6 +551,11 @@ def get_form_object(
         self,
     ):
         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,
@@ -605,6 +625,11 @@ def get_form_object(
         self,
     ):
         return self.study.observation
+    
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["study"] = self.study
+        return kwargs
 
 
 class SessionsChecker(
@@ -846,3 +871,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
diff --git a/proposals/utils/stepper_helpers.py b/proposals/utils/stepper_helpers.py
index c1492b2e..4e244d70 100644
--- a/proposals/utils/stepper_helpers.py
+++ b/proposals/utils/stepper_helpers.py
@@ -156,6 +156,7 @@ def make_stepper_item(self):
             parent=self.parent,
             form_object=self.get_form_object(),
             form_class=self.form_class,
+            form_kwargs=self.get_form_kwargs(),
             url_func=self.get_url,
             location=self.location,
         )
@@ -166,6 +167,15 @@ def get_form_object(
     ):
         # Overwrite method for other objects
         return self.proposal
+    
+    def get_form_kwargs(self):
+        # Overwrite for specific form_kwargs
+
+        return {}
+    
+    def get_title(self):
+        # Overwrite for custom title (eg. studies, sessions etc.)
+        return self.title
 
 
 class ModelFormItem(
@@ -179,6 +189,9 @@ def __init__(self, *args, **kwargs):
         self.form_object = kwargs.pop(
             "form_object",
         )
+        self.form_kwargs = kwargs.pop(
+            "form_kwargs",
+        )
         get_url = kwargs.pop(
             "url_func",
             None,
@@ -211,7 +224,7 @@ def get_form_kwargs(self):
         This method can be overidden to provide extra kwargs to the form. But
         kwargs that pop up often can also be added to this base class.
         """
-        kwargs = {}
+        kwargs = self.form_kwargs
         if issubclass(self.form_class, UserKwargModelFormMixin):
             kwargs["user"] = self.stepper.request.user
         return kwargs
@@ -221,7 +234,7 @@ def instantiate_form(self):
             raise ImproperlyConfigured("form_class must be defined")
         kwargs = self.get_form_kwargs()
         model_form = self.form_class(
-            instance=self.get_form_object(),
+            instance=self.form_object,
             **kwargs,
         )
         return model_form
diff --git a/proposals/utils/validate_proposal.py b/proposals/utils/validate_proposal.py
index 1133447d..4bc0a508 100644
--- a/proposals/utils/validate_proposal.py
+++ b/proposals/utils/validate_proposal.py
@@ -13,20 +13,9 @@
 from observations.forms import ObservationForm
 from studies.forms import StudyForm, StudyDesignForm, StudyEndForm
 from tasks.forms import SessionUpdateForm, SessionEndForm, TaskForm, SessionOverviewForm
-from ..forms import (
-    ProposalForm,
-    ResearcherForm,
-    OtherResearchersForm,
-    FundingForm,
-    ResearchGoalForm,
-    PreApprovedForm,
-    WmoForm,
-    StudyStartForm,
-    WmoApplicationForm,
-    TranslatedConsentForms,
-    ProposalDataManagementForm,
-)
+
 from ..models import Proposal
+from proposals.utils.stepper import Stepper
 
 from django.utils.translation import gettext_lazy as _
 from django.urls import reverse_lazy as reverse
@@ -269,54 +258,22 @@ def _build_forms(proposal: Proposal) -> OrderedDict:
     return forms
 
 
-def get_form_errors(proposal: Proposal) -> list:
-    forms = _build_forms(proposal)
+def get_form_errors(stepper: Stepper) -> list:
 
     troublesome_pages = []
-
-    for key, form in forms.items():
-        form_class, url, page_name, obj = form
-        try:
-            kwargs = {
-                "instance": obj,
-            }
-
-            if issubclass(form_class, UserKwargModelFormMixin):
-                # This is a bit ugly of course, as we should be getting the
-                # authenticated used. But as only the owner will use this method,
-                # it's the same thing.
-                kwargs["user"] = proposal.created_by
-
-            if issubclass(form_class, (StudyStartForm, StudyForm)):
-                kwargs["proposal"] = proposal
-
-            if issubclass(
-                form_class,
-                (
-                    InterventionForm,
-                    ObservationForm,
-                    SessionUpdateForm,
-                ),
-            ):
-                kwargs["study"] = obj.study
-
-            instance = form_class(**kwargs)
-
-            for field, error in instance.errors.items():
-                if field in instance.fields or field == "__all__":
-                    troublesome_pages.append(
-                        {
-                            "url": url,
-                            "page_name": page_name,
-                        }
-                    )
-                    break  # prevent duplicates for this field
-        except:
-            # If for some reason validation completely fails, we can assume
-            # _something_ is not right and the page contains an error.
+    study_titles = [study.name for study in stepper.proposal.study_set.all()]
+
+    for item in stepper.items:
+        if hasattr(item, "form_class") and item.form_class == SessionOverviewForm:
+            troublesome_pages.extend(validate_sessions_tasks(item.study))
+        if item.get_errors():
+            if item.parent and item.parent.title in study_titles:
+                page_name = f"{item.parent.title}: {item.title}"
+            else:
+                page_name = item.title
             troublesome_pages.append(
                 {
-                    "url": url,
+                    "url": item.get_url(),
                     "page_name": page_name,
                 }
             )
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 4b897dcb..59175079 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -588,7 +588,7 @@ def get_form_kwargs(self):
     def get_context_data(self, **kwargs):
         context = super(ProposalSubmit, self).get_context_data(**kwargs)
 
-        context["troublesome_pages"] = get_form_errors(self.get_object())
+        context["troublesome_pages"] = get_form_errors(context["stepper"])
         context["pagenr"] = self._get_page_number()
         context["is_supervisor_edit_phase"] = self.is_supervisor_edit_phase()
         context["start_date_warning"] = self.check_start_date()
diff --git a/studies/forms.py b/studies/forms.py
index aac7cadb..3a15971b 100644
--- a/studies/forms.py
+++ b/studies/forms.py
@@ -233,6 +233,8 @@ def clean(self):
         Check for conditional requirements:
         - at least one of the fields has to be checked
         """
+        #NOTE: this clean still does not get called during validation ...
+        #WHYYYY????
         cleaned_data = super(StudyDesignForm, self).clean()
 
         # This solution is a bit funky, but by using add_error(), it appends our

From 36e04773cc40315596cb58a3e3c8730bff599565 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 12 Sep 2024 16:50:34 +0200
Subject: [PATCH 13/29] feat: method to validate sessions and tasks

---
 proposals/utils/validate_proposal.py | 275 ++++-----------------------
 1 file changed, 39 insertions(+), 236 deletions(-)

diff --git a/proposals/utils/validate_proposal.py b/proposals/utils/validate_proposal.py
index 4bc0a508..a7347982 100644
--- a/proposals/utils/validate_proposal.py
+++ b/proposals/utils/validate_proposal.py
@@ -1,17 +1,11 @@
 """
 This file contains code for validating a proposal by using all the relevant
-forms and their validation code.
+forms and their validation code. This is mostly handled by the Stepper, except
+for sessions and tasks.
 
 Used for the submit page, to check if a user has completed the proposal.
 """
 
-from collections import OrderedDict
-
-from braces.forms import UserKwargModelFormMixin
-
-from interventions.forms import InterventionForm
-from observations.forms import ObservationForm
-from studies.forms import StudyForm, StudyDesignForm, StudyEndForm
 from tasks.forms import SessionUpdateForm, SessionEndForm, TaskForm, SessionOverviewForm
 
 from ..models import Proposal
@@ -21,241 +15,50 @@
 from django.urls import reverse_lazy as reverse
 
 
-def _build_forms(proposal: Proposal) -> OrderedDict:
-    forms = OrderedDict()
-
-    wmo_update_url = "proposals:wmo_update"
-    wmo_application_url = "proposals:wmo_application"
-
-    forms["start"] = (
-        ProposalForm,
-        reverse("proposals:update", args=[proposal.pk]),
-        _("Algemene informatie over de aanvraag"),
-        proposal,
-    )
-
-    forms["Researcher"] = (
-        ResearcherForm,
-        reverse("proposals:researcher", args=[proposal.pk]),
-        _("Informatie over de onderzoeker"),
-        proposal,
-    )
-
-    forms["OtherResearchers"] = (
-        OtherResearchersForm,
-        reverse("proposals:other_researchers", args=[proposal.pk]),
-        _("Informatie over betrokken onderzoekers"),
-        proposal,
-    )
-
-    if not proposal.is_pre_assessment:
-        forms["Funding"] = (
-            FundingForm,
-            reverse("proposals:funding", args=[proposal.pk]),
-            _("Informatie over financiering"),
-            proposal,
-        )
-
-    forms["ResearchGoal"] = (
-        ResearchGoalForm,
-        reverse("proposals:research_goal", args=[proposal.pk]),
-        _("Informatie over het onderzoeksdoel"),
-        proposal,
-    )
-
-    if proposal.is_pre_assessment:
-        wmo_update_url = "proposals:wmo_update_pre"
-
-    if proposal.is_pre_approved:
-        forms["PreApproved"] = (
-            PreApprovedForm,
-            reverse("proposals:pre_approved", args=[proposal.pk]),
-            _("Informatie over eerdere toetsing"),
-            proposal,
-        )
-
-    # For pre approved proposals, we're done already!
-    if proposal.is_pre_approved:
-        return forms
+def validate_sessions_tasks(study):
+    """As we do currently not have individual tasks and sessions in the 
+    stepper, these forms get instantiated and checked for errors separately
+    in this function."""
 
-    if hasattr(proposal, "wmo"):
-        forms["wmo_form"] = (
-            WmoForm,
-            reverse(wmo_update_url, args=[proposal.wmo.pk]),
-            _("Ethische toetsing nodig door een METC?"),
-            proposal.wmo,
-        )
-        if proposal.wmo.status != proposal.wmo.WMOStatuses.NO_WMO:
-            forms["wmo_application"] = (
-                WmoApplicationForm,
-                reverse(wmo_application_url, args=[proposal.pk]),
-                _("Ethische toetsing nodig door een METC?"),
-                proposal.wmo,
-            )
-
-    # Now we're done for pre assessment proposals
-    if proposal.is_pre_assessment:
-        return forms
-
-    forms["study_start"] = (
-        StudyStartForm,
-        reverse("proposals:study_start", args=[proposal.pk]),
-        _("Eén of meerdere trajecten?"),
-        proposal,
-    )
-
-    for study in proposal.study_set.all():
-        key_base = "study_{}".format(study.pk)
-
-        start_key = "{}_start".format(key_base)
-        forms[start_key] = (
-            StudyForm,
-            reverse("studies:update", args=[study.pk]),
-            _("De deelnemers (traject {})").format(study.order),
-            study,
-        )
-
-        design_key = "{}_design".format(key_base)
-        forms[design_key] = (
-            StudyDesignForm,
-            reverse("studies:design", args=[study.pk]),
-            _("De onderzoekstype(n) (traject {})").format(study.order),
-            study,
-        )
-
-        end_key = "{}_end".format(key_base)
-        forms[end_key] = (
-            StudyEndForm,
-            reverse("studies:design_end", args=[study.pk]),
-            _("Trajectoverzicht (traject {})").format(study.order),
-            study,
-        )
-
-        if study.has_intervention:
-            intervention_key = "{}_intervention".format(key_base)
-            if hasattr(study, "intervention"):
-                forms[intervention_key] = (
-                    InterventionForm,
-                    reverse("interventions:update", args=[study.intervention.pk]),
-                    _("Het interventieonderzoek (traject {})").format(
-                        study.order,
-                    ),
-                    study.intervention,
-                )
-            else:
-                forms[intervention_key] = (
-                    InterventionForm,
-                    reverse("interventions:create", args=[study.pk]),
-                    _("Het interventieonderzoek (traject {})").format(
-                        study.order,
-                    ),
-                    None,
-                )
+    troublesome_session_pages = []
 
-        if study.has_observation:
-            observation_key = "{}_observation".format(key_base)
-            if hasattr(study, "observation"):
-                forms[observation_key] = (
-                    ObservationForm,
-                    reverse("observations:update", args=[study.observation.pk]),
-                    _("Het observatieonderzoek (traject {})").format(
-                        study.order,
-                    ),
-                    study.observation,
-                )
-            else:
-                forms[observation_key] = (
-                    ObservationForm,
-                    reverse("observations:create", args=[study.pk]),
-                    _("Het observatieonderzoek (traject {})").format(
-                        study.order,
-                    ),
-                    None,
-                )
-
-        if study.has_no_sessions():
-            session_overview_key = "{}_session_overview".format(
-                key_base,
-            )
-            forms[session_overview_key] = (
-                SessionOverviewForm,
-                reverse(
-                    "tasks:session_overview",
-                    args=[
-                        study.pk,
-                    ],
-                ),
-                _("Overzicht van het takenonderzoek (traject {})").format(
-                    study.order,
-                ),
-                study,
-            )
-        elif study.has_sessions:
-            for session in study.session_set.all():
-                session_start_key = "{}_session_{}_start".format(
-                    key_base,
-                    session.pk,
-                )
-
-                forms[session_start_key] = (
-                    SessionUpdateForm,
-                    reverse("tasks:session_update", args=[session.pk]),
-                    _("Het takenonderzoek: sessie {} (traject {})").format(
+    for session in study.session_set.all():
+        # Check if errors in instantiated form
+        if SessionUpdateForm(instance=session, study=study).errors:
+            # if so, append dict, with url and formatted page name
+            troublesome_session_pages.append(
+                {
+                    "url": reverse("tasks:session_update", args=[session.pk]),
+                    "page_name": _("{}: sessie {}").format(
+                        study.name,
                         session.order,
-                        study.order,
                     ),
-                    session,
-                )
-
-                for task in session.task_set.all():
-                    task_key = "{}_session_{}_task_{}".format(
-                        key_base,
-                        session.pk,
-                        task.pk,
-                    )
-
-                    forms[task_key] = (
-                        TaskForm,
-                        reverse("tasks:update", args=[task.pk]),
-                        _("Het takenonderzoek: sessie {} taak {} (traject {})").format(
-                            session.order,
-                            task.order,
-                            study.order,
-                        ),
-                        task,
+                }
+            )
+            for task in session.task_set.all():
+                if TaskForm(instance=task).errors:
+                    troublesome_session_pages.append(
+                        {
+                            "url": reverse("tasks:update", args=[task.pk]),
+                            "page_name": _("{}: sessie {}, taak {}").format(
+                                study.name,
+                                session.order,
+                                task.order,
+                            ),
+                        }
                     )
-
-                session_end_key = "{}_session_{}_end".format(
-                    key_base,
-                    session.pk,
-                    session,
-                )
-
-                forms[session_end_key] = (
-                    SessionEndForm,
-                    reverse("tasks:session_end", args=[session.pk]),
-                    _("Overzicht van takenonderzoek: sessie {} (traject {})").format(
+        if SessionEndForm(instance=session).errors:
+            # if so, append tuple, with url and formatted page name
+            troublesome_session_pages.append(
+                {
+                    "url": reverse("tasks:session_end", args=[session.pk]),
+                    "page_name": _("{}: sessie {} overzicht").format(
+                        study.name,
                         session.order,
-                        study.order,
                     ),
-                    session,
-                )
-
-    forms["translated"] = (
-        TranslatedConsentForms,
-        reverse("proposals:translated", args=[proposal.pk]),
-        _("Vertaling informed consent formulieren"),
-        proposal,
-    )
-
-    forms["data_management"] = (
-        ProposalDataManagementForm,
-        reverse("proposals:data_management", args=[proposal.pk]),
-        _("AVG en Data Management"),
-        proposal,
-    )
-
-    return forms
+                }
+            )
+    return troublesome_session_pages
 
 
 def get_form_errors(stepper: Stepper) -> list:

From e09b50fed53a0a0fec28447bf17253dbba71ebd6 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 12 Sep 2024 16:51:04 +0200
Subject: [PATCH 14/29] feat: improve sessionEndForm.clean()

---
 tasks/forms.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tasks/forms.py b/tasks/forms.py
index f8878f6f..c8f65ba1 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -174,7 +174,12 @@ def clean(self):
 
         tasks_duration = self.cleaned_data.get("tasks_duration")
 
-        if tasks_duration is not None and tasks_duration < self.instance.net_duration():
+        if not tasks_duration:
+            self.add_error(
+                "tasks_duration",
+                _("Totale sessieduur is nog niet ingevuld."),
+            )
+        elif tasks_duration < self.instance.net_duration():
             self.add_error(
                 "tasks_duration",
                 _("Totale sessieduur moet minstens gelijk zijn aan netto sessieduur."),

From c87b1e7ce5cf3449a68eccb68e5b4e4babd7eee3 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 12 Sep 2024 16:51:46 +0200
Subject: [PATCH 15/29] feat: turn WmoChecker into ModelFormChecker

---
 proposals/utils/checkers.py | 106 +++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 49 deletions(-)

diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index c5f951c9..1b2715a5 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -187,60 +187,22 @@ def get_url(self):
             args=(self.proposal.pk,),
         )
 
-class WMOItem(
-    StepperItem,
-):
-    location = "wmo"
-    title = _("WMO")
-
-    def __init__(
-        self,
-        *args,
-        **kwargs,
-    ):
-        super().__init__(*args, **kwargs)
-        self.proposal = self.stepper.proposal
-        self.wmo = self.get_wmo()
-
-    def get_wmo(
-        self,
-    ):
-        if hasattr(
-            self.proposal,
-            "wmo",
-        ):
-            return self.proposal.wmo
-        return None
-
-    def get_url(
-        self,
-    ):
-        if self.proposal.is_pre_assessment:
-            pre_suffix = "_pre"
-        else:
-            pre_suffix = ""
-        if self.wmo:
-            return reverse(
-                f"proposals:wmo_update{pre_suffix}",
-                args=[self.wmo.pk],
-            )
-        else:
-            return reverse(
-                f"proposals:wmo_create{pre_suffix}",
-                args=[self.proposal.pk],
-            )
-
-
 class WMOChecker(
-    Checker,
+    ModelFormChecker
 ):
+    
+    title = "WMO"
+    form_class = proposal_forms.WmoForm
+    location = "wmo"
 
     def check(
         self,
     ):
-        self.item = WMOItem(self.stepper)
-        self.stepper.items.append(self.item)
-        if self.item.wmo:
+        self.item = self.make_stepper_item()
+        self.stepper.items.append(
+            self.item,
+        )
+        if self.object_exists():
             return self.check_wmo()
         else:
             return []
@@ -252,7 +214,7 @@ def check_wmo(
         This method should check the correctness of the
         WMO object.
         """
-        if self.item.wmo.status != Wmo.WMOStatuses.NO_WMO:
+        if self.proposal.wmo.status != Wmo.WMOStatuses.NO_WMO:
             return [WMOApplicationChecker(
                 self.stepper,
                 parent=self.item,
@@ -260,6 +222,52 @@ def check_wmo(
         if self.proposal.is_pre_assessment:
             return [SubmitChecker]
         return [TrajectoriesChecker]
+    
+    def get_url(self):
+        if self.object_exists():
+            return self.get_update_url()
+        else:
+            return self.get_create_url()
+    
+    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],
+        )
+
+    def get_update_url(
+        self,
+    ):
+        if self.proposal.is_pre_assessment:
+            url = "proposals:wmo_update_pre"
+        else:
+            url = "proposals:wmo_update"
+        return reverse(
+            url,
+            args=[self.proposal.wmo.pk],
+        )
+
+    def get_form_object(
+        self,
+    ):
+        if self.object_exists():
+            return self.proposal.wmo
+        else:
+            return None
 
 class WMOApplicationChecker(ModelFormChecker):
 

From 71cbd123814d0c81193c495b894641e05391089d Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 12 Sep 2024 16:52:10 +0200
Subject: [PATCH 16/29] feat: implement some more css

---
 proposals/utils/stepper_helpers.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/proposals/utils/stepper_helpers.py b/proposals/utils/stepper_helpers.py
index 4e244d70..fdcc9d94 100644
--- a/proposals/utils/stepper_helpers.py
+++ b/proposals/utils/stepper_helpers.py
@@ -80,7 +80,7 @@ def css_classes(
             classes.append(
                 "active",
             )
-        if not self.get_url():
+        elif not self.get_url():
             classes.append(
                 "disabled",
             )
@@ -128,6 +128,14 @@ def is_current(self, request):
         we say they are never current. The child is.
         """
         return False
+    
+    def css_classes(self):
+        css_classes = super().css_classes()
+        if self.children[0].get_errors():
+            css_classes += " incomplete"
+        else:
+            css_classes += " complete"
+        return css_classes
 
 
 class ModelFormChecker(
@@ -247,6 +255,17 @@ def get_errors(self):
         might insert into this item.
         """
         return self.model_form.errors
+    
+    def css_classes(self):
+        css_classes = super().css_classes()
+
+        if self.get_errors():
+            css_classes += " incomplete"
+        else:
+            css_classes += " complete"
+        return css_classes
+        
+
 
 
 class UpdateOrCreateChecker(

From 09f850f0f156830ca903672a4bd0e5260ca38fe0 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 12 Sep 2024 17:19:04 +0200
Subject: [PATCH 17/29] fix: remove unused function

---
 proposals/utils/stepper_helpers.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/proposals/utils/stepper_helpers.py b/proposals/utils/stepper_helpers.py
index fdcc9d94..8b5198ef 100644
--- a/proposals/utils/stepper_helpers.py
+++ b/proposals/utils/stepper_helpers.py
@@ -180,10 +180,6 @@ def get_form_kwargs(self):
         # Overwrite for specific form_kwargs
 
         return {}
-    
-    def get_title(self):
-        # Overwrite for custom title (eg. studies, sessions etc.)
-        return self.title
 
 
 class ModelFormItem(

From b14793657db3664928a5a0a545e73c5bb1135c64 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 12 Sep 2024 17:29:22 +0200
Subject: [PATCH 18/29] style: paint it black

---
 proposals/utils/checkers.py          | 65 ++++++++++++++++------------
 proposals/utils/stepper.py           |  2 +-
 proposals/utils/stepper_helpers.py   |  8 ++--
 proposals/utils/validate_proposal.py |  2 +-
 proposals/views/proposal_views.py    |  4 +-
 proposals/views/wmo_views.py         |  4 +-
 studies/forms.py                     |  4 +-
 7 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index 1b2715a5..248852b7 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -28,7 +28,11 @@ class ProposalTypeChecker(
 
     def check(self):
         """Each proposal type receives a specific create checker and layout"""
-        from .stepper import RegularProposalLayout, PreApprProposalLayout, PreAssProposalLayout
+        from .stepper import (
+            RegularProposalLayout,
+            PreApprProposalLayout,
+            PreAssProposalLayout,
+        )
 
         if self.proposal.is_pre_approved:
             self.stepper.layout = PreApprProposalLayout
@@ -67,7 +71,7 @@ def check(self):
             parent=self.parent,
             form_object=self.proposal,
             form_class=self.form_class,
-            form_kwargs = {},
+            form_kwargs={},
             url_func=self.get_url,
         )
         self.stepper.items.append(
@@ -158,10 +162,12 @@ 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 [
+                PreApprovedChecker(
+                    self.stepper,
+                    parent=self.parent,
+                )
+            ]
         return [WMOChecker]
 
     def get_url(self):
@@ -170,27 +176,27 @@ def get_url(self):
             args=(self.proposal.pk,),
         )
 
+
 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
-):
-    
+
+class WMOChecker(ModelFormChecker):
+
     title = "WMO"
     form_class = proposal_forms.WmoForm
     location = "wmo"
@@ -215,20 +221,22 @@ def check_wmo(
         WMO object.
         """
         if self.proposal.wmo.status != Wmo.WMOStatuses.NO_WMO:
-            return [WMOApplicationChecker(
-                self.stepper,
-                parent=self.item,
-            )]
+            return [
+                WMOApplicationChecker(
+                    self.stepper,
+                    parent=self.item,
+                )
+            ]
         if self.proposal.is_pre_assessment:
             return [SubmitChecker]
         return [TrajectoriesChecker]
-    
+
     def get_url(self):
         if self.object_exists():
             return self.get_update_url()
         else:
             return self.get_create_url()
-    
+
     def object_exists(
         self,
     ):
@@ -269,6 +277,7 @@ def get_form_object(
         else:
             return None
 
+
 class WMOApplicationChecker(ModelFormChecker):
 
     title = _("WMO applicatie")
@@ -281,7 +290,7 @@ def check(self):
         if self.proposal.is_pre_assessment:
             return [SubmitChecker]
         return [TrajectoriesChecker]
-    
+
     def get_url(self):
         if self.proposal.is_pre_assessment:
             pre_suffix = "_pre"
@@ -291,7 +300,7 @@ def get_url(self):
             f"proposals:wmo_application{pre_suffix}",
             args=(self.proposal.wmo.pk,),
         )
-    
+
     def get_form_object(self):
         return self.proposal.wmo
 
@@ -342,12 +351,13 @@ def get_url(
             "proposals:study_start",
             args=[self.proposal.pk],
         )
-    
+
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs["proposal"] = self.proposal
         return kwargs
 
+
 class StudyChecker(
     Checker,
 ):
@@ -451,15 +461,16 @@ def get_url(
                 self.study.pk,
             ],
         )
-    
+
     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,
 ):
@@ -520,7 +531,7 @@ def get_url(
                 self.study.pk,
             ],
         )
-    
+
     def get_form_object(self):
         return self.study
 
@@ -559,7 +570,7 @@ def get_form_object(
         self,
     ):
         return self.study.intervention
-    
+
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs["study"] = self.study
@@ -633,7 +644,7 @@ def get_form_object(
         self,
     ):
         return self.study.observation
-    
+
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs["study"] = self.study
@@ -879,7 +890,7 @@ def get_url(
                 self.stepper.proposal.pk,
             ],
         )
-    
+
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
         kwargs["proposal"] = self.proposal
diff --git a/proposals/utils/stepper.py b/proposals/utils/stepper.py
index 0cf845b0..56eb0a19 100644
--- a/proposals/utils/stepper.py
+++ b/proposals/utils/stepper.py
@@ -165,5 +165,5 @@ def has_multiple_studies(
 PreAssProposalLayout = [
     ("create", _("Basisgegevens")),
     ("wmo", _("WMO")),
-    ("submit", _("Indienen")),    
+    ("submit", _("Indienen")),
 ]
diff --git a/proposals/utils/stepper_helpers.py b/proposals/utils/stepper_helpers.py
index 8b5198ef..b325b541 100644
--- a/proposals/utils/stepper_helpers.py
+++ b/proposals/utils/stepper_helpers.py
@@ -128,7 +128,7 @@ def is_current(self, request):
         we say they are never current. The child is.
         """
         return False
-    
+
     def css_classes(self):
         css_classes = super().css_classes()
         if self.children[0].get_errors():
@@ -175,7 +175,7 @@ def get_form_object(
     ):
         # Overwrite method for other objects
         return self.proposal
-    
+
     def get_form_kwargs(self):
         # Overwrite for specific form_kwargs
 
@@ -251,7 +251,7 @@ def get_errors(self):
         might insert into this item.
         """
         return self.model_form.errors
-    
+
     def css_classes(self):
         css_classes = super().css_classes()
 
@@ -260,8 +260,6 @@ def css_classes(self):
         else:
             css_classes += " complete"
         return css_classes
-        
-
 
 
 class UpdateOrCreateChecker(
diff --git a/proposals/utils/validate_proposal.py b/proposals/utils/validate_proposal.py
index a7347982..07e12295 100644
--- a/proposals/utils/validate_proposal.py
+++ b/proposals/utils/validate_proposal.py
@@ -16,7 +16,7 @@
 
 
 def validate_sessions_tasks(study):
-    """As we do currently not have individual tasks and sessions in the 
+    """As we do currently not have individual tasks and sessions in the
     stepper, these forms get instantiated and checked for errors separately
     in this function."""
 
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 59175079..c708f4d4 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -277,9 +277,7 @@ def get_next_url(self):
         return reverse("proposals:researcher", args=(self.object.pk,))
 
 
-class ProposalUpdate(
-    ProposalMixin, AllowErrorsOnBackbuttonMixin, UpdateView
-):
+class ProposalUpdate(ProposalMixin, AllowErrorsOnBackbuttonMixin, UpdateView):
     form_class = ProposalForm
 
     def form_valid(self, form):
diff --git a/proposals/views/wmo_views.py b/proposals/views/wmo_views.py
index 7d95addd..7e1e29f7 100644
--- a/proposals/views/wmo_views.py
+++ b/proposals/views/wmo_views.py
@@ -110,10 +110,11 @@ def get_next_url(self):
     def get_back_url(self):
         """Return to the Wmo overview"""
         return reverse("proposals:wmo_update", args=(self.object.pk,))
-    
+
     def get_proposal(self):
         return self.object.proposal
 
+
 class WmoCheck(generic.FormView):
     form_class = WmoCheckForm
     template_name = "proposals/wmo_check.html"
@@ -153,6 +154,7 @@ def get_next_url(self):
         else:
             return reverse("proposals:submit_pre", args=(wmo.proposal.pk,))
 
+
 ################
 # AJAX callbacks
 ################
diff --git a/studies/forms.py b/studies/forms.py
index 3a15971b..ea8ac01f 100644
--- a/studies/forms.py
+++ b/studies/forms.py
@@ -233,8 +233,8 @@ def clean(self):
         Check for conditional requirements:
         - at least one of the fields has to be checked
         """
-        #NOTE: this clean still does not get called during validation ...
-        #WHYYYY????
+        # NOTE: this clean still does not get called during validation ...
+        # WHYYYY????
         cleaned_data = super(StudyDesignForm, self).clean()
 
         # This solution is a bit funky, but by using add_error(), it appends our

From 69a2537bee2856ca5e08833955d67ad84ea48f9c Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 17 Sep 2024 10:46:33 +0200
Subject: [PATCH 19/29] fix: improve disabled stepper item

---
 main/templates/base/stepper.html      | 16 +++++++++++-----
 main/templates/base/stepper_item.html | 15 +++++++++++----
 proposals/utils/stepper_helpers.py    | 12 ++++++------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/main/templates/base/stepper.html b/main/templates/base/stepper.html
index 3895fc87..6f0ba0df 100644
--- a/main/templates/base/stepper.html
+++ b/main/templates/base/stepper.html
@@ -5,11 +5,17 @@
         {% counter counter create 1 %}
         {% for item in stepper.build_stepper %}
             <li>
-                <a class="stepper-item {{ item.css_classes }}" href="{{ item.get_url }}">
-                    <span class="stepper-bubble {{ bubble_size.0 }}">{% counter counter value %}</span>
-                    <span>{{ item.title }}</span>
-                </a>
-                {% counter depth create 1 %}
+                {% if item.is_disabled %}
+                    <div class="stepper-item disabled {{ item.css_classes }}" >
+                        <span class="stepper-bubble {{ bubble_size.0 }}">{% counter counter value %}</span>
+                        <span>{{ item.title }}</span>
+                    </div>
+                {% else %}
+                    <a class="stepper-item {{ item.css_classes }}" href="{{ item.get_url }}">
+                        <span class="stepper-bubble {{ bubble_size.0 }}">{% counter counter value %}</span>
+                        <span>{{ item.title }}</span>
+                    </a>
+                {% endif %}
                 {% if item.children %}
                     <ul>
                         {% for child in item.children %}
diff --git a/main/templates/base/stepper_item.html b/main/templates/base/stepper_item.html
index 76b240be..75b34f36 100644
--- a/main/templates/base/stepper_item.html
+++ b/main/templates/base/stepper_item.html
@@ -1,8 +1,15 @@
 <li>
-    <a class="stepper-item {{ item.css_classes }}" href="{{ item.get_url }}">
-        <span class="stepper-bubble {{ bubble_size.0 }}"></span>
-        <span>{{ item.title }}</span>
-    </a>
+    {% if item.is_disabled %}
+        <div class="stepper-item disabled {{ item.css_classes }}" >
+            <span class="stepper-bubble {{ bubble_size.0 }}"></span>
+            <span>{{ item.title }}</span>
+        </div>
+    {% else %}
+        <a class="stepper-item {{ item.css_classes }}" href="{{ item.get_url }}">
+            <span class="stepper-bubble {{ bubble_size.0 }}"></span>
+            <span>{{ item.title }}</span>
+        </a>
+    {% endif %}
     {% if item.children %}
         <ul>
             {% for child in item.children %}
diff --git a/proposals/utils/stepper_helpers.py b/proposals/utils/stepper_helpers.py
index b325b541..17d7a0f3 100644
--- a/proposals/utils/stepper_helpers.py
+++ b/proposals/utils/stepper_helpers.py
@@ -44,13 +44,12 @@ class StepperItem(
     title = "Stepper item"
     location = None
 
-    def __init__(self, stepper, parent=None, disabled=False, title=None, location=None):
+    def __init__(self, stepper, parent=None, title=None, location=None):
         self.stepper = stepper
         self.proposal = stepper.proposal
         self.children = []
         self.parent = parent
         self.available = False
-        self.disabled = disabled
         # Don't override default location if not provided explicitly
         if location:
             self.location = location
@@ -80,10 +79,6 @@ def css_classes(
             classes.append(
                 "active",
             )
-        elif not self.get_url():
-            classes.append(
-                "disabled",
-            )
         return " ".join(classes)
 
     def is_current(self, request):
@@ -94,6 +89,11 @@ def is_current(self, request):
         if request.path == self.get_url():
             return True
         return False
+    
+    def is_disabled(self):
+        if not self.get_url():
+            return True
+        return False
 
 
 class PlaceholderItem(StepperItem):

From 1aa20a3a6e0d0816c2234ce36a74b44efe224a63 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 17 Sep 2024 11:25:14 +0200
Subject: [PATCH 20/29] fix: stepper logic on proposal_form

---
 proposals/templates/proposals/proposal_form.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/proposals/templates/proposals/proposal_form.html b/proposals/templates/proposals/proposal_form.html
index fcb10960..d76f98e4 100644
--- a/proposals/templates/proposals/proposal_form.html
+++ b/proposals/templates/proposals/proposal_form.html
@@ -8,10 +8,10 @@
 {% endblock %}
 
 {% block stepper %}
-    {% if create %}
-        <!--No stepper on creation-->
-    {% else %}
+    {% if stepper %}
         {% include stepper %}
+    {% else %}
+        <!--No stepper on creation-->
     {% endif %}
 {% endblock %}
 

From 55b13874a7a048fab356852f2c1e9235ec554d2a Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 17 Sep 2024 12:18:13 +0200
Subject: [PATCH 21/29] fix: logic for ContainerItem css_classes

---
 proposals/utils/stepper_helpers.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/proposals/utils/stepper_helpers.py b/proposals/utils/stepper_helpers.py
index 17d7a0f3..301548f0 100644
--- a/proposals/utils/stepper_helpers.py
+++ b/proposals/utils/stepper_helpers.py
@@ -131,8 +131,11 @@ def is_current(self, request):
 
     def css_classes(self):
         css_classes = super().css_classes()
-        if self.children[0].get_errors():
-            css_classes += " incomplete"
+        child_errors = []
+        for child in self.children:
+            child_errors += child.get_errors()
+        if child_errors != []:
+            css_classes += "incomplete"
         else:
             css_classes += " complete"
         return css_classes

From 56ae70adc5848ac5fa8d303b0bfaa120c2b4b3e3 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 17 Sep 2024 14:32:30 +0200
Subject: [PATCH 22/29] fix: improve working of validate_proposal.py

---
 proposals/utils/validate_proposal.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/proposals/utils/validate_proposal.py b/proposals/utils/validate_proposal.py
index 07e12295..7563fc70 100644
--- a/proposals/utils/validate_proposal.py
+++ b/proposals/utils/validate_proposal.py
@@ -7,6 +7,9 @@
 """
 
 from tasks.forms import SessionUpdateForm, SessionEndForm, TaskForm, SessionOverviewForm
+from studies.forms import StudyForm, StudyDesignForm, StudyEndForm
+from observations.forms import ObservationForm
+from interventions.forms import InterventionForm
 
 from ..models import Proposal
 from proposals.utils.stepper import Stepper
@@ -15,7 +18,7 @@
 from django.urls import reverse_lazy as reverse
 
 
-def validate_sessions_tasks(study):
+def validate_sessions_tasks(study, multiple_studies):
     """As we do currently not have individual tasks and sessions in the
     stepper, these forms get instantiated and checked for errors separately
     in this function."""
@@ -29,8 +32,7 @@ def validate_sessions_tasks(study):
             troublesome_session_pages.append(
                 {
                     "url": reverse("tasks:session_update", args=[session.pk]),
-                    "page_name": _("{}: sessie {}").format(
-                        study.name,
+                    "page_name": _("Sessie {}").format(
                         session.order,
                     ),
                 }
@@ -40,8 +42,7 @@ def validate_sessions_tasks(study):
                     troublesome_session_pages.append(
                         {
                             "url": reverse("tasks:update", args=[task.pk]),
-                            "page_name": _("{}: sessie {}, taak {}").format(
-                                study.name,
+                            "page_name": _("Sessie {}, taak {}").format(
                                 session.order,
                                 task.order,
                             ),
@@ -52,25 +53,32 @@ def validate_sessions_tasks(study):
             troublesome_session_pages.append(
                 {
                     "url": reverse("tasks:session_end", args=[session.pk]),
-                    "page_name": _("{}: sessie {} overzicht").format(
-                        study.name,
+                    "page_name": _("Sessie {} overzicht").format(
                         session.order,
                     ),
                 }
             )
+            
+    if multiple_studies:
+        for dict in troublesome_session_pages:
+            dict["page_name"] = "{}: {}".format(
+                study.name,
+                dict["page_name"],
+            )
     return troublesome_session_pages
 
 
 def get_form_errors(stepper: Stepper) -> list:
 
     troublesome_pages = []
-    study_titles = [study.name for study in stepper.proposal.study_set.all()]
+    study_forms = [StudyForm, StudyEndForm, StudyDesignForm, InterventionForm, ObservationForm, SessionOverviewForm]
+    multiple_studies = len(stepper.proposal.study_set.all()) > 1 
 
     for item in stepper.items:
         if hasattr(item, "form_class") and item.form_class == SessionOverviewForm:
-            troublesome_pages.extend(validate_sessions_tasks(item.study))
+            troublesome_pages.extend(validate_sessions_tasks(item.study, multiple_studies))
         if item.get_errors():
-            if item.parent and item.parent.title in study_titles:
+            if multiple_studies and item.form_class in study_forms:
                 page_name = f"{item.parent.title}: {item.title}"
             else:
                 page_name = item.title

From 06d081be3ac2fcbf3f600311b817f8a376f547c9 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 17 Sep 2024 14:33:13 +0200
Subject: [PATCH 23/29] fix: minor fix for order of get_form_errors

---
 proposals/utils/validate_proposal.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proposals/utils/validate_proposal.py b/proposals/utils/validate_proposal.py
index 7563fc70..ca690d67 100644
--- a/proposals/utils/validate_proposal.py
+++ b/proposals/utils/validate_proposal.py
@@ -75,8 +75,6 @@ def get_form_errors(stepper: Stepper) -> list:
     multiple_studies = len(stepper.proposal.study_set.all()) > 1 
 
     for item in stepper.items:
-        if hasattr(item, "form_class") and item.form_class == SessionOverviewForm:
-            troublesome_pages.extend(validate_sessions_tasks(item.study, multiple_studies))
         if item.get_errors():
             if multiple_studies and item.form_class in study_forms:
                 page_name = f"{item.parent.title}: {item.title}"
@@ -88,5 +86,7 @@ def get_form_errors(stepper: Stepper) -> list:
                     "page_name": page_name,
                 }
             )
+        if hasattr(item, "form_class") and item.form_class == SessionOverviewForm:
+            troublesome_pages.extend(validate_sessions_tasks(item.study, multiple_studies))
 
     return troublesome_pages

From a33de8d2f1c104f0fdeedf06d302936504959a56 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 18 Sep 2024 11:02:17 +0200
Subject: [PATCH 24/29] feat: remove containerItems & reordering

---
 proposals/utils/checkers.py       | 71 +++++++++----------------------
 proposals/views/proposal_views.py |  6 +--
 proposals/views/study_views.py    |  9 ++--
 studies/views/study_views.py      |  2 +-
 4 files changed, 26 insertions(+), 62 deletions(-)

diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index 248852b7..43702e05 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -42,18 +42,11 @@ def check(self):
             self.stepper.layout = RegularProposalLayout
         return [ProposalCreateChecker]
 
-
-class BasicDetailsItem(
-    ContainerItem,
-):
-    title = _("Basisgegevens")
-    location = "create"
-
-
 class ProposalCreateChecker(
     ModelFormChecker,
 ):
-    title = _("Start")
+    title = _("Basisgegevens")
+    location = "create"
     form_class = proposal_forms.ProposalForm
 
     def get_url(self):
@@ -63,24 +56,22 @@ def get_url(self):
         )
 
     def check(self):
-        self.parent = BasicDetailsItem(self.stepper)
-        self.stepper.items.append(self.parent)
-        stepper_item = ModelFormItem(
+        self.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,
+            location=self.location
         )
         self.stepper.items.append(
-            stepper_item,
+            self.item,
         )
         return [
             ResearcherChecker(
                 self.stepper,
-                parent=self.parent,
+                parent=self.item,
             )
         ]
 
@@ -766,15 +757,6 @@ def get_url(
 class DocumentsChecker(
     Checker,
 ):
-    def make_stepper_item(
-        self,
-    ):
-        return ContainerItem(
-            self.stepper,
-            title=_("Documenten"),
-            location="attachments",
-        )
-
     def check(
         self,
     ):
@@ -785,13 +767,22 @@ def check(
                 self.stepper,
                 parent=item,
             ),
-            AttachmentsChecker(
-                self.stepper,
-                parent=item,
-            ),
         ]
 
 
+    def make_stepper_item(self):
+        url = reverse(
+            "proposals:consent",
+            args=[self.stepper.proposal.pk],
+        )
+        item = PlaceholderItem(
+            self.stepper,
+            title=_("Documenten"),
+            location="attachments",        )
+        item.get_url = lambda: url
+        return item
+
+
 class TranslationChecker(
     ModelFormChecker,
 ):
@@ -816,30 +807,6 @@ def get_url(
         )
 
 
-class AttachmentsChecker(
-    Checker,
-):
-
-    def check(
-        self,
-    ):
-        self.stepper.items.append(self.make_stepper_item())
-        return []
-
-    def make_stepper_item(self):
-        url = reverse(
-            "proposals:consent",
-            args=[self.stepper.proposal.pk],
-        )
-        item = PlaceholderItem(
-            self.stepper,
-            title=_("Documenten beheren"),
-            parent=self.parent,
-        )
-        item.get_url = lambda: url
-        return item
-
-
 class DataManagementChecker(
     ModelFormChecker,
 ):
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index c708f4d4..10241d45 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -491,11 +491,11 @@ class TranslatedConsentFormsView(ProposalContextMixin, UpdateView):
 
     def get_next_url(self):
         """Go to the consent form upload page"""
-        return reverse("proposals:consent", args=(self.object.pk,))
+        return reverse("proposals:data_management", args=(self.object.pk,))
 
     def get_back_url(self):
         """Return to the overview of the last Study"""
-        return reverse("studies:design_end", args=(self.object.last_study().pk,))
+        return reverse("proposals:consent", args=(self.object.pk,))
 
 
 class ProposalDataManagement(ProposalContextMixin, UpdateView):
@@ -509,7 +509,7 @@ def get_next_url(self):
 
     def get_back_url(self):
         """Return to the consent form overview of the last Study"""
-        return reverse("proposals:consent", args=(self.object.pk,))
+        return reverse("proposals:translated", args=(self.object.pk,))
 
 
 class ProposalUpdateDataManagement(GroupRequiredMixin, generic.UpdateView):
diff --git a/proposals/views/study_views.py b/proposals/views/study_views.py
index 79b428d5..654a78fa 100644
--- a/proposals/views/study_views.py
+++ b/proposals/views/study_views.py
@@ -113,14 +113,11 @@ def get_queryset(self):
         return documents
 
     def get_next_url(self):
-        """
-        If there is another Study in this Proposal, continue to that one.
-        Otherwise, go to the data management view.
-        """
         proposal = Proposal.objects.get(pk=self.kwargs.get("pk"))
-        return reverse("proposals:data_management", args=(proposal.pk,))
+        return reverse("proposals:translated", args=(proposal.pk,))
 
     def get_back_url(self):
         """Return to the Study design view"""
         proposal = Proposal.objects.get(pk=self.kwargs.get("pk"))
-        return reverse("proposals:translated", args=(proposal.pk,))
+        return reverse("studies:design_end", args=(proposal.last_study().pk,))
+
diff --git a/studies/views/study_views.py b/studies/views/study_views.py
index 2e7dcc3c..3b54454e 100644
--- a/studies/views/study_views.py
+++ b/studies/views/study_views.py
@@ -172,7 +172,7 @@ def get_next_url(self):
             next_study = Study.objects.get(proposal=proposal, order=next_order)
             return reverse("studies:update", args=(next_study.pk,))
         else:
-            return reverse("proposals:translated", args=(proposal.pk,))
+            return reverse("proposals:consent", args=(proposal.pk,))
 
     def get_back_url(self):
         study = self.object

From 8a103a61441b74667f0586c63bd110f14c6568f4 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 18 Sep 2024 11:04:35 +0200
Subject: [PATCH 25/29] feat: make stepper do validation

---
 .../templates/proposals/proposal_submit.html  |  4 +-
 proposals/utils/stepper.py                    | 36 ++++++++++++++++
 ...proposal.py => validate_sessions_tasks.py} | 42 +++----------------
 proposals/views/proposal_views.py             |  2 -
 4 files changed, 43 insertions(+), 41 deletions(-)
 rename proposals/utils/{validate_proposal.py => validate_sessions_tasks.py} (59%)

diff --git a/proposals/templates/proposals/proposal_submit.html b/proposals/templates/proposals/proposal_submit.html
index edbbdbc5..35640d5a 100644
--- a/proposals/templates/proposals/proposal_submit.html
+++ b/proposals/templates/proposals/proposal_submit.html
@@ -114,7 +114,7 @@ <h2>
             {% endif %}
         {% endfor %}
     {% endif %}
-    {% if troublesome_pages %}
+    {% if stepper.get_form_errors %}
         <div class="alert alert-primary mt-3">
             <h5 class="mt-1">
                 {% blocktrans trimmed %}
@@ -122,7 +122,7 @@ <h5 class="mt-1">
                 {% endblocktrans %}
             </h5>
             <ul>
-                {% for error_page in troublesome_pages %}
+                {% for error_page in stepper.get_form_errors %}
                     <li>
                         <a href="{{ error_page.url }}">{{ error_page.page_name }}</a>
                     </li>
diff --git a/proposals/utils/stepper.py b/proposals/utils/stepper.py
index 56eb0a19..8aceafaf 100644
--- a/proposals/utils/stepper.py
+++ b/proposals/utils/stepper.py
@@ -11,6 +11,13 @@
 
 from .checkers import ProposalTypeChecker
 
+from tasks.forms import SessionOverviewForm
+from studies.forms import StudyForm, StudyDesignForm, StudyEndForm
+from observations.forms import ObservationForm
+from interventions.forms import InterventionForm
+
+from proposals.utils.validate_sessions_tasks import validate_sessions_tasks
+
 
 class Stepper(renderable):
 
@@ -146,6 +153,35 @@ def has_multiple_studies(
         """
         num_studies = self.proposal.study_set.count()
         return num_studies > 1
+    
+    def get_form_errors(self):
+        """
+        A method providing validation of all the forms making up the proposal.
+        It return a list of dicts, with url's and formatted page name's
+        for pages with errors on them.
+        """
+
+        troublesome_pages = []
+        study_forms = [StudyForm, StudyEndForm, StudyDesignForm, InterventionForm, ObservationForm, SessionOverviewForm]
+
+        for item in self.items:
+            if item.get_errors():
+                if self.has_multiple_studies() and item.form_class in study_forms:
+                    page_name = f"{item.parent.title}: {item.title}"
+                else:
+                    page_name = item.title
+                troublesome_pages.append(
+                    {
+                        "url": item.get_url(),
+                        "page_name": page_name,
+                    }
+                )
+            #As individual sessions and tasks are not represented in the 
+            #stepper, these are validated through an external function. 
+            if hasattr(item, "form_class") and item.form_class == SessionOverviewForm:
+                troublesome_pages.extend(validate_sessions_tasks(item.study, self.has_multiple_studies()))
+
+        return troublesome_pages
 
 
 RegularProposalLayout = [
diff --git a/proposals/utils/validate_proposal.py b/proposals/utils/validate_sessions_tasks.py
similarity index 59%
rename from proposals/utils/validate_proposal.py
rename to proposals/utils/validate_sessions_tasks.py
index ca690d67..dd6b8f77 100644
--- a/proposals/utils/validate_proposal.py
+++ b/proposals/utils/validate_sessions_tasks.py
@@ -1,18 +1,10 @@
 """
-This file contains code for validating a proposal by using all the relevant
-forms and their validation code. This is mostly handled by the Stepper, except
-for sessions and tasks.
-
-Used for the submit page, to check if a user has completed the proposal.
+This file contains code for validating a proposal's sessions and tasks by using 
+all the relevant forms and their validation code. The proposal validation is 
+mostly handled by the Stepper, except for sessions and tasks.
 """
 
-from tasks.forms import SessionUpdateForm, SessionEndForm, TaskForm, SessionOverviewForm
-from studies.forms import StudyForm, StudyDesignForm, StudyEndForm
-from observations.forms import ObservationForm
-from interventions.forms import InterventionForm
-
-from ..models import Proposal
-from proposals.utils.stepper import Stepper
+from tasks.forms import SessionUpdateForm, SessionEndForm, TaskForm
 
 from django.utils.translation import gettext_lazy as _
 from django.urls import reverse_lazy as reverse
@@ -65,28 +57,4 @@ def validate_sessions_tasks(study, multiple_studies):
                 study.name,
                 dict["page_name"],
             )
-    return troublesome_session_pages
-
-
-def get_form_errors(stepper: Stepper) -> list:
-
-    troublesome_pages = []
-    study_forms = [StudyForm, StudyEndForm, StudyDesignForm, InterventionForm, ObservationForm, SessionOverviewForm]
-    multiple_studies = len(stepper.proposal.study_set.all()) > 1 
-
-    for item in stepper.items:
-        if item.get_errors():
-            if multiple_studies and item.form_class in study_forms:
-                page_name = f"{item.parent.title}: {item.title}"
-            else:
-                page_name = item.title
-            troublesome_pages.append(
-                {
-                    "url": item.get_url(),
-                    "page_name": page_name,
-                }
-            )
-        if hasattr(item, "form_class") and item.form_class == SessionOverviewForm:
-            troublesome_pages.extend(validate_sessions_tasks(item.study, multiple_studies))
-
-    return troublesome_pages
+    return troublesome_session_pages
\ No newline at end of file
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 10241d45..8c95b2c3 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -25,7 +25,6 @@
     UserAllowedMixin,
 )
 from observations.models import Observation
-from proposals.utils.validate_proposal import get_form_errors
 from proposals.utils.pdf_diff_logic import create_context_pdf, create_context_diff
 from reviews.mixins import CommitteeMixin, UsersOrGroupsAllowedMixin
 from reviews.utils.review_utils import start_review, start_review_pre_assessment
@@ -586,7 +585,6 @@ def get_form_kwargs(self):
     def get_context_data(self, **kwargs):
         context = super(ProposalSubmit, self).get_context_data(**kwargs)
 
-        context["troublesome_pages"] = get_form_errors(context["stepper"])
         context["pagenr"] = self._get_page_number()
         context["is_supervisor_edit_phase"] = self.is_supervisor_edit_phase()
         context["start_date_warning"] = self.check_start_date()

From 83f37fa7f0c5a7a5cb74f9ba21436f8a995a543b Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 18 Sep 2024 11:05:45 +0200
Subject: [PATCH 26/29] feat: allow for custom errors from checker

---
 proposals/utils/stepper_helpers.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/proposals/utils/stepper_helpers.py b/proposals/utils/stepper_helpers.py
index 301548f0..b7659d15 100644
--- a/proposals/utils/stepper_helpers.py
+++ b/proposals/utils/stepper_helpers.py
@@ -203,9 +203,14 @@ def __init__(self, *args, **kwargs):
             "url_func",
             None,
         )
-        self.errors = []
+        get_checker_errors = kwargs.pop(
+            "error_func",
+            None,
+        )
         if get_url:
             self.get_url = get_url
+        if get_checker_errors:
+            self.get_checker_errors = get_checker_errors
         return super().__init__(*args, **kwargs)
 
     @property
@@ -248,11 +253,12 @@ def instantiate_form(self):
 
     def get_errors(self):
         """
-        This is a placeholder that just returns the form errors for now.
-        But once we've figured out what we want exactly this method should
-        return both the form errors and any extra errors that a Checker
-        might insert into this item.
+        By default, this returns the errors of the instantiated form, which get
+        evaluated as a boolean. By passing a custom get_checker_errors function
+        from the checker, custom errors can be specified also.
         """
+        if hasattr(self, "get_checker_errors"):
+            return self.get_checker_errors() or self.model_form.errors
         return self.model_form.errors
 
     def css_classes(self):

From 3e20a8888986e7338cfdc71193b287bd639ebbdd Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 18 Sep 2024 11:06:15 +0200
Subject: [PATCH 27/29] feat: get_checker_errors for SessionsChecker

---
 proposals/utils/checkers.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index 43702e05..51aae7bb 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -673,7 +673,16 @@ def make_stepper_item(
         stepper item be bold for all underlying task/session views.
         Don't ask me how much time I spent on this.
         """
-        item = super().make_stepper_item()
+        item = ModelFormItem(
+            self.stepper,
+            title=self.title,
+            parent=self.parent,
+            form_object=self.get_form_object(),
+            form_class=self.form_class,
+            form_kwargs=self.get_form_kwargs(),
+            url_func=self.get_url,
+            error_func = self.get_checker_errors
+        )
 
         def modified_is_current(self, request):
             if request.path_info == self.get_url():
@@ -752,6 +761,14 @@ def get_url(
             "tasks:session_overview",
             args=[self.study.pk],
         )
+    
+    def get_checker_errors(self):
+        from proposals.utils.validate_sessions_tasks import validate_sessions_tasks
+
+        if validate_sessions_tasks(self.study, self.stepper.has_multiple_studies()):
+            return True
+        return 
+
 
 
 class DocumentsChecker(

From d902caf7538edbca4069721cb574be43fbc411f2 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 18 Sep 2024 11:12:43 +0200
Subject: [PATCH 28/29] style: formatting

---
 main/templates/base/stepper.html           |  2 +-
 main/templates/base/stepper_item.html      |  2 +-
 proposals/utils/checkers.py                | 14 +++++++-------
 proposals/utils/stepper.py                 | 19 ++++++++++++++-----
 proposals/utils/stepper_helpers.py         |  2 +-
 proposals/utils/validate_sessions_tasks.py |  4 ++--
 proposals/views/study_views.py             |  1 -
 7 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/main/templates/base/stepper.html b/main/templates/base/stepper.html
index 6f0ba0df..7f69a3ac 100644
--- a/main/templates/base/stepper.html
+++ b/main/templates/base/stepper.html
@@ -6,7 +6,7 @@
         {% for item in stepper.build_stepper %}
             <li>
                 {% if item.is_disabled %}
-                    <div class="stepper-item disabled {{ item.css_classes }}" >
+                    <div class="stepper-item disabled {{ item.css_classes }}">
                         <span class="stepper-bubble {{ bubble_size.0 }}">{% counter counter value %}</span>
                         <span>{{ item.title }}</span>
                     </div>
diff --git a/main/templates/base/stepper_item.html b/main/templates/base/stepper_item.html
index 75b34f36..8ae0ebbb 100644
--- a/main/templates/base/stepper_item.html
+++ b/main/templates/base/stepper_item.html
@@ -1,6 +1,6 @@
 <li>
     {% if item.is_disabled %}
-        <div class="stepper-item disabled {{ item.css_classes }}" >
+        <div class="stepper-item disabled {{ item.css_classes }}">
             <span class="stepper-bubble {{ bubble_size.0 }}"></span>
             <span>{{ item.title }}</span>
         </div>
diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index 51aae7bb..48e0777f 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -42,6 +42,7 @@ def check(self):
             self.stepper.layout = RegularProposalLayout
         return [ProposalCreateChecker]
 
+
 class ProposalCreateChecker(
     ModelFormChecker,
 ):
@@ -63,7 +64,7 @@ def check(self):
             form_class=self.form_class,
             form_kwargs={},
             url_func=self.get_url,
-            location=self.location
+            location=self.location,
         )
         self.stepper.items.append(
             self.item,
@@ -681,7 +682,7 @@ def make_stepper_item(
             form_class=self.form_class,
             form_kwargs=self.get_form_kwargs(),
             url_func=self.get_url,
-            error_func = self.get_checker_errors
+            error_func=self.get_checker_errors,
         )
 
         def modified_is_current(self, request):
@@ -761,14 +762,13 @@ def get_url(
             "tasks:session_overview",
             args=[self.study.pk],
         )
-    
+
     def get_checker_errors(self):
         from proposals.utils.validate_sessions_tasks import validate_sessions_tasks
 
         if validate_sessions_tasks(self.study, self.stepper.has_multiple_studies()):
             return True
-        return 
-
+        return
 
 
 class DocumentsChecker(
@@ -786,7 +786,6 @@ def check(
             ),
         ]
 
-
     def make_stepper_item(self):
         url = reverse(
             "proposals:consent",
@@ -795,7 +794,8 @@ def make_stepper_item(self):
         item = PlaceholderItem(
             self.stepper,
             title=_("Documenten"),
-            location="attachments",        )
+            location="attachments",
+        )
         item.get_url = lambda: url
         return item
 
diff --git a/proposals/utils/stepper.py b/proposals/utils/stepper.py
index 8aceafaf..d59c61ca 100644
--- a/proposals/utils/stepper.py
+++ b/proposals/utils/stepper.py
@@ -153,7 +153,7 @@ def has_multiple_studies(
         """
         num_studies = self.proposal.study_set.count()
         return num_studies > 1
-    
+
     def get_form_errors(self):
         """
         A method providing validation of all the forms making up the proposal.
@@ -162,7 +162,14 @@ def get_form_errors(self):
         """
 
         troublesome_pages = []
-        study_forms = [StudyForm, StudyEndForm, StudyDesignForm, InterventionForm, ObservationForm, SessionOverviewForm]
+        study_forms = [
+            StudyForm,
+            StudyEndForm,
+            StudyDesignForm,
+            InterventionForm,
+            ObservationForm,
+            SessionOverviewForm,
+        ]
 
         for item in self.items:
             if item.get_errors():
@@ -176,10 +183,12 @@ def get_form_errors(self):
                         "page_name": page_name,
                     }
                 )
-            #As individual sessions and tasks are not represented in the 
-            #stepper, these are validated through an external function. 
+            # As individual sessions and tasks are not represented in the
+            # stepper, these are validated through an external function.
             if hasattr(item, "form_class") and item.form_class == SessionOverviewForm:
-                troublesome_pages.extend(validate_sessions_tasks(item.study, self.has_multiple_studies()))
+                troublesome_pages.extend(
+                    validate_sessions_tasks(item.study, self.has_multiple_studies())
+                )
 
         return troublesome_pages
 
diff --git a/proposals/utils/stepper_helpers.py b/proposals/utils/stepper_helpers.py
index b7659d15..539348a4 100644
--- a/proposals/utils/stepper_helpers.py
+++ b/proposals/utils/stepper_helpers.py
@@ -89,7 +89,7 @@ def is_current(self, request):
         if request.path == self.get_url():
             return True
         return False
-    
+
     def is_disabled(self):
         if not self.get_url():
             return True
diff --git a/proposals/utils/validate_sessions_tasks.py b/proposals/utils/validate_sessions_tasks.py
index dd6b8f77..d367b503 100644
--- a/proposals/utils/validate_sessions_tasks.py
+++ b/proposals/utils/validate_sessions_tasks.py
@@ -50,11 +50,11 @@ def validate_sessions_tasks(study, multiple_studies):
                     ),
                 }
             )
-            
+
     if multiple_studies:
         for dict in troublesome_session_pages:
             dict["page_name"] = "{}: {}".format(
                 study.name,
                 dict["page_name"],
             )
-    return troublesome_session_pages
\ No newline at end of file
+    return troublesome_session_pages
diff --git a/proposals/views/study_views.py b/proposals/views/study_views.py
index 654a78fa..1c8843c6 100644
--- a/proposals/views/study_views.py
+++ b/proposals/views/study_views.py
@@ -120,4 +120,3 @@ def get_back_url(self):
         """Return to the Study design view"""
         proposal = Proposal.objects.get(pk=self.kwargs.get("pk"))
         return reverse("studies:design_end", args=(proposal.last_study().pk,))
-

From 3d7406440e59cb7267d234fc78296c478b645cd2 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 18 Sep 2024 11:23:48 +0200
Subject: [PATCH 29/29] fix: ensure get_cheker_errors outputs iterable

---
 proposals/utils/checkers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proposals/utils/checkers.py b/proposals/utils/checkers.py
index 48e0777f..ecc15ae8 100644
--- a/proposals/utils/checkers.py
+++ b/proposals/utils/checkers.py
@@ -767,8 +767,8 @@ def get_checker_errors(self):
         from proposals.utils.validate_sessions_tasks import validate_sessions_tasks
 
         if validate_sessions_tasks(self.study, self.stepper.has_multiple_studies()):
-            return True
-        return
+            return ["sub_page_errors"]
+        return []
 
 
 class DocumentsChecker(