Feature/revise study end questions 4

proposals/forms.py

@@ -851,7 +851,64 @@ def clean(self):
                 )
 
 
-class TranslatedConsentForms(SoftValidationMixin, ConditionalModelForm):
+class KnowledgeSecurityForm(SoftValidationMixin, ConditionalModelForm):
+
+    class Meta:
+        model = Proposal
+        fields = [
+            "knowledge_security",
+            "knowledge_security_details",
+            "researcher_risk",
+            "researcher_risk_details",
+        ]
+        widgets = {
+            "knowledge_security": BootstrapRadioSelect(),
+            "researcher_risk": BootstrapRadioSelect(),
+        }
+
+    _soft_validation_fields = [
+        "knowledge_security",
+        "knowledge_security_details",
+        "researcher_risk",
+        "researcher_risk_details",
+    ]
+
+    def __init__(self, *args, **kwargs):
+        """
+        - Set the Study for later reference
+        - Remove empty label from fields and reset the choices
+        """
+        super(KnowledgeSecurityForm, self).__init__(*args, **kwargs)
+
+        self.base_fields = (
+            "knowledge_security",
+            "researcher_risk",
+        )
+        for field in self.base_fields:
+            self.fields[field].empty_label = None
+            self.fields[field].choices = YesNoDoubt.choices
+
+    def clean(self):
+        """
+        Check for conditional requirements:
+        - If deception is set to yes, make sure deception_details has been filled out
+        - If negativity is set to yes, make sure negativity_details has been filled out
+        - If risk is set to yes, make sure risk_details has been filled out
+        """
+        cleaned_data = super(KnowledgeSecurityForm, self).clean()
+
+        self.mark_soft_required(cleaned_data, "knowledge_security", "researcher_risk")
+
+        for field in self.base_fields:
+            self.check_dependency_list(
+                cleaned_data,
+                f"{field}",
+                f"{field}_details",
+                f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT],
+            )
+
+
+class TranslatedConsentForm(SoftValidationMixin, ConditionalModelForm):
     class Meta:
         model = Proposal
         fields = ["translated_forms", "translated_forms_languages"]
@@ -862,7 +919,7 @@ class Meta:
     _soft_validation_fields = ["translated_forms", "translated_forms_languages"]
 
     def clean(self):
-        cleaned_data = super(TranslatedConsentForms, self).clean()
+        cleaned_data = super(TranslatedConsentForm, self).clean()
 
         if cleaned_data["translated_forms"] is None:
             self.add_error(

proposals/migrations/0054_proposal_knowledge_security_and_more.py

@@ -0,0 +1,49 @@
+# Generated by Django 4.2.11 on 2024-09-24 14:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("proposals", "0053_auto_20240201_1557"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="proposal",
+            name="knowledge_security",
+            field=models.CharField(
+                blank=True,
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                help_text="Kennisveiligheid gaat over het tijdig signaleren en mitigeren van veiligheidsrisico's bij wetenschappelijk onderzoek. Klik <a href='https://intranet.uu.nl/kennisbank/kennisveiligheid'>hier</a> voor meer informatie.",
+                max_length=1,
+                verbose_name="Zijn er kwesties rondom kennisveiligheid?",
+            ),
+        ),
+        migrations.AddField(
+            model_name="proposal",
+            name="knowledge_security_details",
+            field=models.TextField(
+                blank=True, max_length=200, verbose_name="Licht toe"
+            ),
+        ),
+        migrations.AddField(
+            model_name="proposal",
+            name="researcher_risk",
+            field=models.CharField(
+                blank=True,
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                help_text="Houd hierbij niet alleen rekening met mogelijke psychische of fysieke schade, maar ook met andere mogelijke schade, zoals bijv. hiërarchische machtsverhoudingen in veldwerk, mogelijke negatieve gevolgen voor de zichtbaarheid/vindbaarheid van de onderzoeker in in het publieke domein, juridische vervolging of aansprakelijkheid, e.d.",
+                max_length=1,
+                verbose_name="Zijn er kwesties rondom de veiligheid van of risico's voor de onderzoeker(s)?",
+            ),
+        ),
+        migrations.AddField(
+            model_name="proposal",
+            name="researcher_risk_details",
+            field=models.TextField(
+                blank=True, max_length=200, verbose_name="Licht toe"
+            ),
+        ),
+    ]

proposals/models.py

@@ -497,6 +497,42 @@ class PracticeReasons(models.IntegerChoices):
             MaxWordsValidator(SELF_ASSESSMENT_MAX_WORDS),
         ],
     )
+    knowledge_security = models.CharField(
+        _("Zijn er kwesties rondom kennisveiligheid?"),
+        help_text=mark_safe_lazy(
+            _(
+                "Kennisveiligheid gaat over het tijdig signaleren en mitigeren "
+                "van veiligheidsrisico's bij wetenschappelijk onderzoek. Klik "
+                "<a href='https://intranet.uu.nl/kennisbank/kennisveiligheid'>hier</a> "
+                "voor meer informatie."
+            )
+        ),
+        max_length=1,
+        choices=YesNoDoubt.choices,
+        blank=True,
+    )
+    knowledge_security_details = models.TextField(
+        _("Licht toe"), max_length=200, blank=True
+    )
+    researcher_risk = models.CharField(
+        _(
+            "Zijn er kwesties rondom de veiligheid van of risico's voor de onderzoeker(s)?"
+        ),
+        help_text=_(
+            "Houd hierbij niet alleen rekening met mogelijke psychische of "
+            "fysieke schade, maar ook met andere mogelijke schade, zoals bijv. "
+            "hiërarchische machtsverhoudingen in veldwerk, mogelijke negatieve "
+            "gevolgen voor de zichtbaarheid/vindbaarheid van de onderzoeker in "
+            "in het publieke domein, juridische vervolging of "
+            "aansprakelijkheid, e.d."
+        ),
+        max_length=1,
+        choices=YesNoDoubt.choices,
+        blank=True,
+    )
+    researcher_risk_details = models.TextField(
+        _("Licht toe"), max_length=200, blank=True
+    )
 
     # References to other models
     relation = models.ForeignKey(

proposals/templates/proposals/knowledge_security_form.html

@@ -0,0 +1,22 @@
+{% extends "base/fetc_form_base.html" %}
+
+{% load static %}
+{% load i18n %}
+
+{% block header_title %}
+    {% trans "Afronding trajecten" %} - {{ block.super }}
+{% endblock %}
+
+{% block html_head %}
+    {{ block.super }}
+    <script>
+        $(function () {
+            depends_on_list_value('knowledge_security', ['Y', '?'], 'knowledge_security_details');
+            depends_on_list_value('researcher_risk', ['Y', '?'], 'researcher_risk_details');
+        });
+    </script>
+{% endblock %}
+
+{% block pre-form-text %}
+    <h3>{% trans "Afronding trajecten" %}</h3>
+{% endblock %}

proposals/urls.py

@@ -44,6 +44,7 @@
     ProposalUpdateDataManagement,
     TranslatedConsentFormsView,
     ProposalUpdateDateStart,
+    ProposalKnowledgeSecurity,
 )
 
 from .views.study_views import StudyStart, StudyConsent
@@ -213,6 +214,11 @@
     ),
     path("confirm/<int:pk>/", ProposalConfirmation.as_view(), name="confirmation"),
     path("study_start/<int:pk>/", StudyStart.as_view(), name="study_start"),
+    path(
+        "knowledge_security/<int:pk>/",
+        ProposalKnowledgeSecurity.as_view(),
+        name="knowledge_security",
+    ),
     path("consent/<int:pk>/", StudyConsent.as_view(), name="consent"),
     path(
         "translated/<int:pk>/", TranslatedConsentFormsView.as_view(), name="translated"

proposals/utils/checkers.py

@@ -323,6 +323,7 @@ def remaining_checkers(
         self,
     ):
         return [
+            KnowledgeSecurityChecker(self.stepper, parent=self.item),
             DocumentsChecker,
             DataManagementChecker,
             SubmitChecker,
@@ -350,6 +351,24 @@ def get_form_kwargs(self):
         return kwargs
 
 
+class KnowledgeSecurityChecker(
+    ModelFormChecker,
+):
+    form_class = proposal_forms.KnowledgeSecurityForm
+    title = _("Traject afronding")
+
+    def check(self):
+        if self.stepper.has_multiple_studies():
+            self.title = _("Trajecten afronding")
+        self.stepper.items.append(self.make_stepper_item())
+        return []
+
+    def get_url(
+        self,
+    ):
+        return reverse("proposals:knowledge_security", args=[self.proposal.pk])
+
+
 class StudyChecker(
     Checker,
 ):
@@ -497,7 +516,7 @@ def get_url(
 class StudyEndChecker(
     ModelFormChecker,
 ):
-    title = _("Afronding")
+    title = _("Traject overzicht")
     form_class = study_forms.StudyEndForm
 
     def __init__(
@@ -803,7 +822,7 @@ def make_stepper_item(self):
 class TranslationChecker(
     ModelFormChecker,
 ):
-    form_class = proposal_forms.TranslatedConsentForms
+    form_class = proposal_forms.TranslatedConsentForm
     title = _("Vertalingen")
     location = "data_management"
 

proposals/utils/pdf_diff_logic.py

@@ -827,8 +827,6 @@ class StudyOverviewSection(BaseSection):
         "deception_details",
         "negativity",
         "negativity_details",
-        "stressful",
-        "stressful_details",
         "risk",
         "risk_details",
     ]
@@ -842,7 +840,7 @@ def get_row_fields(self):
         obj = self.obj
 
         rows_to_remove = []
-        for x in range(0, 7, 2):
+        for x in range(0, len(self.row_fields), 2):
             if getattr(obj, rows[x]) == "N":
                 rows_to_remove.append(rows[x + 1])
         rows = [row for row in rows if row not in rows_to_remove]
@@ -856,6 +854,30 @@ def get_row_fields(self):
         return rows
 
 
+class KnowledgeSecuritySection(BaseSection):
+    """This class receives a Proposal object."""
+
+    section_title = _("Kennisveiligheid en risico onderzoekers")
+    row_fields = [
+        "knowledge_security",
+        "knowledge_security_details",
+        "researcher_risk",
+        "researcher_risk_details",
+    ]
+
+    def get_row_fields(self):
+        rows = copy(self.row_fields)
+        obj = self.obj
+
+        rows_to_remove = []
+        for x in range(0, len(self.row_fields), 2):
+            if getattr(obj, rows[x]) == "N":
+                rows_to_remove.append(rows[x + 1])
+        rows = [row for row in rows if row not in rows_to_remove]
+
+        return rows
+
+
 class InformedConsentFormsSection(BaseSection):
     """This class receives a Documents object"""
 
@@ -997,24 +1019,24 @@ def get_extra_documents(obj):
     return extra_documents
 
 
-def create_context_pdf(context, model):
+def create_context_pdf(context, proposal):
     """A function to create the context for the PDF, which gets called in the ProposalAsPdf view."""
 
     sections = []
 
-    sections.append(GeneralSection(model))
+    sections.append(GeneralSection(proposal))
 
-    if hasattr(model, "wmo"):
-        sections.append(WMOSection(model.wmo))
+    if hasattr(proposal, "wmo"):
+        sections.append(WMOSection(proposal.wmo))
 
-        if not model.is_pre_assessment:
-            if model.wmo.status != model.wmo.WMOStatuses.NO_WMO:
-                sections.append(METCSection(model.wmo))
+        if not proposal.is_pre_assessment:
+            if proposal.wmo.status != proposal.wmo.WMOStatuses.NO_WMO:
+                sections.append(METCSection(proposal.wmo))
 
-            sections.append(TrajectoriesSection(model))
+            sections.append(TrajectoriesSection(proposal))
 
-            if model.wmo.status == model.wmo.WMOStatuses.NO_WMO:
-                for study in model.study_set.all():
+            if proposal.wmo.status == proposal.wmo.WMOStatuses.NO_WMO:
+                for study in proposal.study_set.all():
                     sections.append(StudySection(study))
                     if study.has_intervention:
                         sections.append(InterventionSection(study.intervention))
@@ -1029,15 +1051,17 @@ def create_context_pdf(context, model):
                     sections.append(StudyOverviewSection(study))
                     sections.append(InformedConsentFormsSection(study.documents))
 
-                extra_documents = get_extra_documents(model)
+                sections.append(KnowledgeSecuritySection(proposal))
+
+                extra_documents = get_extra_documents(proposal)
 
                 for num, document in enumerate(extra_documents):
                     sections.append(ExtraDocumentsSection(document, num))
 
-                sections.append(DMPFileSection(model))
+                sections.append(DMPFileSection(proposal))
 
-    sections.append(EmbargoSection(model))
-    sections.append(CommentsSection(model))
+    sections.append(EmbargoSection(proposal))
+    sections.append(CommentsSection(proposal))
 
     context["sections"] = sections
 
@@ -1193,6 +1217,13 @@ def create_context_diff(context, old_proposal, new_proposal):
                         )
                     )
 
+                sections.append(
+                    DiffSection(
+                        KnowledgeSecuritySection(old_proposal),
+                        KnowledgeSecuritySection(new_proposal),
+                    )
+                )
+
                 old_extra_docs = get_extra_documents(old_proposal)
                 new_extra_docs = get_extra_documents(new_proposal)
 
@@ -1210,7 +1241,7 @@ def create_context_diff(context, old_proposal, new_proposal):
 
                 sections.append(
                     DiffSection(
-                        *multi_sections(DMPFileSection, [old_proposal, new_proposal])
+                        DMPFileSection(old_proposal), DMPFileSection(new_proposal)
                     )
                 )